Improve property metadata information

Change-Id: Ia9a7db26b2e7b8696aa7b82aed93c0fa6ebad8ce Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
author: Sandro S. Andrade <sandroandrade@kde.org> 2013-10-07 09:36:50 -0300
committer: Sandro S. Andrade <sandroandrade@kde.org> 2013-10-07 14:34:31 +0200
commit: 5e4a780b40543fa12d6d9607e3193fb111c5ab84 (patch)
tree: eb747784d9f3319d6ac7954eea269614aaad9277
parent: 3031fe1254052bdeffec90ca76e2f3649a971ae7 (diff)
409 files changed, 7172 insertions, 7166 deletions
diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp
index 6d3bf18b..566490d0 100644
--- a/examples/uml/xmi-read/main.cpp
+++ b/examples/uml/xmi-read/main.cpp
@@ -40,7 +40,10 @@
 ****************************************************************************/
 #include <QtModeling/QXmiReader>
 #include <QtModeling/QXmiWriter>
-#include <QtModeling/QtModeling>
+#include <QtModeling/QModelingObject>
+
+#include <QtCore/QFile>
+#include <QtCore/QDebug>
 
 int main ()
 {
@@ -52,9 +55,9 @@ int main ()
     }
 
     QXmiReader reader(0, true);
-    QList<QWrappedObject *> rootElements = reader.readFile(&file);
+    QList<QModelingObject *> rootElements = reader.readFile(&file);
     if (!rootElements.isEmpty())
-        qDebug() << "Successfully read object with name" << rootElements.first()->objectName();
+        qDebug() << "Successfully read object with name" << rootElements.first()->asQObject()->objectName();
     if (reader.errorStrings().size() > 0) {
         qDebug() << "Errors:";
         foreach (QString error, reader.errorStrings())
@@ -67,7 +70,7 @@ int main ()
         qDebug() << "Cannot write file !";
         return 1;
     }
-    QXmiWriter writer(rootElements.first());
+    QXmiWriter writer(rootElements.first()->asQObject());
     writer.writeFile(&file2);
 }
 
diff --git a/scripts/templates/common.tmpl b/scripts/templates/common.tmpl
index fc94026b..ba4d8e63 100644
--- a/scripts/templates/common.tmpl
+++ b/scripts/templates/common.tmpl
@@ -110,7 +110,7 @@ ${attributeName}
     [%- SET qtAttribute = QT_ATTRIBUTE(attribute) -%]
     [%- NEXT IF redefinedProperties.grep("^${className}-${qtAttribute}$").size > 0 -%]
     [%- SET qtType = QT_TYPE(namespace, attribute, "false") %]
-    Q_PROPERTY(${qtType.trim} ${qtAttribute} READ ${PLURALFORM(qtAttribute, attribute)}[% IF attribute.findvalue("defaultValue/@xmi:type") != "" %] RESET unset${qtAttribute.remove("^is").ucfirst}[% END %][% IF attribute.findvalue("@isDerived") == "true" and attribute.findvalue("@isDerivedUnion") != "true" %] STORED false[% END %])
+    Q_PROPERTY(${qtType.trim} ${qtAttribute} READ ${PLURALFORM(qtAttribute, attribute)}[% IF attribute.findvalue("@isReadOnly") != "true" and !(attribute.findnodes("upperValue").findvalue("@value") == "*")%] WRITE set${qtAttribute.remove("^is").ucfirst.remove('_$')}[% END %][% IF attribute.findvalue("defaultValue/@xmi:type") != "" %] RESET unset${qtAttribute.remove("^is").ucfirst}[% END %][% IF attribute.findvalue("@isDerived") == "true" and attribute.findvalue("@isDerivedUnion") != "true" %] STORED false[% END %])
 [%- END %]
 [%- END -%]
 [%- MACRO GENERATE_ATTRIBUTES(class, visitedClasses, redefinedProperties) BLOCK -%]
diff --git a/scripts/templates/qclass.cpp b/scripts/templates/qclass.cpp
index 0f33637b..dbbf63b5 100644
--- a/scripts/templates/qclass.cpp
+++ b/scripts/templates/qclass.cpp
@@ -408,17 +408,17 @@ void Q${namespace}${className}::setPropertyData()
 [%- FOREACH attribute = class.findnodes("ownedAttribute") -%]
 [%- SET association = attribute.findvalue("@association") -%]
 [%- IF attribute.findvalue("@aggregation") == "composite" %]
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::AggregationRole] = QStringLiteral("composite");
 [%- ELSE %]
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::AggregationRole] = QStringLiteral("none");
 [%- END %]
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::PropertyClassRole] = QStringLiteral("Q${namespace}${className}");
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::IsDerivedRole] = [% IF attribute.findvalue("@isDerived") == "true" %]true[% ELSE %]false[% END %];
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::IsDerivedUnionRole] = [% IF attribute.findvalue("@isDerivedUnion") == "true" %]true[% ELSE %]false[% END %];
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::DocumentationRole] = QStringLiteral("${attribute.findvalue("ownedComment/body/text()")}");
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("${attribute.findvalue("@redefinedProperty")}");
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("${attribute.findvalue("@subsettedProperty")}");
-    QModelingObject::propertyDataHash[QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::OppositeEndRole] = QStringLiteral("
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::PropertyClassRole] = QStringLiteral("Q${namespace}${className}");
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::IsDerivedRole] = [% IF attribute.findvalue("@isDerived") == "true" %]true[% ELSE %]false[% END %];
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::IsDerivedUnionRole] = [% IF attribute.findvalue("@isDerivedUnion") == "true" %]true[% ELSE %]false[% END %];
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::DocumentationRole] = QStringLiteral("${attribute.findvalue("ownedComment/body/text()")}");
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("${attribute.findvalue("@redefinedProperty")}");
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("${attribute.findvalue("@subsettedProperty")}");
+    QModelingObject::propertyDataHash[QStringLiteral("Q${namespace}${className}")][QStringLiteral("${attribute.findvalue("@name")}")][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\")}") -%]
diff --git a/src/modeling/qmodelingobject.cpp b/src/modeling/qmodelingobject.cpp
index 7026f50b..015f6d50 100644
--- a/src/modeling/qmodelingobject.cpp
+++ b/src/modeling/qmodelingobject.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > QModelingObject::propertyDataHash;
+QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > QModelingObject::propertyDataHash;
 
 QT_END_NAMESPACE
 
diff --git a/src/modeling/qmodelingobject.h b/src/modeling/qmodelingobject.h
index 8f9a7ef6..deeafbe9 100644
--- a/src/modeling/qmodelingobject.h
+++ b/src/modeling/qmodelingobject.h
@@ -75,9 +75,9 @@ public:
         return _modifiedResettableProperties.contains(QString::fromLatin1(metaProperty.name()));
     }
 
-    static inline QVariant propertyData(QMetaProperty metaProperty, QtModeling::MetaPropertyDataRole role)
+    static inline QVariant propertyData(QString className, QMetaProperty metaProperty, QtModeling::MetaPropertyDataRole role)
     {
-        return propertyDataHash[QString::fromLatin1(metaProperty.name())][role];
+        return propertyDataHash[className][QString::fromLatin1(metaProperty.name())][role];
     }
 
     inline QStringList &modifiedResettableProperties()
@@ -89,7 +89,7 @@ protected:
     QModelingObject() : deletingFromQObject(false), _qObject(0) {}
     QPointer<QObject> _qObject;
     QStringList _modifiedResettableProperties;
-    static QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > propertyDataHash;
+    static QHash< QString, QHash< QString, QHash<QtModeling::MetaPropertyDataRole, QVariant> > > propertyDataHash;
     virtual void setPropertyData() = 0;
 };
 
diff --git a/src/modeling/qxmireader.cpp b/src/modeling/qxmireader.cpp
index 58b938ec..84586eab 100644
--- a/src/modeling/qxmireader.cpp
+++ b/src/modeling/qxmireader.cpp
@@ -42,6 +42,7 @@
 #include "qxmireader_p.h"
 #include "qmetamodelplugin.h"
 
+#include <QtModeling/QModelingObject>
 #include <QtModeling/QtModelingNamespace>
 
 #include <QtCore/QDir>
@@ -93,7 +94,7 @@ void QXmiReader::loadPlugins()
     }
 }
 
-QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
+QList<QModelingObject *> QXmiReader::readFile(QIODevice *device, QString importedId)
 {
     Q_D(QXmiReader);
 
@@ -104,10 +105,11 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
     }
     QXmlStreamReader reader;
     reader.setDevice(device);
-    QObjectList modelingObjectList;
-    QObject *rootElement = 0;
+    QList<QModelingObject *> modelingObjectList;
+    QModelingObject *rootElement = 0;
     bool importedIdFound = false;
     QStack<QString> idStack;
+    QString currentNamespaceUri;
     int insertPosition = 0;
 
     while (!reader.atEnd()) {
@@ -126,16 +128,16 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
                 QFile importFile(reader.attributes().value(QString::fromLatin1("href")).toString().split(QString::fromLatin1("#")).first());
                 if (!importFile.open(QFile::ReadOnly | QFile::Text))
                     d->errors << QString::fromLatin1("Could not open imported file '%1'").arg(importFile.fileName());
-                QObjectList importList = readFile(&importFile, reader.attributes().value(QString::fromLatin1("href")).toString().split(QString::fromLatin1("#")).last());
+                QList<QModelingObject *> 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()->setProperty("role", QtModeling::ImportedPackageRole);
+                        importList.first()->asQObject()->setProperty("role", QtModeling::ImportedPackageRole);
                     else if (elementName == QString::fromLatin1("importedElement"))
-                        importList.first()->setProperty("role", QtModeling::ImportedElementRole);
+                        importList.first()->asQObject()->setProperty("role", QtModeling::ImportedElementRole);
                     else if (elementName == QString::fromLatin1("appliedProfile"))
-                        importList.first()->setProperty("role", QtModeling::AppliedProfileRole);
+                        importList.first()->asQObject()->setProperty("role", QtModeling::AppliedProfileRole);
                 }
-                foreach (QObject *importedObject, importList) {
+                foreach (QModelingObject *importedObject, importList) {
                     modelingObjectList.append(importedObject);
                 }
             }
@@ -156,11 +158,13 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
                 xmiType = reader.qualifiedName().toString();
             if (xmiType.isEmpty() || d->xmlNamespaceToImplementationNamespace[xmiType.split(':').first()].isEmpty())
                 continue;
-            xmiType = QString::fromLatin1("%1%2 *").arg(d->xmlNamespaceToImplementationNamespace[xmiType.split(':').first()]).arg(xmiType.split(':').last());
+            xmiType = QString::fromLatin1("%1%2").arg(d->xmlNamespaceToImplementationNamespace[xmiType.split(':').first()]).arg(xmiType.split(':').last());
             QString instanceName = reader.attributes().value(QString::fromLatin1("name")).toString();
             if (instanceName.isEmpty())
                 instanceName = reader.attributes().value(QString::fromLatin1("xmi:id")).toString();
-            QObject *modelingObject = createInstance(xmiType, instanceName);
+            if (!reader.namespaceUri().toString().isEmpty())
+                currentNamespaceUri = reader.namespaceUri().toString();
+            QModelingObject *modelingObject = createInstance(currentNamespaceUri, xmiType, instanceName);
             if (modelingObject) {
                 d->idMap.insert(reader.attributes().value(QString::fromLatin1("xmi:id")).toString(), modelingObject);
                 if (!rootElement) {
@@ -187,7 +191,7 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
     device->reset();
     reader.clear();
     reader.setDevice(device);
-    QStack< QPair<QString, QObject *> > stack;
+    QStack< QPair<QString, QModelingObject *> > stack;
 
     while (!reader.atEnd()) {
         reader.readNext();
@@ -207,16 +211,16 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
             if (id.isEmpty() && !stack.isEmpty())
                 continue;
 
-            QObject *modelingObject = d->idMap.value(id);
+            QModelingObject *modelingObject = d->idMap.value(id);
 
             if (modelingObject) {
-                const QMetaObject *metaObject = modelingObject->metaObject();
+                const QMetaObject *metaObject = modelingObject->asQObject()->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->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString() == QString::fromLatin1("true") ? true:false))
+                            if (!modelingObject->asQObject()->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()) {
@@ -224,56 +228,56 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
                             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->setProperty(attribute.name().toString().toLatin1(), enumName))
+                            if (!modelingObject->asQObject()->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->setProperty(attribute.name().toString().toLatin1(), attribute.value().toString()))
+                            if (!modelingObject->asQObject()->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) {
-                            QObject *propertyObject = d->idMap.value(attribute.value().toString());
+                            QModelingObject *propertyObject = d->idMap.value(attribute.value().toString());
                             if (propertyObject) {
                                 QString elementName = attribute.name().toString();
                                 elementName = elementName.left(1).toUpper() + elementName.mid(1);
-                                int methodCount = modelingObject->metaObject()->methodCount();
+                                int methodCount = modelingObject->asQObject()->metaObject()->methodCount();
                                 int i;
                                 for (i = 0; i < methodCount; ++i) {
-                                    QMetaMethod metaMethod = modelingObject->metaObject()->method(i);
+                                    QMetaMethod metaMethod = modelingObject->asQObject()->metaObject()->method(i);
                                     if (QString::fromLatin1(metaMethod.name()) == QString::fromLatin1("set%1").arg(elementName)) {
-                                        if (!metaMethod.invoke(modelingObject, ::Q_ARG(QObject *, propertyObject)))
-                                            d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(propertyObject->objectName());
+                                        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());
                                         break;
                                     }
                                 }
                                 if (i == methodCount)
-                                    d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(propertyObject->objectName());
+                                    d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(propertyObject->asQObject()->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->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->asQObject()->metaObject()->className()));
                 }
                 if (!stack.isEmpty()) {
-                    QObject *containerObject = stack.top().second;
+                    QModelingObject *containerObject = stack.top().second;
                     QString elementName = reader.name().toString();
                     elementName = elementName.left(1).toUpper() + elementName.mid(1);
-                    int methodCount = containerObject->metaObject()->methodCount();
+                    int methodCount = containerObject->asQObject()->metaObject()->methodCount();
                     int i;
                     for (i = 0; i < methodCount; ++i) {
-                        QMetaMethod metaMethod = containerObject->metaObject()->method(i);
+                        QMetaMethod metaMethod = containerObject->asQObject()->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, ::Q_ARG(QObject *, modelingObject)))
-                                d->errors << QString::fromLatin1("Error when invoking metamethod '%1' on object '%2'.").arg(QString::fromLatin1(metaMethod.name())).arg(containerObject->objectName());
+                            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());
                             break;
                         }
                     }
                     if (i == methodCount)
-                        d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(containerObject->objectName());
+                        d->errors << QString::fromLatin1("Metamethod add/set'%1' not found on object '%2'.").arg(elementName).arg(containerObject->asQObject()->objectName());
                 }
-                stack.push(QPair<QString, QObject *>(reader.name().toString(), modelingObject));
+                stack.push(QPair<QString, QModelingObject *>(reader.name().toString(), modelingObject));
             }
             else
                 d->errors << QString::fromLatin1("Could not cross reference instance with id '%1' in element '%2'. Bad formed XMI file ?").arg(id).arg(reader.name().toString());
@@ -288,18 +292,14 @@ QObjectList QXmiReader::readFile(QIODevice *device, QString importedId)
     return modelingObjectList;
 }
 
-QObject *QXmiReader::createInstance(QString instanceClass, QString instanceName)
+QModelingObject *QXmiReader::createInstance(QString namespaceUri, QString instanceClass, QString instanceName)
 {
-    int type;
-    if ((type = QMetaType::type(instanceClass.toLatin1())) != QMetaType::UnknownType) {
-        const QMetaObject *metaObject = QMetaType::metaObjectForType(type);
-        if (metaObject) {
-            QObject *modelingObject = dynamic_cast<QObject *>(metaObject->newInstance());
-            if (modelingObject) {
-                modelingObject->setObjectName(instanceName);
-                return modelingObject;
-            }
-        }
+    Q_D(QXmiReader);
+    QMetaModelPlugin *metamodelPlugin = d->metaModelPlugins[namespaceUri].first;
+    QModelingObject *modelingObject = metamodelPlugin->createModelingObject(instanceClass);
+    if (modelingObject) {
+        modelingObject->asQObject()->setObjectName(instanceName);
+        return modelingObject;
     }
     return 0;
 }
diff --git a/src/modeling/qxmireader.h b/src/modeling/qxmireader.h
index 8dea082f..e49b4b2d 100644
--- a/src/modeling/qxmireader.h
+++ b/src/modeling/qxmireader.h
@@ -57,6 +57,8 @@ class QObject;
 class QScriptEngine;
 class QXmiReaderPrivate;
 
+class QModelingObject;
+
 class Q_MODELING_EXPORT QXmiReader : public QObject
 {
     Q_OBJECT
@@ -68,12 +70,12 @@ public:
     explicit QXmiReader(QScriptEngine *scriptEngine = 0, bool initMetaModel = false, QObject *parent = 0);
     virtual ~QXmiReader();
 
-    QObjectList readFile(QIODevice *device, QString importedId = QString::fromLatin1(""));
+    QList<QModelingObject *> readFile(QIODevice *device, QString importedId = QString::fromLatin1(""));
     QStringList errorStrings() const;
 
 protected:
     void loadPlugins();
-    QObject *createInstance(QString instanceClass, QString instanceName);
+    QModelingObject *createInstance(QString namespaceUri, QString instanceClass, QString instanceName);
 };
 
 QT_END_NAMESPACE
diff --git a/src/modeling/qxmireader_p.h b/src/modeling/qxmireader_p.h
index 966d5971..7bb3bfe9 100644
--- a/src/modeling/qxmireader_p.h
+++ b/src/modeling/qxmireader_p.h
@@ -64,7 +64,7 @@ public:
     explicit QXmiReaderPrivate();
     virtual ~QXmiReaderPrivate();
 
-    QHash<QString, QObject *> idMap;
+    QHash<QString, QModelingObject *> idMap;
     QHash< QString, QPair<QMetaModelPlugin *, QJsonObject> > metaModelPlugins;
     QHash<QString, QString> xmlNamespaceToImplementationNamespace;
     QStringList errors;
diff --git a/src/modeling/qxmiwriter.cpp b/src/modeling/qxmiwriter.cpp
index 46eb834a..c5cde4a6 100644
--- a/src/modeling/qxmiwriter.cpp
+++ b/src/modeling/qxmiwriter.cpp
@@ -148,14 +148,14 @@ void QXmiWriter::populateIdMap(QObject *modelingObject, int index)
         QMetaProperty metaProperty = metaObject->property(i);
         QString typeName = QString::fromLatin1(metaProperty.typeName());
         QVariant variant = metaProperty.read(modelingObject);
-        QString aggregationRole = QModelingObject::propertyData(metaProperty, QtModeling::AggregationRole).toString();
+        QString aggregationRole = QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::AggregationRole).toString();
 
         if (aggregationRole == QStringLiteral("composite"))
-            if (!QModelingObject::propertyData(metaProperty, QtModeling::OppositeEndRole).toString().isEmpty()) {
-                d->blacklistedOppositeEnds << QModelingObject::propertyData(metaProperty, QtModeling::OppositeEndRole).toString().split('-').last();
+            if (!QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::OppositeEndRole).toString().isEmpty()) {
+                d->blacklistedOppositeEnds << QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::OppositeEndRole).toString().split('-').last();
             }
 
-        if (QModelingObject::propertyData(metaProperty, QtModeling::AggregationRole).toString() != QStringLiteral("composite"))
+        if (QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::AggregationRole).toString() != QStringLiteral("composite"))
             continue;
 
         if (typeName.endsWith('*') && qvariant_cast<QObject *>(variant))
@@ -203,7 +203,7 @@ void QXmiWriter::writeObject(QObject *modelingObject, QString elementName)
         QMetaProperty metaProperty = metaObject->property(i);
         QVariant variant = metaProperty.read(modelingObject);
 
-        if (!metaProperty.isStored() || QString::fromLatin1(metaProperty.name()) == QStringLiteral("objectName") || QModelingObject::propertyData(metaProperty, QtModeling::IsDerivedUnionRole).toBool())
+        if (!metaProperty.isStored() || QString::fromLatin1(metaProperty.name()) == QStringLiteral("objectName") || QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::IsDerivedUnionRole).toBool())
             continue;
 
         if (metaProperty.type() == QVariant::String) {
@@ -233,10 +233,10 @@ void QXmiWriter::writeObject(QObject *modelingObject, QString elementName)
 
         QString typeName = QString::fromLatin1(metaProperty.typeName());
         QVariant variant = metaProperty.read(modelingObject);
-        QString aggregationRole = QModelingObject::propertyData(metaProperty, QtModeling::AggregationRole).toString();
+        QString aggregationRole = QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::AggregationRole).toString();
         QString modifiedPropertyName = QString::fromLatin1(metaProperty.name()).remove(QRegularExpression(QStringLiteral("_$"))).remove(QRegularExpression(QStringLiteral("s$"))).replace(QRegularExpression(QStringLiteral("ie$")), QStringLiteral("y")).replace(QRegularExpression(QStringLiteral("sse$")), QStringLiteral("ss")).replace(QRegularExpression(QStringLiteral("ice$")), QStringLiteral("ex")).replace(QRegularExpression(QStringLiteral("ce$")), QStringLiteral("x"));
 
-        if (!metaProperty.isStored() || QModelingObject::propertyData(metaProperty, QtModeling::IsDerivedUnionRole).toBool())
+        if (!metaProperty.isStored() || QModelingObject::propertyData(QString::fromLatin1(metaObject->className()).remove(QRegExp(QStringLiteral("Object$"))), metaProperty, QtModeling::IsDerivedUnionRole).toBool())
             continue;
 
         if (typeName.endsWith('*') && qvariant_cast<QObject *>(variant)) {
diff --git a/src/uml/qobjects/qumlabstractionobject_p.h b/src/uml/qobjects/qumlabstractionobject_p.h
index 5bd80359..3043b2c1 100644
--- a/src/uml/qobjects/qumlabstractionobject_p.h
+++ b/src/uml/qobjects/qumlabstractionobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlAbstractionObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -89,7 +89,7 @@ class Q_UML_EXPORT QUmlAbstractionObject : public QObject
     Q_PROPERTY(QSet<QObject *> supplier READ suppliers)
 
     // Properties [Abstraction]
-    Q_PROPERTY(QObject * mapping READ mapping)
+    Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
 public:
     Q_INVOKABLE explicit QUmlAbstractionObject(QUmlAbstraction *qModelingObject);
diff --git a/src/uml/qobjects/qumlacceptcallactionobject_p.h b/src/uml/qobjects/qumlacceptcallactionobject_p.h
index a987abb6..209669e0 100644
--- a/src/uml/qobjects/qumlacceptcallactionobject_p.h
+++ b/src/uml/qobjects/qumlacceptcallactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlAcceptCallActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,18 +92,18 @@ class Q_UML_EXPORT QUmlAcceptCallActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [AcceptEventAction]
-    Q_PROPERTY(bool isUnmarshall READ isUnmarshall RESET unsetUnmarshall)
+    Q_PROPERTY(bool isUnmarshall READ isUnmarshall WRITE setUnmarshall RESET unsetUnmarshall)
     Q_PROPERTY(QSet<QObject *> result READ results)
     Q_PROPERTY(QSet<QObject *> trigger READ triggers)
 
     // Properties [AcceptCallAction]
-    Q_PROPERTY(QObject * returnInformation READ returnInformation)
+    Q_PROPERTY(QObject * returnInformation READ returnInformation WRITE setReturnInformation)
 
 public:
     Q_INVOKABLE explicit QUmlAcceptCallActionObject(QUmlAcceptCallAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlaccepteventactionobject_p.h b/src/uml/qobjects/qumlaccepteventactionobject_p.h
index 1e4e1b30..adbdfc88 100644
--- a/src/uml/qobjects/qumlaccepteventactionobject_p.h
+++ b/src/uml/qobjects/qumlaccepteventactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlAcceptEventActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,13 +92,13 @@ class Q_UML_EXPORT QUmlAcceptEventActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [AcceptEventAction]
-    Q_PROPERTY(bool isUnmarshall READ isUnmarshall RESET unsetUnmarshall)
+    Q_PROPERTY(bool isUnmarshall READ isUnmarshall WRITE setUnmarshall RESET unsetUnmarshall)
     Q_PROPERTY(QSet<QObject *> result READ results)
     Q_PROPERTY(QSet<QObject *> trigger READ triggers)
 
diff --git a/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h b/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h
index ebc62884..d77bd173 100644
--- a/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h
+++ b/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlActionExecutionSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [ExecutionSpecification]
-    Q_PROPERTY(QObject * finish READ finish)
-    Q_PROPERTY(QObject * start READ start)
+    Q_PROPERTY(QObject * finish READ finish WRITE setFinish)
+    Q_PROPERTY(QObject * start READ start WRITE setStart)
 
     // Properties [ActionExecutionSpecification]
-    Q_PROPERTY(QObject * action READ action)
+    Q_PROPERTY(QObject * action READ action WRITE setAction)
 
 public:
     Q_INVOKABLE explicit QUmlActionExecutionSpecificationObject(QUmlActionExecutionSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumlactioninputpinobject_p.h b/src/uml/qobjects/qumlactioninputpinobject_p.h
index 689c3f6d..fc84a587 100644
--- a/src/uml/qobjects/qumlactioninputpinobject_p.h
+++ b/src/uml/qobjects/qumlactioninputpinobject_p.h
@@ -64,51 +64,51 @@ class Q_UML_EXPORT QUmlActionInputPinObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
     // Properties [Pin]
-    Q_PROPERTY(bool isControl READ isControl RESET unsetControl)
+    Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl)
 
     // Properties [ActionInputPin]
-    Q_PROPERTY(QObject * fromAction READ fromAction)
+    Q_PROPERTY(QObject * fromAction READ fromAction WRITE setFromAction)
 
 public:
     Q_INVOKABLE explicit QUmlActionInputPinObject(QUmlActionInputPin *qModelingObject);
diff --git a/src/uml/qobjects/qumlactivityfinalnodeobject_p.h b/src/uml/qobjects/qumlactivityfinalnodeobject_p.h
index dee796d2..6e667d19 100644
--- a/src/uml/qobjects/qumlactivityfinalnodeobject_p.h
+++ b/src/uml/qobjects/qumlactivityfinalnodeobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlActivityFinalNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
diff --git a/src/uml/qobjects/qumlactivityobject_p.h b/src/uml/qobjects/qumlactivityobject_p.h
index a36ae3c0..de90edbc 100644
--- a/src/uml/qobjects/qumlactivityobject_p.h
+++ b/src/uml/qobjects/qumlactivityobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlActivityObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlActivityObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlActivityObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlActivityObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -136,19 +136,19 @@ class Q_UML_EXPORT QUmlActivityObject : public QObject
 
     // Properties [Behavior]
     Q_PROPERTY(QObject * context READ context STORED false)
-    Q_PROPERTY(bool isReentrant READ isReentrant RESET unsetReentrant)
+    Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> postcondition READ postconditions)
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
     Q_PROPERTY(QSet<QObject *> redefinedBehavior READ redefinedBehaviors)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [Activity]
     Q_PROPERTY(QSet<QObject *> edge READ edges)
     Q_PROPERTY(QSet<QObject *> group READ groups)
-    Q_PROPERTY(bool isReadOnly READ isReadOnly RESET unsetReadOnly)
-    Q_PROPERTY(bool isSingleExecution READ isSingleExecution RESET unsetSingleExecution)
+    Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly)
+    Q_PROPERTY(bool isSingleExecution READ isSingleExecution WRITE setSingleExecution RESET unsetSingleExecution)
     Q_PROPERTY(QSet<QObject *> node READ nodes)
     Q_PROPERTY(QSet<QObject *> partition READ partitions)
     Q_PROPERTY(QSet<QObject *> structuredNode READ structuredNodes)
diff --git a/src/uml/qobjects/qumlactivityparameternodeobject_p.h b/src/uml/qobjects/qumlactivityparameternodeobject_p.h
index 97782ff7..83e99a3a 100644
--- a/src/uml/qobjects/qumlactivityparameternodeobject_p.h
+++ b/src/uml/qobjects/qumlactivityparameternodeobject_p.h
@@ -65,39 +65,39 @@ class Q_UML_EXPORT QUmlActivityParameterNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
     // Properties [ActivityParameterNode]
-    Q_PROPERTY(QObject * parameter READ parameter)
+    Q_PROPERTY(QObject * parameter READ parameter WRITE setParameter)
 
 public:
     Q_INVOKABLE explicit QUmlActivityParameterNodeObject(QUmlActivityParameterNode *qModelingObject);
diff --git a/src/uml/qobjects/qumlactivitypartitionobject_p.h b/src/uml/qobjects/qumlactivitypartitionobject_p.h
index ceabf24d..5276c629 100644
--- a/src/uml/qobjects/qumlactivitypartitionobject_p.h
+++ b/src/uml/qobjects/qumlactivitypartitionobject_p.h
@@ -65,27 +65,27 @@ class Q_UML_EXPORT QUmlActivityPartitionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [ActivityGroup]
     Q_PROPERTY(QSet<QObject *> containedEdge READ containedEdges)
     Q_PROPERTY(QSet<QObject *> containedNode READ containedNodes)
-    Q_PROPERTY(QObject * inActivity READ inActivity)
+    Q_PROPERTY(QObject * inActivity READ inActivity WRITE setInActivity)
     Q_PROPERTY(QSet<QObject *> subgroup READ subgroups)
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
     // Properties [ActivityPartition]
     Q_PROPERTY(QSet<QObject *> edge READ edges)
-    Q_PROPERTY(bool isDimension READ isDimension RESET unsetDimension)
-    Q_PROPERTY(bool isExternal READ isExternal RESET unsetExternal)
+    Q_PROPERTY(bool isDimension READ isDimension WRITE setDimension RESET unsetDimension)
+    Q_PROPERTY(bool isExternal READ isExternal WRITE setExternal RESET unsetExternal)
     Q_PROPERTY(QSet<QObject *> node READ nodes)
-    Q_PROPERTY(QObject * represents READ represents)
+    Q_PROPERTY(QObject * represents READ represents WRITE setRepresents)
     Q_PROPERTY(QSet<QObject *> subpartition READ subpartitions)
-    Q_PROPERTY(QObject * superPartition READ superPartition)
+    Q_PROPERTY(QObject * superPartition READ superPartition WRITE setSuperPartition)
 
 public:
     Q_INVOKABLE explicit QUmlActivityPartitionObject(QUmlActivityPartition *qModelingObject);
diff --git a/src/uml/qobjects/qumlactorobject_p.h b/src/uml/qobjects/qumlactorobject_p.h
index 9d5e19c6..bb712e8e 100644
--- a/src/uml/qobjects/qumlactorobject_p.h
+++ b/src/uml/qobjects/qumlactorobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlActorObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlActorObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,19 +102,19 @@ class Q_UML_EXPORT QUmlActorObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
diff --git a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h
index 117af282..0156b07e 100644
--- a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h
+++ b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlAddStructuralFeatureValueActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,22 +92,22 @@ class Q_UML_EXPORT QUmlAddStructuralFeatureValueActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [StructuralFeatureAction]
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * structuralFeature READ structuralFeature)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * structuralFeature READ structuralFeature WRITE setStructuralFeature)
 
     // Properties [WriteStructuralFeatureAction]
-    Q_PROPERTY(QObject * result READ result)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
     // Properties [AddStructuralFeatureValueAction]
-    Q_PROPERTY(QObject * insertAt READ insertAt)
-    Q_PROPERTY(bool isReplaceAll READ isReplaceAll RESET unsetReplaceAll)
+    Q_PROPERTY(QObject * insertAt READ insertAt WRITE setInsertAt)
+    Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
 
 public:
     Q_INVOKABLE explicit QUmlAddStructuralFeatureValueActionObject(QUmlAddStructuralFeatureValueAction *qModelingObject);
diff --git a/src/uml/qobjects/qumladdvariablevalueactionobject_p.h b/src/uml/qobjects/qumladdvariablevalueactionobject_p.h
index feeb537d..526a9ebd 100644
--- a/src/uml/qobjects/qumladdvariablevalueactionobject_p.h
+++ b/src/uml/qobjects/qumladdvariablevalueactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlAddVariableValueActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,20 +92,20 @@ class Q_UML_EXPORT QUmlAddVariableValueActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [VariableAction]
-    Q_PROPERTY(QObject * variable READ variable)
+    Q_PROPERTY(QObject * variable READ variable WRITE setVariable)
 
     // Properties [WriteVariableAction]
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
     // Properties [AddVariableValueAction]
-    Q_PROPERTY(QObject * insertAt READ insertAt)
-    Q_PROPERTY(bool isReplaceAll READ isReplaceAll RESET unsetReplaceAll)
+    Q_PROPERTY(QObject * insertAt READ insertAt WRITE setInsertAt)
+    Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
 
 public:
     Q_INVOKABLE explicit QUmlAddVariableValueActionObject(QUmlAddVariableValueAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlanyreceiveeventobject_p.h b/src/uml/qobjects/qumlanyreceiveeventobject_p.h
index c03b4ec6..2774096d 100644
--- a/src/uml/qobjects/qumlanyreceiveeventobject_p.h
+++ b/src/uml/qobjects/qumlanyreceiveeventobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlAnyReceiveEventObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
     Q_INVOKABLE explicit QUmlAnyReceiveEventObject(QUmlAnyReceiveEvent *qModelingObject);
diff --git a/src/uml/qobjects/qumlartifactobject_p.h b/src/uml/qobjects/qumlartifactobject_p.h
index 92675bbb..6c562a99 100644
--- a/src/uml/qobjects/qumlartifactobject_p.h
+++ b/src/uml/qobjects/qumlartifactobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlArtifactObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlArtifactObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,19 +102,19 @@ class Q_UML_EXPORT QUmlArtifactObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Artifact]
-    Q_PROPERTY(QString fileName READ fileName)
+    Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
     Q_PROPERTY(QSet<QObject *> manifestation READ manifestations)
     Q_PROPERTY(QSet<QObject *> nestedArtifact READ nestedArtifacts)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
diff --git a/src/uml/qobjects/qumlassociationclassobject_p.h b/src/uml/qobjects/qumlassociationclassobject_p.h
index 35c81d5a..bfcb0011 100644
--- a/src/uml/qobjects/qumlassociationclassobject_p.h
+++ b/src/uml/qobjects/qumlassociationclassobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -139,7 +139,7 @@ class Q_UML_EXPORT QUmlAssociationClassObject : public QObject
 
     // Properties [Association]
     Q_PROPERTY(QList<QObject *> endType READ endTypes STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
     Q_PROPERTY(QList<QObject *> memberEnd READ memberEnds)
     Q_PROPERTY(QSet<QObject *> navigableOwnedEnd READ navigableOwnedEnds)
     Q_PROPERTY(QList<QObject *> ownedEnd READ ownedEnds)
diff --git a/src/uml/qobjects/qumlassociationobject_p.h b/src/uml/qobjects/qumlassociationobject_p.h
index 77d96a56..f7e21f06 100644
--- a/src/uml/qobjects/qumlassociationobject_p.h
+++ b/src/uml/qobjects/qumlassociationobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlAssociationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlAssociationObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlAssociationObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Relationship]
@@ -118,7 +118,7 @@ class Q_UML_EXPORT QUmlAssociationObject : public QObject
 
     // Properties [Association]
     Q_PROPERTY(QList<QObject *> endType READ endTypes STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
     Q_PROPERTY(QList<QObject *> memberEnd READ memberEnds)
     Q_PROPERTY(QSet<QObject *> navigableOwnedEnd READ navigableOwnedEnds)
     Q_PROPERTY(QList<QObject *> ownedEnd READ ownedEnds)
diff --git a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h
index c6b9b782..a146fc13 100644
--- a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h
+++ b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlBehaviorExecutionSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [ExecutionSpecification]
-    Q_PROPERTY(QObject * finish READ finish)
-    Q_PROPERTY(QObject * start READ start)
+    Q_PROPERTY(QObject * finish READ finish WRITE setFinish)
+    Q_PROPERTY(QObject * start READ start WRITE setStart)
 
     // Properties [BehaviorExecutionSpecification]
-    Q_PROPERTY(QObject * behavior READ behavior)
+    Q_PROPERTY(QObject * behavior READ behavior WRITE setBehavior)
 
 public:
     Q_INVOKABLE explicit QUmlBehaviorExecutionSpecificationObject(QUmlBehaviorExecutionSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h b/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h
index 99caa17c..600b483b 100644
--- a/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h
+++ b/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlBroadcastSignalActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,17 +92,17 @@ class Q_UML_EXPORT QUmlBroadcastSignalActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [InvocationAction]
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * onPort READ onPort)
+    Q_PROPERTY(QObject * onPort READ onPort WRITE setOnPort)
 
     // Properties [BroadcastSignalAction]
-    Q_PROPERTY(QObject * signal READ signal)
+    Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
 
 public:
     Q_INVOKABLE explicit QUmlBroadcastSignalActionObject(QUmlBroadcastSignalAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlcallbehavioractionobject_p.h b/src/uml/qobjects/qumlcallbehavioractionobject_p.h
index f302db8a..751f0d23 100644
--- a/src/uml/qobjects/qumlcallbehavioractionobject_p.h
+++ b/src/uml/qobjects/qumlcallbehavioractionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlCallBehaviorActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,21 +92,21 @@ class Q_UML_EXPORT QUmlCallBehaviorActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [InvocationAction]
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * onPort READ onPort)
+    Q_PROPERTY(QObject * onPort READ onPort WRITE setOnPort)
 
     // Properties [CallAction]
-    Q_PROPERTY(bool isSynchronous READ isSynchronous RESET unsetSynchronous)
+    Q_PROPERTY(bool isSynchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous)
     Q_PROPERTY(QList<QObject *> result READ results)
 
     // Properties [CallBehaviorAction]
-    Q_PROPERTY(QObject * behavior READ behavior)
+    Q_PROPERTY(QObject * behavior READ behavior WRITE setBehavior)
 
 public:
     Q_INVOKABLE explicit QUmlCallBehaviorActionObject(QUmlCallBehaviorAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlcalleventobject_p.h b/src/uml/qobjects/qumlcalleventobject_p.h
index 9804e72c..ea56e0ba 100644
--- a/src/uml/qobjects/qumlcalleventobject_p.h
+++ b/src/uml/qobjects/qumlcalleventobject_p.h
@@ -64,21 +64,21 @@ class Q_UML_EXPORT QUmlCallEventObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [CallEvent]
-    Q_PROPERTY(QObject * operation READ operation)
+    Q_PROPERTY(QObject * operation READ operation WRITE setOperation)
 
 public:
     Q_INVOKABLE explicit QUmlCallEventObject(QUmlCallEvent *qModelingObject);
diff --git a/src/uml/qobjects/qumlcalloperationactionobject_p.h b/src/uml/qobjects/qumlcalloperationactionobject_p.h
index 8e2d7e7a..b8d202c6 100644
--- a/src/uml/qobjects/qumlcalloperationactionobject_p.h
+++ b/src/uml/qobjects/qumlcalloperationactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlCallOperationActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,22 +92,22 @@ class Q_UML_EXPORT QUmlCallOperationActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [InvocationAction]
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * onPort READ onPort)
+    Q_PROPERTY(QObject * onPort READ onPort WRITE setOnPort)
 
     // Properties [CallAction]
-    Q_PROPERTY(bool isSynchronous READ isSynchronous RESET unsetSynchronous)
+    Q_PROPERTY(bool isSynchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous)
     Q_PROPERTY(QList<QObject *> result READ results)
 
     // Properties [CallOperationAction]
-    Q_PROPERTY(QObject * operation READ operation)
-    Q_PROPERTY(QObject * target READ target)
+    Q_PROPERTY(QObject * operation READ operation WRITE setOperation)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
     Q_INVOKABLE explicit QUmlCallOperationActionObject(QUmlCallOperationAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlcentralbuffernodeobject_p.h b/src/uml/qobjects/qumlcentralbuffernodeobject_p.h
index 61853e1e..ef0dd815 100644
--- a/src/uml/qobjects/qumlcentralbuffernodeobject_p.h
+++ b/src/uml/qobjects/qumlcentralbuffernodeobject_p.h
@@ -65,36 +65,36 @@ class Q_UML_EXPORT QUmlCentralBufferNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
 public:
     Q_INVOKABLE explicit QUmlCentralBufferNodeObject(QUmlCentralBufferNode *qModelingObject);
diff --git a/src/uml/qobjects/qumlchangeeventobject_p.h b/src/uml/qobjects/qumlchangeeventobject_p.h
index 509e02d1..6e5b2337 100644
--- a/src/uml/qobjects/qumlchangeeventobject_p.h
+++ b/src/uml/qobjects/qumlchangeeventobject_p.h
@@ -64,21 +64,21 @@ class Q_UML_EXPORT QUmlChangeEventObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [ChangeEvent]
-    Q_PROPERTY(QObject * changeExpression READ changeExpression)
+    Q_PROPERTY(QObject * changeExpression READ changeExpression WRITE setChangeExpression)
 
 public:
     Q_INVOKABLE explicit QUmlChangeEventObject(QUmlChangeEvent *qModelingObject);
diff --git a/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h b/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h
index 94c72435..b486bab0 100644
--- a/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumlclassifiertemplateparameterobject_p.h
@@ -62,15 +62,15 @@ class Q_UML_EXPORT QUmlClassifierTemplateParameterObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [TemplateParameter]
-    Q_PROPERTY(QObject * default_ READ default_)
-    Q_PROPERTY(QObject * ownedDefault READ ownedDefault)
-    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement)
-    Q_PROPERTY(QObject * signature READ signature)
+    Q_PROPERTY(QObject * default_ READ default_ WRITE setDefault)
+    Q_PROPERTY(QObject * ownedDefault READ ownedDefault WRITE setOwnedDefault)
+    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement WRITE setOwnedParameteredElement)
+    Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
     // Properties [ClassifierTemplateParameter]
-    Q_PROPERTY(bool allowSubstitutable READ allowSubstitutable RESET unsetAllowSubstitutable)
+    Q_PROPERTY(bool allowSubstitutable READ allowSubstitutable WRITE setAllowSubstitutable RESET unsetAllowSubstitutable)
     Q_PROPERTY(QSet<QObject *> constrainingClassifier READ constrainingClassifiers)
-    Q_PROPERTY(QObject * parameteredElement READ parameteredElement)
+    Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
 
 public:
     Q_INVOKABLE explicit QUmlClassifierTemplateParameterObject(QUmlClassifierTemplateParameter *qModelingObject);
diff --git a/src/uml/qobjects/qumlclassobject_p.h b/src/uml/qobjects/qumlclassobject_p.h
index 0b060e88..ff77573a 100644
--- a/src/uml/qobjects/qumlclassobject_p.h
+++ b/src/uml/qobjects/qumlclassobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlClassObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlClassObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
diff --git a/src/uml/qobjects/qumlclauseobject_p.h b/src/uml/qobjects/qumlclauseobject_p.h
index 3600de04..770c7184 100644
--- a/src/uml/qobjects/qumlclauseobject_p.h
+++ b/src/uml/qobjects/qumlclauseobject_p.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QUmlClauseObject : public QObject
     // Properties [Clause]
     Q_PROPERTY(QSet<QObject *> body READ bodies)
     Q_PROPERTY(QList<QObject *> bodyOutput READ bodyOutputs)
-    Q_PROPERTY(QObject * decider READ decider)
+    Q_PROPERTY(QObject * decider READ decider WRITE setDecider)
     Q_PROPERTY(QSet<QObject *> predecessorClause READ predecessorClauses)
     Q_PROPERTY(QSet<QObject *> successorClause READ successorClauses)
     Q_PROPERTY(QSet<QObject *> test READ tests)
diff --git a/src/uml/qobjects/qumlclearassociationactionobject_p.h b/src/uml/qobjects/qumlclearassociationactionobject_p.h
index f4302b56..5df1a046 100644
--- a/src/uml/qobjects/qumlclearassociationactionobject_p.h
+++ b/src/uml/qobjects/qumlclearassociationactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlClearAssociationActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,14 +92,14 @@ class Q_UML_EXPORT QUmlClearAssociationActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ClearAssociationAction]
-    Q_PROPERTY(QObject * association READ association)
-    Q_PROPERTY(QObject * object READ object)
+    Q_PROPERTY(QObject * association READ association WRITE setAssociation)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
 
 public:
     Q_INVOKABLE explicit QUmlClearAssociationActionObject(QUmlClearAssociationAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h b/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h
index 7825d02f..81c93cd9 100644
--- a/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h
+++ b/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlClearStructuralFeatureActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,17 +92,17 @@ class Q_UML_EXPORT QUmlClearStructuralFeatureActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [StructuralFeatureAction]
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * structuralFeature READ structuralFeature)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * structuralFeature READ structuralFeature WRITE setStructuralFeature)
 
     // Properties [ClearStructuralFeatureAction]
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlClearStructuralFeatureActionObject(QUmlClearStructuralFeatureAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlclearvariableactionobject_p.h b/src/uml/qobjects/qumlclearvariableactionobject_p.h
index 8beedd9f..56ed3061 100644
--- a/src/uml/qobjects/qumlclearvariableactionobject_p.h
+++ b/src/uml/qobjects/qumlclearvariableactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlClearVariableActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,13 +92,13 @@ class Q_UML_EXPORT QUmlClearVariableActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [VariableAction]
-    Q_PROPERTY(QObject * variable READ variable)
+    Q_PROPERTY(QObject * variable READ variable WRITE setVariable)
 
 public:
     Q_INVOKABLE explicit QUmlClearVariableActionObject(QUmlClearVariableAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlcollaborationobject_p.h b/src/uml/qobjects/qumlcollaborationobject_p.h
index 61b86536..14fe7a71 100644
--- a/src/uml/qobjects/qumlcollaborationobject_p.h
+++ b/src/uml/qobjects/qumlcollaborationobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlCollaborationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlCollaborationObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlCollaborationObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,7 +120,7 @@ class Q_UML_EXPORT QUmlCollaborationObject : public QObject
     Q_PROPERTY(QSet<QObject *> role READ roles)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
diff --git a/src/uml/qobjects/qumlcollaborationuseobject_p.h b/src/uml/qobjects/qumlcollaborationuseobject_p.h
index 1542b271..7a3aa8f5 100644
--- a/src/uml/qobjects/qumlcollaborationuseobject_p.h
+++ b/src/uml/qobjects/qumlcollaborationuseobject_p.h
@@ -65,15 +65,15 @@ class Q_UML_EXPORT QUmlCollaborationUseObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [CollaborationUse]
     Q_PROPERTY(QSet<QObject *> roleBinding READ roleBindings)
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
 public:
     Q_INVOKABLE explicit QUmlCollaborationUseObject(QUmlCollaborationUse *qModelingObject);
diff --git a/src/uml/qobjects/qumlcombinedfragmentobject_p.h b/src/uml/qobjects/qumlcombinedfragmentobject_p.h
index bfc6b79d..0275b3b0 100644
--- a/src/uml/qobjects/qumlcombinedfragmentobject_p.h
+++ b/src/uml/qobjects/qumlcombinedfragmentobject_p.h
@@ -65,21 +65,21 @@ class Q_UML_EXPORT QUmlCombinedFragmentObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [CombinedFragment]
     Q_PROPERTY(QSet<QObject *> cfragmentGate READ cfragmentGates)
-    Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator RESET unsetInteractionOperator)
+    Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator WRITE setInteractionOperator RESET unsetInteractionOperator)
     Q_PROPERTY(QList<QObject *> operand READ operands)
 
 public:
diff --git a/src/uml/qobjects/qumlcommentobject_p.h b/src/uml/qobjects/qumlcommentobject_p.h
index 916fbd50..57434b4c 100644
--- a/src/uml/qobjects/qumlcommentobject_p.h
+++ b/src/uml/qobjects/qumlcommentobject_p.h
@@ -63,7 +63,7 @@ class Q_UML_EXPORT QUmlCommentObject : public QObject
 
     // Properties [Comment]
     Q_PROPERTY(QSet<QObject *> annotatedElement READ annotatedElements)
-    Q_PROPERTY(QString body READ body)
+    Q_PROPERTY(QString body READ body WRITE setBody)
 
 public:
     Q_INVOKABLE explicit QUmlCommentObject(QUmlComment *qModelingObject);
diff --git a/src/uml/qobjects/qumlcommunicationpathobject_p.h b/src/uml/qobjects/qumlcommunicationpathobject_p.h
index 83b1ec54..573b870d 100644
--- a/src/uml/qobjects/qumlcommunicationpathobject_p.h
+++ b/src/uml/qobjects/qumlcommunicationpathobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlCommunicationPathObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlCommunicationPathObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlCommunicationPathObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Relationship]
@@ -118,7 +118,7 @@ class Q_UML_EXPORT QUmlCommunicationPathObject : public QObject
 
     // Properties [Association]
     Q_PROPERTY(QList<QObject *> endType READ endTypes STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
     Q_PROPERTY(QList<QObject *> memberEnd READ memberEnds)
     Q_PROPERTY(QSet<QObject *> navigableOwnedEnd READ navigableOwnedEnds)
     Q_PROPERTY(QList<QObject *> ownedEnd READ ownedEnds)
diff --git a/src/uml/qobjects/qumlcomponentobject_p.h b/src/uml/qobjects/qumlcomponentobject_p.h
index 0b46ea90..e46df2f0 100644
--- a/src/uml/qobjects/qumlcomponentobject_p.h
+++ b/src/uml/qobjects/qumlcomponentobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlComponentObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlComponentObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlComponentObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlComponentObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -135,7 +135,7 @@ class Q_UML_EXPORT QUmlComponentObject : public QObject
     Q_PROPERTY(QSet<QObject *> superClass READ superClasses STORED false)
 
     // Properties [Component]
-    Q_PROPERTY(bool isIndirectlyInstantiated READ isIndirectlyInstantiated RESET unsetIndirectlyInstantiated)
+    Q_PROPERTY(bool isIndirectlyInstantiated READ isIndirectlyInstantiated WRITE setIndirectlyInstantiated RESET unsetIndirectlyInstantiated)
     Q_PROPERTY(QSet<QObject *> packagedElement READ packagedElements)
     Q_PROPERTY(QSet<QObject *> provided READ provided STORED false)
     Q_PROPERTY(QSet<QObject *> realization READ realizations)
diff --git a/src/uml/qobjects/qumlcomponentrealizationobject_p.h b/src/uml/qobjects/qumlcomponentrealizationobject_p.h
index c0085b14..0769d077 100644
--- a/src/uml/qobjects/qumlcomponentrealizationobject_p.h
+++ b/src/uml/qobjects/qumlcomponentrealizationobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlComponentRealizationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -89,10 +89,10 @@ class Q_UML_EXPORT QUmlComponentRealizationObject : public QObject
     Q_PROPERTY(QSet<QObject *> supplier READ suppliers)
 
     // Properties [Abstraction]
-    Q_PROPERTY(QObject * mapping READ mapping)
+    Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
     // Properties [ComponentRealization]
-    Q_PROPERTY(QObject * abstraction READ abstraction)
+    Q_PROPERTY(QObject * abstraction READ abstraction WRITE setAbstraction)
     Q_PROPERTY(QSet<QObject *> realizingClassifier READ realizingClassifiers)
 
 public:
diff --git a/src/uml/qobjects/qumlconditionalnodeobject_p.h b/src/uml/qobjects/qumlconditionalnodeobject_p.h
index 6d8c3c8a..eea48b3f 100644
--- a/src/uml/qobjects/qumlconditionalnodeobject_p.h
+++ b/src/uml/qobjects/qumlconditionalnodeobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlConditionalNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -80,7 +80,7 @@ class Q_UML_EXPORT QUmlConditionalNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -91,7 +91,7 @@ class Q_UML_EXPORT QUmlConditionalNodeObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -111,17 +111,17 @@ class Q_UML_EXPORT QUmlConditionalNodeObject : public QObject
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
     // Properties [StructuredActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> edge READ edges)
-    Q_PROPERTY(bool mustIsolate READ mustIsolate RESET unsetMustIsolate)
+    Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate)
     Q_PROPERTY(QSet<QObject *> node READ nodes)
     Q_PROPERTY(QSet<QObject *> structuredNodeInput READ structuredNodeInputs)
     Q_PROPERTY(QSet<QObject *> variable READ variables)
 
     // Properties [ConditionalNode]
     Q_PROPERTY(QSet<QObject *> clause READ clauses)
-    Q_PROPERTY(bool isAssured READ isAssured RESET unsetAssured)
-    Q_PROPERTY(bool isDeterminate READ isDeterminate RESET unsetDeterminate)
+    Q_PROPERTY(bool isAssured READ isAssured WRITE setAssured RESET unsetAssured)
+    Q_PROPERTY(bool isDeterminate READ isDeterminate WRITE setDeterminate RESET unsetDeterminate)
     Q_PROPERTY(QList<QObject *> result READ results)
 
 public:
diff --git a/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h b/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h
index 1ca2a048..2bad647a 100644
--- a/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumlconnectableelementtemplateparameterobject_p.h
@@ -62,13 +62,13 @@ class Q_UML_EXPORT QUmlConnectableElementTemplateParameterObject : public QObjec
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [TemplateParameter]
-    Q_PROPERTY(QObject * default_ READ default_)
-    Q_PROPERTY(QObject * ownedDefault READ ownedDefault)
-    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement)
-    Q_PROPERTY(QObject * signature READ signature)
+    Q_PROPERTY(QObject * default_ READ default_ WRITE setDefault)
+    Q_PROPERTY(QObject * ownedDefault READ ownedDefault WRITE setOwnedDefault)
+    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement WRITE setOwnedParameteredElement)
+    Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
     // Properties [ConnectableElementTemplateParameter]
-    Q_PROPERTY(QObject * parameteredElement READ parameteredElement)
+    Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
 
 public:
     Q_INVOKABLE explicit QUmlConnectableElementTemplateParameterObject(QUmlConnectableElementTemplateParameter *qModelingObject);
diff --git a/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h b/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h
index 0638ed85..2e445dc3 100644
--- a/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h
+++ b/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h
@@ -65,21 +65,21 @@ class Q_UML_EXPORT QUmlConnectionPointReferenceObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Vertex]
-    Q_PROPERTY(QObject * container READ container)
+    Q_PROPERTY(QObject * container READ container WRITE setContainer)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings STORED false)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings STORED false)
 
     // Properties [ConnectionPointReference]
     Q_PROPERTY(QSet<QObject *> entry READ entries)
     Q_PROPERTY(QSet<QObject *> exit READ exits)
-    Q_PROPERTY(QObject * state READ state)
+    Q_PROPERTY(QObject * state READ state WRITE setState)
 
 public:
     Q_INVOKABLE explicit QUmlConnectionPointReferenceObject(QUmlConnectionPointReference *qModelingObject);
diff --git a/src/uml/qobjects/qumlconnectorendobject_p.h b/src/uml/qobjects/qumlconnectorendobject_p.h
index 3024bea0..cd9e6708 100644
--- a/src/uml/qobjects/qumlconnectorendobject_p.h
+++ b/src/uml/qobjects/qumlconnectorendobject_p.h
@@ -62,17 +62,17 @@ class Q_UML_EXPORT QUmlConnectorEndObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [ConnectorEnd]
     Q_PROPERTY(QObject * definingEnd READ definingEnd STORED false)
-    Q_PROPERTY(QObject * partWithPort READ partWithPort)
-    Q_PROPERTY(QObject * role READ role)
+    Q_PROPERTY(QObject * partWithPort READ partWithPort WRITE setPartWithPort)
+    Q_PROPERTY(QObject * role READ role WRITE setRole)
 
 public:
     Q_INVOKABLE explicit QUmlConnectorEndObject(QUmlConnectorEnd *qModelingObject);
diff --git a/src/uml/qobjects/qumlconnectorobject_p.h b/src/uml/qobjects/qumlconnectorobject_p.h
index 7d500c10..57364a1d 100644
--- a/src/uml/qobjects/qumlconnectorobject_p.h
+++ b/src/uml/qobjects/qumlconnectorobject_p.h
@@ -65,27 +65,27 @@ class Q_UML_EXPORT QUmlConnectorObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [Feature]
     Q_PROPERTY(QSet<QObject *> featuringClassifier READ featuringClassifiers)
-    Q_PROPERTY(bool isStatic READ isStatic RESET unsetStatic)
+    Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
 
     // Properties [Connector]
     Q_PROPERTY(QSet<QObject *> contract READ contracts)
     Q_PROPERTY(QList<QObject *> end READ ends)
     Q_PROPERTY(QtUml::ConnectorKind kind READ kind STORED false)
     Q_PROPERTY(QSet<QObject *> redefinedConnector READ redefinedConnectors)
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
 public:
     Q_INVOKABLE explicit QUmlConnectorObject(QUmlConnector *qModelingObject);
diff --git a/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h b/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h
index 681a321e..3014ef36 100644
--- a/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h
+++ b/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h
@@ -65,21 +65,21 @@ class Q_UML_EXPORT QUmlConsiderIgnoreFragmentObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [CombinedFragment]
     Q_PROPERTY(QSet<QObject *> cfragmentGate READ cfragmentGates)
-    Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator RESET unsetInteractionOperator)
+    Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator WRITE setInteractionOperator RESET unsetInteractionOperator)
     Q_PROPERTY(QList<QObject *> operand READ operands)
 
     // Properties [ConsiderIgnoreFragment]
diff --git a/src/uml/qobjects/qumlconstraintobject_p.h b/src/uml/qobjects/qumlconstraintobject_p.h
index 658eedff..10c68a0b 100644
--- a/src/uml/qobjects/qumlconstraintobject_p.h
+++ b/src/uml/qobjects/qumlconstraintobject_p.h
@@ -64,23 +64,23 @@ class Q_UML_EXPORT QUmlConstraintObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Constraint]
     Q_PROPERTY(QList<QObject *> constrainedElement READ constrainedElements)
-    Q_PROPERTY(QObject * context READ context)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * context READ context WRITE setContext)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
     Q_INVOKABLE explicit QUmlConstraintObject(QUmlConstraint *qModelingObject);
diff --git a/src/uml/qobjects/qumlcontinuationobject_p.h b/src/uml/qobjects/qumlcontinuationobject_p.h
index 3ba42584..0613e1d2 100644
--- a/src/uml/qobjects/qumlcontinuationobject_p.h
+++ b/src/uml/qobjects/qumlcontinuationobject_p.h
@@ -65,20 +65,20 @@ class Q_UML_EXPORT QUmlContinuationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [Continuation]
-    Q_PROPERTY(bool setting READ setting RESET unsetSetting)
+    Q_PROPERTY(bool setting READ setting WRITE setSetting RESET unsetSetting)
 
 public:
     Q_INVOKABLE explicit QUmlContinuationObject(QUmlContinuation *qModelingObject);
diff --git a/src/uml/qobjects/qumlcontrolflowobject_p.h b/src/uml/qobjects/qumlcontrolflowobject_p.h
index df72dfce..c1252d71 100644
--- a/src/uml/qobjects/qumlcontrolflowobject_p.h
+++ b/src/uml/qobjects/qumlcontrolflowobject_p.h
@@ -65,28 +65,28 @@ class Q_UML_EXPORT QUmlControlFlowObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityEdge]
-    Q_PROPERTY(QObject * activity READ activity)
-    Q_PROPERTY(QObject * guard READ guard)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
+    Q_PROPERTY(QObject * guard READ guard WRITE setGuard)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
-    Q_PROPERTY(QObject * interrupts READ interrupts)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
+    Q_PROPERTY(QObject * interrupts READ interrupts WRITE setInterrupts)
     Q_PROPERTY(QSet<QObject *> redefinedEdge READ redefinedEdges)
-    Q_PROPERTY(QObject * source READ source)
-    Q_PROPERTY(QObject * target READ target)
-    Q_PROPERTY(QObject * weight READ weight)
+    Q_PROPERTY(QObject * source READ source WRITE setSource)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
+    Q_PROPERTY(QObject * weight READ weight WRITE setWeight)
 
 public:
     Q_INVOKABLE explicit QUmlControlFlowObject(QUmlControlFlow *qModelingObject);
diff --git a/src/uml/qobjects/qumlcreatelinkactionobject_p.h b/src/uml/qobjects/qumlcreatelinkactionobject_p.h
index 78eb1834..3233e097 100644
--- a/src/uml/qobjects/qumlcreatelinkactionobject_p.h
+++ b/src/uml/qobjects/qumlcreatelinkactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlCreateLinkActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,7 +92,7 @@ class Q_UML_EXPORT QUmlCreateLinkActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
diff --git a/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h b/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h
index 72f2fcc1..a16b062a 100644
--- a/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlCreateLinkObjectActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,7 +92,7 @@ class Q_UML_EXPORT QUmlCreateLinkObjectActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -104,7 +104,7 @@ class Q_UML_EXPORT QUmlCreateLinkObjectActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> endData READ endData)
 
     // Properties [CreateLinkObjectAction]
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlCreateLinkObjectActionObject(QUmlCreateLinkObjectAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlcreateobjectactionobject_p.h b/src/uml/qobjects/qumlcreateobjectactionobject_p.h
index ff76f257..ed8428db 100644
--- a/src/uml/qobjects/qumlcreateobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlcreateobjectactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlCreateObjectActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,14 +92,14 @@ class Q_UML_EXPORT QUmlCreateObjectActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [CreateObjectAction]
-    Q_PROPERTY(QObject * classifier READ classifier)
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * classifier READ classifier WRITE setClassifier)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlCreateObjectActionObject(QUmlCreateObjectAction *qModelingObject);
diff --git a/src/uml/qobjects/qumldatastorenodeobject_p.h b/src/uml/qobjects/qumldatastorenodeobject_p.h
index 910a1707..3d8a788e 100644
--- a/src/uml/qobjects/qumldatastorenodeobject_p.h
+++ b/src/uml/qobjects/qumldatastorenodeobject_p.h
@@ -65,36 +65,36 @@ class Q_UML_EXPORT QUmlDataStoreNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
 public:
     Q_INVOKABLE explicit QUmlDataStoreNodeObject(QUmlDataStoreNode *qModelingObject);
diff --git a/src/uml/qobjects/qumldatatypeobject_p.h b/src/uml/qobjects/qumldatatypeobject_p.h
index c000352f..cd920b4f 100644
--- a/src/uml/qobjects/qumldatatypeobject_p.h
+++ b/src/uml/qobjects/qumldatatypeobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlDataTypeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlDataTypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlDataTypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [DataType]
diff --git a/src/uml/qobjects/qumldecisionnodeobject_p.h b/src/uml/qobjects/qumldecisionnodeobject_p.h
index f63e1b38..89c93790 100644
--- a/src/uml/qobjects/qumldecisionnodeobject_p.h
+++ b/src/uml/qobjects/qumldecisionnodeobject_p.h
@@ -65,30 +65,30 @@ class Q_UML_EXPORT QUmlDecisionNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [DecisionNode]
-    Q_PROPERTY(QObject * decisionInput READ decisionInput)
-    Q_PROPERTY(QObject * decisionInputFlow READ decisionInputFlow)
+    Q_PROPERTY(QObject * decisionInput READ decisionInput WRITE setDecisionInput)
+    Q_PROPERTY(QObject * decisionInputFlow READ decisionInputFlow WRITE setDecisionInputFlow)
 
 public:
     Q_INVOKABLE explicit QUmlDecisionNodeObject(QUmlDecisionNode *qModelingObject);
diff --git a/src/uml/qobjects/qumldependencyobject_p.h b/src/uml/qobjects/qumldependencyobject_p.h
index a9c52c83..5bff3997 100644
--- a/src/uml/qobjects/qumldependencyobject_p.h
+++ b/src/uml/qobjects/qumldependencyobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlDependencyObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
diff --git a/src/uml/qobjects/qumldeploymentobject_p.h b/src/uml/qobjects/qumldeploymentobject_p.h
index ecc36744..bb2a7ff5 100644
--- a/src/uml/qobjects/qumldeploymentobject_p.h
+++ b/src/uml/qobjects/qumldeploymentobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlDeploymentObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -91,7 +91,7 @@ class Q_UML_EXPORT QUmlDeploymentObject : public QObject
     // Properties [Deployment]
     Q_PROPERTY(QSet<QObject *> configuration READ configurations)
     Q_PROPERTY(QSet<QObject *> deployedArtifact READ deployedArtifacts)
-    Q_PROPERTY(QObject * location READ location)
+    Q_PROPERTY(QObject * location READ location WRITE setLocation)
 
 public:
     Q_INVOKABLE explicit QUmlDeploymentObject(QUmlDeployment *qModelingObject);
diff --git a/src/uml/qobjects/qumldeploymentspecificationobject_p.h b/src/uml/qobjects/qumldeploymentspecificationobject_p.h
index ec30237e..ffa17045 100644
--- a/src/uml/qobjects/qumldeploymentspecificationobject_p.h
+++ b/src/uml/qobjects/qumldeploymentspecificationobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlDeploymentSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlDeploymentSpecificationObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,28 +102,28 @@ class Q_UML_EXPORT QUmlDeploymentSpecificationObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Artifact]
-    Q_PROPERTY(QString fileName READ fileName)
+    Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
     Q_PROPERTY(QSet<QObject *> manifestation READ manifestations)
     Q_PROPERTY(QSet<QObject *> nestedArtifact READ nestedArtifacts)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
 
     // Properties [DeploymentSpecification]
-    Q_PROPERTY(QObject * deployment READ deployment)
-    Q_PROPERTY(QString deploymentLocation READ deploymentLocation)
-    Q_PROPERTY(QString executionLocation READ executionLocation)
+    Q_PROPERTY(QObject * deployment READ deployment WRITE setDeployment)
+    Q_PROPERTY(QString deploymentLocation READ deploymentLocation WRITE setDeploymentLocation)
+    Q_PROPERTY(QString executionLocation READ executionLocation WRITE setExecutionLocation)
 
 public:
     Q_INVOKABLE explicit QUmlDeploymentSpecificationObject(QUmlDeploymentSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumldestroylinkactionobject_p.h b/src/uml/qobjects/qumldestroylinkactionobject_p.h
index e9e8f4f5..e0669223 100644
--- a/src/uml/qobjects/qumldestroylinkactionobject_p.h
+++ b/src/uml/qobjects/qumldestroylinkactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlDestroyLinkActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,7 +92,7 @@ class Q_UML_EXPORT QUmlDestroyLinkActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
diff --git a/src/uml/qobjects/qumldestroyobjectactionobject_p.h b/src/uml/qobjects/qumldestroyobjectactionobject_p.h
index 24b0a524..9c3d223d 100644
--- a/src/uml/qobjects/qumldestroyobjectactionobject_p.h
+++ b/src/uml/qobjects/qumldestroyobjectactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlDestroyObjectActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlDestroyObjectActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [DestroyObjectAction]
-    Q_PROPERTY(bool isDestroyLinks READ isDestroyLinks RESET unsetDestroyLinks)
-    Q_PROPERTY(bool isDestroyOwnedObjects READ isDestroyOwnedObjects RESET unsetDestroyOwnedObjects)
-    Q_PROPERTY(QObject * target READ target)
+    Q_PROPERTY(bool isDestroyLinks READ isDestroyLinks WRITE setDestroyLinks RESET unsetDestroyLinks)
+    Q_PROPERTY(bool isDestroyOwnedObjects READ isDestroyOwnedObjects WRITE setDestroyOwnedObjects RESET unsetDestroyOwnedObjects)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
     Q_INVOKABLE explicit QUmlDestroyObjectActionObject(QUmlDestroyObjectAction *qModelingObject);
diff --git a/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h b/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h
index 909cc34f..21963ed0 100644
--- a/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlDestructionOccurrenceSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [OccurrenceSpecification]
-    Q_PROPERTY(QObject * covered READ covered)
+    Q_PROPERTY(QObject * covered READ covered WRITE setCovered)
     Q_PROPERTY(QSet<QObject *> toAfter READ toAfters)
     Q_PROPERTY(QSet<QObject *> toBefore READ toBefores)
 
     // Properties [MessageEnd]
-    Q_PROPERTY(QObject * message READ message)
+    Q_PROPERTY(QObject * message READ message WRITE setMessage)
 
 public:
     Q_INVOKABLE explicit QUmlDestructionOccurrenceSpecificationObject(QUmlDestructionOccurrenceSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumldeviceobject_p.h b/src/uml/qobjects/qumldeviceobject_p.h
index 9fb26cbe..46f09580 100644
--- a/src/uml/qobjects/qumldeviceobject_p.h
+++ b/src/uml/qobjects/qumldeviceobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlDeviceObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlDeviceObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlDeviceObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlDeviceObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
diff --git a/src/uml/qobjects/qumldurationconstraintobject_p.h b/src/uml/qobjects/qumldurationconstraintobject_p.h
index 0e257c38..93a33cc7 100644
--- a/src/uml/qobjects/qumldurationconstraintobject_p.h
+++ b/src/uml/qobjects/qumldurationconstraintobject_p.h
@@ -64,28 +64,28 @@ class Q_UML_EXPORT QUmlDurationConstraintObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Constraint]
     Q_PROPERTY(QList<QObject *> constrainedElement READ constrainedElements)
-    Q_PROPERTY(QObject * context READ context)
+    Q_PROPERTY(QObject * context READ context WRITE setContext)
 
     // Properties [IntervalConstraint]
 
     // Properties [DurationConstraint]
-    Q_PROPERTY(bool firstEvent READ firstEvent)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
     Q_INVOKABLE explicit QUmlDurationConstraintObject(QUmlDurationConstraint *qModelingObject);
diff --git a/src/uml/qobjects/qumldurationintervalobject_p.h b/src/uml/qobjects/qumldurationintervalobject_p.h
index 45a22872..92d65cd1 100644
--- a/src/uml/qobjects/qumldurationintervalobject_p.h
+++ b/src/uml/qobjects/qumldurationintervalobject_p.h
@@ -65,26 +65,26 @@ class Q_UML_EXPORT QUmlDurationIntervalObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Interval]
 
     // Properties [DurationInterval]
-    Q_PROPERTY(QObject * max READ max)
-    Q_PROPERTY(QObject * min READ min)
+    Q_PROPERTY(QObject * max READ max WRITE setMax)
+    Q_PROPERTY(QObject * min READ min WRITE setMin)
 
 public:
     Q_INVOKABLE explicit QUmlDurationIntervalObject(QUmlDurationInterval *qModelingObject);
diff --git a/src/uml/qobjects/qumldurationobject_p.h b/src/uml/qobjects/qumldurationobject_p.h
index 245074c9..59f26a51 100644
--- a/src/uml/qobjects/qumldurationobject_p.h
+++ b/src/uml/qobjects/qumldurationobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlDurationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Duration]
-    Q_PROPERTY(QObject * expr READ expr)
+    Q_PROPERTY(QObject * expr READ expr WRITE setExpr)
     Q_PROPERTY(QSet<QObject *> observation READ observations)
 
 public:
diff --git a/src/uml/qobjects/qumldurationobservationobject_p.h b/src/uml/qobjects/qumldurationobservationobject_p.h
index f5d7a5c5..4e68101e 100644
--- a/src/uml/qobjects/qumldurationobservationobject_p.h
+++ b/src/uml/qobjects/qumldurationobservationobject_p.h
@@ -64,22 +64,22 @@ class Q_UML_EXPORT QUmlDurationObservationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [DurationObservation]
-    Q_PROPERTY(QObject * event READ event)
-    Q_PROPERTY(bool firstEvent READ firstEvent)
+    Q_PROPERTY(QObject * event READ event WRITE setEvent)
+    Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent)
 
 public:
     Q_INVOKABLE explicit QUmlDurationObservationObject(QUmlDurationObservation *qModelingObject);
diff --git a/src/uml/qobjects/qumlelementimportobject_p.h b/src/uml/qobjects/qumlelementimportobject_p.h
index f2e00a12..a3e9edb8 100644
--- a/src/uml/qobjects/qumlelementimportobject_p.h
+++ b/src/uml/qobjects/qumlelementimportobject_p.h
@@ -71,10 +71,10 @@ class Q_UML_EXPORT QUmlElementImportObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [ElementImport]
-    Q_PROPERTY(QString alias READ alias)
-    Q_PROPERTY(QObject * importedElement READ importedElement)
-    Q_PROPERTY(QObject * importingNamespace READ importingNamespace)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QString alias READ alias WRITE setAlias)
+    Q_PROPERTY(QObject * importedElement READ importedElement WRITE setImportedElement)
+    Q_PROPERTY(QObject * importingNamespace READ importingNamespace WRITE setImportingNamespace)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
     Q_INVOKABLE explicit QUmlElementImportObject(QUmlElementImport *qModelingObject);
diff --git a/src/uml/qobjects/qumlenumerationliteralobject_p.h b/src/uml/qobjects/qumlenumerationliteralobject_p.h
index 4f915ae6..2d049654 100644
--- a/src/uml/qobjects/qumlenumerationliteralobject_p.h
+++ b/src/uml/qobjects/qumlenumerationliteralobject_p.h
@@ -65,17 +65,17 @@ class Q_UML_EXPORT QUmlEnumerationLiteralObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [DeploymentTarget]
     Q_PROPERTY(QSet<QObject *> deployedElement READ deployedElements STORED false)
@@ -83,11 +83,11 @@ class Q_UML_EXPORT QUmlEnumerationLiteralObject : public QObject
 
     // Properties [InstanceSpecification]
     Q_PROPERTY(QSet<QObject *> slot_ READ slots_)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [EnumerationLiteral]
     Q_PROPERTY(QObject * classifier READ classifier STORED false)
-    Q_PROPERTY(QObject * enumeration READ enumeration)
+    Q_PROPERTY(QObject * enumeration READ enumeration WRITE setEnumeration)
 
 public:
     Q_INVOKABLE explicit QUmlEnumerationLiteralObject(QUmlEnumerationLiteral *qModelingObject);
diff --git a/src/uml/qobjects/qumlenumerationobject_p.h b/src/uml/qobjects/qumlenumerationobject_p.h
index 2a89ab7a..33d8a522 100644
--- a/src/uml/qobjects/qumlenumerationobject_p.h
+++ b/src/uml/qobjects/qumlenumerationobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlEnumerationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlEnumerationObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlEnumerationObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [DataType]
diff --git a/src/uml/qobjects/qumlexceptionhandlerobject_p.h b/src/uml/qobjects/qumlexceptionhandlerobject_p.h
index 34803a6a..da429a2d 100644
--- a/src/uml/qobjects/qumlexceptionhandlerobject_p.h
+++ b/src/uml/qobjects/qumlexceptionhandlerobject_p.h
@@ -62,10 +62,10 @@ class Q_UML_EXPORT QUmlExceptionHandlerObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ExceptionHandler]
-    Q_PROPERTY(QObject * exceptionInput READ exceptionInput)
+    Q_PROPERTY(QObject * exceptionInput READ exceptionInput WRITE setExceptionInput)
     Q_PROPERTY(QSet<QObject *> exceptionType READ exceptionTypes)
-    Q_PROPERTY(QObject * handlerBody READ handlerBody)
-    Q_PROPERTY(QObject * protectedNode READ protectedNode)
+    Q_PROPERTY(QObject * handlerBody READ handlerBody WRITE setHandlerBody)
+    Q_PROPERTY(QObject * protectedNode READ protectedNode WRITE setProtectedNode)
 
 public:
     Q_INVOKABLE explicit QUmlExceptionHandlerObject(QUmlExceptionHandler *qModelingObject);
diff --git a/src/uml/qobjects/qumlexecutionenvironmentobject_p.h b/src/uml/qobjects/qumlexecutionenvironmentobject_p.h
index 68b3c4a3..21c9b876 100644
--- a/src/uml/qobjects/qumlexecutionenvironmentobject_p.h
+++ b/src/uml/qobjects/qumlexecutionenvironmentobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlExecutionEnvironmentObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
diff --git a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h
index bbbe603e..c5171635 100644
--- a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlExecutionOccurrenceSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [OccurrenceSpecification]
-    Q_PROPERTY(QObject * covered READ covered)
+    Q_PROPERTY(QObject * covered READ covered WRITE setCovered)
     Q_PROPERTY(QSet<QObject *> toAfter READ toAfters)
     Q_PROPERTY(QSet<QObject *> toBefore READ toBefores)
 
     // Properties [ExecutionOccurrenceSpecification]
-    Q_PROPERTY(QObject * execution READ execution)
+    Q_PROPERTY(QObject * execution READ execution WRITE setExecution)
 
 public:
     Q_INVOKABLE explicit QUmlExecutionOccurrenceSpecificationObject(QUmlExecutionOccurrenceSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumlexpansionnodeobject_p.h b/src/uml/qobjects/qumlexpansionnodeobject_p.h
index f3e33737..3485a4f4 100644
--- a/src/uml/qobjects/qumlexpansionnodeobject_p.h
+++ b/src/uml/qobjects/qumlexpansionnodeobject_p.h
@@ -65,40 +65,40 @@ class Q_UML_EXPORT QUmlExpansionNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
     // Properties [ExpansionNode]
-    Q_PROPERTY(QObject * regionAsInput READ regionAsInput)
-    Q_PROPERTY(QObject * regionAsOutput READ regionAsOutput)
+    Q_PROPERTY(QObject * regionAsInput READ regionAsInput WRITE setRegionAsInput)
+    Q_PROPERTY(QObject * regionAsOutput READ regionAsOutput WRITE setRegionAsOutput)
 
 public:
     Q_INVOKABLE explicit QUmlExpansionNodeObject(QUmlExpansionNode *qModelingObject);
diff --git a/src/uml/qobjects/qumlexpansionregionobject_p.h b/src/uml/qobjects/qumlexpansionregionobject_p.h
index 9209583a..c5330d3c 100644
--- a/src/uml/qobjects/qumlexpansionregionobject_p.h
+++ b/src/uml/qobjects/qumlexpansionregionobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -80,7 +80,7 @@ class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -91,7 +91,7 @@ class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -111,9 +111,9 @@ class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
     // Properties [StructuredActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> edge READ edges)
-    Q_PROPERTY(bool mustIsolate READ mustIsolate RESET unsetMustIsolate)
+    Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate)
     Q_PROPERTY(QSet<QObject *> node READ nodes)
     Q_PROPERTY(QSet<QObject *> structuredNodeInput READ structuredNodeInputs)
     Q_PROPERTY(QSet<QObject *> structuredNodeOutput READ structuredNodeOutputs)
@@ -121,7 +121,7 @@ class Q_UML_EXPORT QUmlExpansionRegionObject : public QObject
 
     // Properties [ExpansionRegion]
     Q_PROPERTY(QSet<QObject *> inputElement READ inputElements)
-    Q_PROPERTY(QtUml::ExpansionKind mode READ mode RESET unsetMode)
+    Q_PROPERTY(QtUml::ExpansionKind mode READ mode WRITE setMode RESET unsetMode)
     Q_PROPERTY(QSet<QObject *> outputElement READ outputElements)
 
 public:
diff --git a/src/uml/qobjects/qumlexpressionobject_p.h b/src/uml/qobjects/qumlexpressionobject_p.h
index 2663d2d5..83700ead 100644
--- a/src/uml/qobjects/qumlexpressionobject_p.h
+++ b/src/uml/qobjects/qumlexpressionobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlExpressionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Expression]
     Q_PROPERTY(QList<QObject *> operand READ operands)
-    Q_PROPERTY(QString symbol READ symbol)
+    Q_PROPERTY(QString symbol READ symbol WRITE setSymbol)
 
 public:
     Q_INVOKABLE explicit QUmlExpressionObject(QUmlExpression *qModelingObject);
diff --git a/src/uml/qobjects/qumlextendobject_p.h b/src/uml/qobjects/qumlextendobject_p.h
index 24985fbd..e79eefa6 100644
--- a/src/uml/qobjects/qumlextendobject_p.h
+++ b/src/uml/qobjects/qumlextendobject_p.h
@@ -72,16 +72,16 @@ class Q_UML_EXPORT QUmlExtendObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Extend]
-    Q_PROPERTY(QObject * condition READ condition)
-    Q_PROPERTY(QObject * extendedCase READ extendedCase)
-    Q_PROPERTY(QObject * extension READ extension)
+    Q_PROPERTY(QObject * condition READ condition WRITE setCondition)
+    Q_PROPERTY(QObject * extendedCase READ extendedCase WRITE setExtendedCase)
+    Q_PROPERTY(QObject * extension READ extension WRITE setExtension)
     Q_PROPERTY(QList<QObject *> extensionLocation READ extensionLocations)
 
 public:
diff --git a/src/uml/qobjects/qumlextensionendobject_p.h b/src/uml/qobjects/qumlextensionendobject_p.h
index 7d8d5e9a..f4a31c19 100644
--- a/src/uml/qobjects/qumlextensionendobject_p.h
+++ b/src/uml/qobjects/qumlextensionendobject_p.h
@@ -65,66 +65,66 @@ class Q_UML_EXPORT QUmlExtensionEndObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [TypedElement]
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [Feature]
     Q_PROPERTY(QSet<QObject *> featuringClassifier READ featuringClassifiers)
-    Q_PROPERTY(bool isStatic READ isStatic RESET unsetStatic)
+    Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
 
     // Properties [StructuralFeature]
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [ConnectableElement]
     Q_PROPERTY(QList<QObject *> end READ ends STORED false)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [DeploymentTarget]
     Q_PROPERTY(QSet<QObject *> deployedElement READ deployedElements STORED false)
     Q_PROPERTY(QSet<QObject *> deployment READ deployments)
 
     // Properties [Property]
-    Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation RESET unsetAggregation)
-    Q_PROPERTY(QObject * association READ association)
-    Q_PROPERTY(QObject * associationEnd READ associationEnd)
-    Q_PROPERTY(QObject * class_ READ class_)
-    Q_PROPERTY(QObject * datatype READ datatype)
-    Q_PROPERTY(QString default_ READ default_ STORED false)
-    Q_PROPERTY(QObject * defaultValue READ defaultValue)
-    Q_PROPERTY(QObject * interface_ READ interface_)
-    Q_PROPERTY(bool isComposite READ isComposite RESET unsetComposite STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
-    Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion RESET unsetDerivedUnion)
-    Q_PROPERTY(bool isID READ isID RESET unsetID)
-    Q_PROPERTY(bool isReadOnly READ isReadOnly RESET unsetReadOnly)
-    Q_PROPERTY(QObject * opposite READ opposite STORED false)
-    Q_PROPERTY(QObject * owningAssociation READ owningAssociation)
+    Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation)
+    Q_PROPERTY(QObject * association READ association WRITE setAssociation)
+    Q_PROPERTY(QObject * associationEnd READ associationEnd WRITE setAssociationEnd)
+    Q_PROPERTY(QObject * class_ READ class_ WRITE setClass)
+    Q_PROPERTY(QObject * datatype READ datatype WRITE setDatatype)
+    Q_PROPERTY(QString default_ READ default_ WRITE setDefault STORED false)
+    Q_PROPERTY(QObject * defaultValue READ defaultValue WRITE setDefaultValue)
+    Q_PROPERTY(QObject * interface_ READ interface_ WRITE setInterface)
+    Q_PROPERTY(bool isComposite READ isComposite WRITE setComposite RESET unsetComposite STORED false)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion)
+    Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID)
+    Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly)
+    Q_PROPERTY(QObject * opposite READ opposite WRITE setOpposite STORED false)
+    Q_PROPERTY(QObject * owningAssociation READ owningAssociation WRITE setOwningAssociation)
     Q_PROPERTY(QList<QObject *> qualifier READ qualifiers)
     Q_PROPERTY(QSet<QObject *> redefinedProperty READ redefinedProperties)
     Q_PROPERTY(QSet<QObject *> subsettedProperty READ subsettedProperties)
 
     // Properties [ExtensionEnd]
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
 public:
     Q_INVOKABLE explicit QUmlExtensionEndObject(QUmlExtensionEnd *qModelingObject);
diff --git a/src/uml/qobjects/qumlextensionobject_p.h b/src/uml/qobjects/qumlextensionobject_p.h
index aef34d86..0f0648b3 100644
--- a/src/uml/qobjects/qumlextensionobject_p.h
+++ b/src/uml/qobjects/qumlextensionobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlExtensionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlExtensionObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlExtensionObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Relationship]
@@ -118,14 +118,14 @@ class Q_UML_EXPORT QUmlExtensionObject : public QObject
 
     // Properties [Association]
     Q_PROPERTY(QList<QObject *> endType READ endTypes STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
     Q_PROPERTY(QList<QObject *> memberEnd READ memberEnds)
     Q_PROPERTY(QSet<QObject *> navigableOwnedEnd READ navigableOwnedEnds)
 
     // Properties [Extension]
     Q_PROPERTY(bool isRequired READ isRequired RESET unsetRequired STORED false)
     Q_PROPERTY(QObject * metaclass READ metaclass STORED false)
-    Q_PROPERTY(QObject * ownedEnd READ ownedEnd)
+    Q_PROPERTY(QObject * ownedEnd READ ownedEnd WRITE setOwnedEnd)
 
 public:
     Q_INVOKABLE explicit QUmlExtensionObject(QUmlExtension *qModelingObject);
diff --git a/src/uml/qobjects/qumlextensionpointobject_p.h b/src/uml/qobjects/qumlextensionpointobject_p.h
index 24182b10..d6f84f8a 100644
--- a/src/uml/qobjects/qumlextensionpointobject_p.h
+++ b/src/uml/qobjects/qumlextensionpointobject_p.h
@@ -65,19 +65,19 @@ class Q_UML_EXPORT QUmlExtensionPointObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ExtensionPoint]
-    Q_PROPERTY(QObject * useCase READ useCase)
+    Q_PROPERTY(QObject * useCase READ useCase WRITE setUseCase)
 
 public:
     Q_INVOKABLE explicit QUmlExtensionPointObject(QUmlExtensionPoint *qModelingObject);
diff --git a/src/uml/qobjects/qumlfinalstateobject_p.h b/src/uml/qobjects/qumlfinalstateobject_p.h
index 5a31fc87..98117631 100644
--- a/src/uml/qobjects/qumlfinalstateobject_p.h
+++ b/src/uml/qobjects/qumlfinalstateobject_p.h
@@ -65,11 +65,11 @@ class Q_UML_EXPORT QUmlFinalStateObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Namespace]
     Q_PROPERTY(QSet<QObject *> elementImport READ elementImports)
@@ -80,11 +80,11 @@ class Q_UML_EXPORT QUmlFinalStateObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
 
     // Properties [Vertex]
-    Q_PROPERTY(QObject * container READ container)
+    Q_PROPERTY(QObject * container READ container WRITE setContainer)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings STORED false)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings STORED false)
 
@@ -92,18 +92,18 @@ class Q_UML_EXPORT QUmlFinalStateObject : public QObject
     Q_PROPERTY(QSet<QObject *> connection READ connections)
     Q_PROPERTY(QSet<QObject *> connectionPoint READ connectionPoints)
     Q_PROPERTY(QSet<QObject *> deferrableTrigger READ deferrableTriggers)
-    Q_PROPERTY(QObject * doActivity READ doActivity)
-    Q_PROPERTY(QObject * entry READ entry)
-    Q_PROPERTY(QObject * exit READ exit)
+    Q_PROPERTY(QObject * doActivity READ doActivity WRITE setDoActivity)
+    Q_PROPERTY(QObject * entry READ entry WRITE setEntry)
+    Q_PROPERTY(QObject * exit READ exit WRITE setExit)
     Q_PROPERTY(bool isComposite READ isComposite RESET unsetComposite STORED false)
     Q_PROPERTY(bool isOrthogonal READ isOrthogonal RESET unsetOrthogonal STORED false)
     Q_PROPERTY(bool isSimple READ isSimple RESET unsetSimple STORED false)
     Q_PROPERTY(bool isSubmachineState READ isSubmachineState RESET unsetSubmachineState STORED false)
-    Q_PROPERTY(QObject * redefinedState READ redefinedState)
+    Q_PROPERTY(QObject * redefinedState READ redefinedState WRITE setRedefinedState)
     Q_PROPERTY(QObject * redefinitionContext READ redefinitionContext STORED false)
     Q_PROPERTY(QSet<QObject *> region READ regions)
-    Q_PROPERTY(QObject * stateInvariant READ stateInvariant)
-    Q_PROPERTY(QObject * submachine READ submachine)
+    Q_PROPERTY(QObject * stateInvariant READ stateInvariant WRITE setStateInvariant)
+    Q_PROPERTY(QObject * submachine READ submachine WRITE setSubmachine)
 
 public:
     Q_INVOKABLE explicit QUmlFinalStateObject(QUmlFinalState *qModelingObject);
diff --git a/src/uml/qobjects/qumlflowfinalnodeobject_p.h b/src/uml/qobjects/qumlflowfinalnodeobject_p.h
index 5fb6b5a3..fbd9864c 100644
--- a/src/uml/qobjects/qumlflowfinalnodeobject_p.h
+++ b/src/uml/qobjects/qumlflowfinalnodeobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlFlowFinalNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
diff --git a/src/uml/qobjects/qumlforknodeobject_p.h b/src/uml/qobjects/qumlforknodeobject_p.h
index 0f724fdf..620dfc0d 100644
--- a/src/uml/qobjects/qumlforknodeobject_p.h
+++ b/src/uml/qobjects/qumlforknodeobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlForkNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
diff --git a/src/uml/qobjects/qumlfunctionbehaviorobject_p.h b/src/uml/qobjects/qumlfunctionbehaviorobject_p.h
index 9f53e062..acda92c6 100644
--- a/src/uml/qobjects/qumlfunctionbehaviorobject_p.h
+++ b/src/uml/qobjects/qumlfunctionbehaviorobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -136,13 +136,13 @@ class Q_UML_EXPORT QUmlFunctionBehaviorObject : public QObject
 
     // Properties [Behavior]
     Q_PROPERTY(QObject * context READ context STORED false)
-    Q_PROPERTY(bool isReentrant READ isReentrant RESET unsetReentrant)
+    Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> postcondition READ postconditions)
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
     Q_PROPERTY(QSet<QObject *> redefinedBehavior READ redefinedBehaviors)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [OpaqueBehavior]
     Q_PROPERTY(QList<QString> body READ bodies)
diff --git a/src/uml/qobjects/qumlgateobject_p.h b/src/uml/qobjects/qumlgateobject_p.h
index dabd0ebb..53b41438 100644
--- a/src/uml/qobjects/qumlgateobject_p.h
+++ b/src/uml/qobjects/qumlgateobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlGateObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [MessageEnd]
-    Q_PROPERTY(QObject * message READ message)
+    Q_PROPERTY(QObject * message READ message WRITE setMessage)
 
 public:
     Q_INVOKABLE explicit QUmlGateObject(QUmlGate *qModelingObject);
diff --git a/src/uml/qobjects/qumlgeneralizationobject_p.h b/src/uml/qobjects/qumlgeneralizationobject_p.h
index 2fe0c1d5..00925de2 100644
--- a/src/uml/qobjects/qumlgeneralizationobject_p.h
+++ b/src/uml/qobjects/qumlgeneralizationobject_p.h
@@ -69,10 +69,10 @@ class Q_UML_EXPORT QUmlGeneralizationObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [Generalization]
-    Q_PROPERTY(QObject * general READ general)
+    Q_PROPERTY(QObject * general READ general WRITE setGeneral)
     Q_PROPERTY(QSet<QObject *> generalizationSet READ generalizationSets)
-    Q_PROPERTY(bool isSubstitutable READ isSubstitutable RESET unsetSubstitutable)
-    Q_PROPERTY(QObject * specific READ specific)
+    Q_PROPERTY(bool isSubstitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable)
+    Q_PROPERTY(QObject * specific READ specific WRITE setSpecific)
 
 public:
     Q_INVOKABLE explicit QUmlGeneralizationObject(QUmlGeneralization *qModelingObject);
diff --git a/src/uml/qobjects/qumlgeneralizationsetobject_p.h b/src/uml/qobjects/qumlgeneralizationsetobject_p.h
index fcdcd2bc..1ec52ca5 100644
--- a/src/uml/qobjects/qumlgeneralizationsetobject_p.h
+++ b/src/uml/qobjects/qumlgeneralizationsetobject_p.h
@@ -64,24 +64,24 @@ class Q_UML_EXPORT QUmlGeneralizationSetObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [GeneralizationSet]
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
-    Q_PROPERTY(bool isCovering READ isCovering RESET unsetCovering)
-    Q_PROPERTY(bool isDisjoint READ isDisjoint RESET unsetDisjoint)
-    Q_PROPERTY(QObject * powertype READ powertype)
+    Q_PROPERTY(bool isCovering READ isCovering WRITE setCovering RESET unsetCovering)
+    Q_PROPERTY(bool isDisjoint READ isDisjoint WRITE setDisjoint RESET unsetDisjoint)
+    Q_PROPERTY(QObject * powertype READ powertype WRITE setPowertype)
 
 public:
     Q_INVOKABLE explicit QUmlGeneralizationSetObject(QUmlGeneralizationSet *qModelingObject);
diff --git a/src/uml/qobjects/qumlgeneralorderingobject_p.h b/src/uml/qobjects/qumlgeneralorderingobject_p.h
index 63ef6ab8..7cb50e9c 100644
--- a/src/uml/qobjects/qumlgeneralorderingobject_p.h
+++ b/src/uml/qobjects/qumlgeneralorderingobject_p.h
@@ -65,15 +65,15 @@ class Q_UML_EXPORT QUmlGeneralOrderingObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [GeneralOrdering]
-    Q_PROPERTY(QObject * after READ after)
-    Q_PROPERTY(QObject * before READ before)
+    Q_PROPERTY(QObject * after READ after WRITE setAfter)
+    Q_PROPERTY(QObject * before READ before WRITE setBefore)
 
 public:
     Q_INVOKABLE explicit QUmlGeneralOrderingObject(QUmlGeneralOrdering *qModelingObject);
diff --git a/src/uml/qobjects/qumlimageobject_p.h b/src/uml/qobjects/qumlimageobject_p.h
index 9246dc76..e8f47e8b 100644
--- a/src/uml/qobjects/qumlimageobject_p.h
+++ b/src/uml/qobjects/qumlimageobject_p.h
@@ -62,9 +62,9 @@ class Q_UML_EXPORT QUmlImageObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [Image]
-    Q_PROPERTY(QString content READ content)
-    Q_PROPERTY(QString format READ format)
-    Q_PROPERTY(QString location READ location)
+    Q_PROPERTY(QString content READ content WRITE setContent)
+    Q_PROPERTY(QString format READ format WRITE setFormat)
+    Q_PROPERTY(QString location READ location WRITE setLocation)
 
 public:
     Q_INVOKABLE explicit QUmlImageObject(QUmlImage *qModelingObject);
diff --git a/src/uml/qobjects/qumlincludeobject_p.h b/src/uml/qobjects/qumlincludeobject_p.h
index 4c6cde81..144b3499 100644
--- a/src/uml/qobjects/qumlincludeobject_p.h
+++ b/src/uml/qobjects/qumlincludeobject_p.h
@@ -72,15 +72,15 @@ class Q_UML_EXPORT QUmlIncludeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Include]
-    Q_PROPERTY(QObject * addition READ addition)
-    Q_PROPERTY(QObject * includingCase READ includingCase)
+    Q_PROPERTY(QObject * addition READ addition WRITE setAddition)
+    Q_PROPERTY(QObject * includingCase READ includingCase WRITE setIncludingCase)
 
 public:
     Q_INVOKABLE explicit QUmlIncludeObject(QUmlInclude *qModelingObject);
diff --git a/src/uml/qobjects/qumlinformationflowobject_p.h b/src/uml/qobjects/qumlinformationflowobject_p.h
index e4ab9d21..5a0dc53e 100644
--- a/src/uml/qobjects/qumlinformationflowobject_p.h
+++ b/src/uml/qobjects/qumlinformationflowobject_p.h
@@ -71,18 +71,18 @@ class Q_UML_EXPORT QUmlInformationFlowObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [InformationFlow]
     Q_PROPERTY(QSet<QObject *> conveyed READ conveyed)
diff --git a/src/uml/qobjects/qumlinformationitemobject_p.h b/src/uml/qobjects/qumlinformationitemobject_p.h
index e78f72b7..ab57a393 100644
--- a/src/uml/qobjects/qumlinformationitemobject_p.h
+++ b/src/uml/qobjects/qumlinformationitemobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlInformationItemObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlInformationItemObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlInformationItemObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [InformationItem]
diff --git a/src/uml/qobjects/qumlinitialnodeobject_p.h b/src/uml/qobjects/qumlinitialnodeobject_p.h
index 4a319b69..3cca6641 100644
--- a/src/uml/qobjects/qumlinitialnodeobject_p.h
+++ b/src/uml/qobjects/qumlinitialnodeobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlInitialNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
diff --git a/src/uml/qobjects/qumlinputpinobject_p.h b/src/uml/qobjects/qumlinputpinobject_p.h
index b1e511b2..dd39bb9d 100644
--- a/src/uml/qobjects/qumlinputpinobject_p.h
+++ b/src/uml/qobjects/qumlinputpinobject_p.h
@@ -64,48 +64,48 @@ class Q_UML_EXPORT QUmlInputPinObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
     // Properties [Pin]
-    Q_PROPERTY(bool isControl READ isControl RESET unsetControl)
+    Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl)
 
 public:
     Q_INVOKABLE explicit QUmlInputPinObject(QUmlInputPin *qModelingObject);
diff --git a/src/uml/qobjects/qumlinstancespecificationobject_p.h b/src/uml/qobjects/qumlinstancespecificationobject_p.h
index 837615fe..cda22f78 100644
--- a/src/uml/qobjects/qumlinstancespecificationobject_p.h
+++ b/src/uml/qobjects/qumlinstancespecificationobject_p.h
@@ -65,17 +65,17 @@ class Q_UML_EXPORT QUmlInstanceSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [DeploymentTarget]
     Q_PROPERTY(QSet<QObject *> deployedElement READ deployedElements STORED false)
@@ -84,7 +84,7 @@ class Q_UML_EXPORT QUmlInstanceSpecificationObject : public QObject
     // Properties [InstanceSpecification]
     Q_PROPERTY(QSet<QObject *> classifier READ classifiers)
     Q_PROPERTY(QSet<QObject *> slot_ READ slots_)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
     Q_INVOKABLE explicit QUmlInstanceSpecificationObject(QUmlInstanceSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumlinstancevalueobject_p.h b/src/uml/qobjects/qumlinstancevalueobject_p.h
index c048e46a..50b78a02 100644
--- a/src/uml/qobjects/qumlinstancevalueobject_p.h
+++ b/src/uml/qobjects/qumlinstancevalueobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlInstanceValueObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [InstanceValue]
-    Q_PROPERTY(QObject * instance READ instance)
+    Q_PROPERTY(QObject * instance READ instance WRITE setInstance)
 
 public:
     Q_INVOKABLE explicit QUmlInstanceValueObject(QUmlInstanceValue *qModelingObject);
diff --git a/src/uml/qobjects/qumlinteractionconstraintobject_p.h b/src/uml/qobjects/qumlinteractionconstraintobject_p.h
index 851a3b35..778edd0d 100644
--- a/src/uml/qobjects/qumlinteractionconstraintobject_p.h
+++ b/src/uml/qobjects/qumlinteractionconstraintobject_p.h
@@ -64,27 +64,27 @@ class Q_UML_EXPORT QUmlInteractionConstraintObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Constraint]
     Q_PROPERTY(QList<QObject *> constrainedElement READ constrainedElements)
-    Q_PROPERTY(QObject * context READ context)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * context READ context WRITE setContext)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [InteractionConstraint]
-    Q_PROPERTY(QObject * maxint READ maxint)
-    Q_PROPERTY(QObject * minint READ minint)
+    Q_PROPERTY(QObject * maxint READ maxint WRITE setMaxint)
+    Q_PROPERTY(QObject * minint READ minint WRITE setMinint)
 
 public:
     Q_INVOKABLE explicit QUmlInteractionConstraintObject(QUmlInteractionConstraint *qModelingObject);
diff --git a/src/uml/qobjects/qumlinteractionobject_p.h b/src/uml/qobjects/qumlinteractionobject_p.h
index 480c4709..cd9ea282 100644
--- a/src/uml/qobjects/qumlinteractionobject_p.h
+++ b/src/uml/qobjects/qumlinteractionobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlInteractionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlInteractionObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlInteractionObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlInteractionObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -136,18 +136,18 @@ class Q_UML_EXPORT QUmlInteractionObject : public QObject
 
     // Properties [Behavior]
     Q_PROPERTY(QObject * context READ context STORED false)
-    Q_PROPERTY(bool isReentrant READ isReentrant RESET unsetReentrant)
+    Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> postcondition READ postconditions)
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
     Q_PROPERTY(QSet<QObject *> redefinedBehavior READ redefinedBehaviors)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [Interaction]
diff --git a/src/uml/qobjects/qumlinteractionoperandobject_p.h b/src/uml/qobjects/qumlinteractionoperandobject_p.h
index 361f3351..1f45aed2 100644
--- a/src/uml/qobjects/qumlinteractionoperandobject_p.h
+++ b/src/uml/qobjects/qumlinteractionoperandobject_p.h
@@ -65,16 +65,16 @@ class Q_UML_EXPORT QUmlInteractionOperandObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [Namespace]
@@ -87,7 +87,7 @@ class Q_UML_EXPORT QUmlInteractionOperandObject : public QObject
 
     // Properties [InteractionOperand]
     Q_PROPERTY(QList<QObject *> fragment READ fragments)
-    Q_PROPERTY(QObject * guard READ guard)
+    Q_PROPERTY(QObject * guard READ guard WRITE setGuard)
 
 public:
     Q_INVOKABLE explicit QUmlInteractionOperandObject(QUmlInteractionOperand *qModelingObject);
diff --git a/src/uml/qobjects/qumlinteractionuseobject_p.h b/src/uml/qobjects/qumlinteractionuseobject_p.h
index a4aee68d..9e13c712 100644
--- a/src/uml/qobjects/qumlinteractionuseobject_p.h
+++ b/src/uml/qobjects/qumlinteractionuseobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlInteractionUseObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [InteractionUse]
     Q_PROPERTY(QSet<QObject *> actualGate READ actualGates)
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * refersTo READ refersTo)
-    Q_PROPERTY(QObject * returnValue READ returnValue)
-    Q_PROPERTY(QObject * returnValueRecipient READ returnValueRecipient)
+    Q_PROPERTY(QObject * refersTo READ refersTo WRITE setRefersTo)
+    Q_PROPERTY(QObject * returnValue READ returnValue WRITE setReturnValue)
+    Q_PROPERTY(QObject * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient)
 
 public:
     Q_INVOKABLE explicit QUmlInteractionUseObject(QUmlInteractionUse *qModelingObject);
diff --git a/src/uml/qobjects/qumlinterfaceobject_p.h b/src/uml/qobjects/qumlinterfaceobject_p.h
index 77224114..de154d75 100644
--- a/src/uml/qobjects/qumlinterfaceobject_p.h
+++ b/src/uml/qobjects/qumlinterfaceobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlInterfaceObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlInterfaceObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlInterfaceObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Interface]
@@ -118,7 +118,7 @@ class Q_UML_EXPORT QUmlInterfaceObject : public QObject
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
     Q_PROPERTY(QSet<QObject *> ownedReception READ ownedReceptions)
-    Q_PROPERTY(QObject * protocol READ protocol)
+    Q_PROPERTY(QObject * protocol READ protocol WRITE setProtocol)
     Q_PROPERTY(QSet<QObject *> redefinedInterface READ redefinedInterfaces)
 
 public:
diff --git a/src/uml/qobjects/qumlinterfacerealizationobject_p.h b/src/uml/qobjects/qumlinterfacerealizationobject_p.h
index 1a974daa..75eb9042 100644
--- a/src/uml/qobjects/qumlinterfacerealizationobject_p.h
+++ b/src/uml/qobjects/qumlinterfacerealizationobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlInterfaceRealizationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -89,11 +89,11 @@ class Q_UML_EXPORT QUmlInterfaceRealizationObject : public QObject
     Q_PROPERTY(QSet<QObject *> supplier READ suppliers)
 
     // Properties [Abstraction]
-    Q_PROPERTY(QObject * mapping READ mapping)
+    Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
     // Properties [InterfaceRealization]
-    Q_PROPERTY(QObject * contract READ contract)
-    Q_PROPERTY(QObject * implementingClassifier READ implementingClassifier)
+    Q_PROPERTY(QObject * contract READ contract WRITE setContract)
+    Q_PROPERTY(QObject * implementingClassifier READ implementingClassifier WRITE setImplementingClassifier)
 
 public:
     Q_INVOKABLE explicit QUmlInterfaceRealizationObject(QUmlInterfaceRealization *qModelingObject);
diff --git a/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h b/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h
index b4c8c7f0..cfa81390 100644
--- a/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h
+++ b/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h
@@ -65,16 +65,16 @@ class Q_UML_EXPORT QUmlInterruptibleActivityRegionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [ActivityGroup]
     Q_PROPERTY(QSet<QObject *> containedEdge READ containedEdges)
     Q_PROPERTY(QSet<QObject *> containedNode READ containedNodes)
-    Q_PROPERTY(QObject * inActivity READ inActivity)
+    Q_PROPERTY(QObject * inActivity READ inActivity WRITE setInActivity)
     Q_PROPERTY(QSet<QObject *> subgroup READ subgroups)
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
diff --git a/src/uml/qobjects/qumlintervalconstraintobject_p.h b/src/uml/qobjects/qumlintervalconstraintobject_p.h
index 254a18ce..028a8944 100644
--- a/src/uml/qobjects/qumlintervalconstraintobject_p.h
+++ b/src/uml/qobjects/qumlintervalconstraintobject_p.h
@@ -64,25 +64,25 @@ class Q_UML_EXPORT QUmlIntervalConstraintObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Constraint]
     Q_PROPERTY(QList<QObject *> constrainedElement READ constrainedElements)
-    Q_PROPERTY(QObject * context READ context)
+    Q_PROPERTY(QObject * context READ context WRITE setContext)
 
     // Properties [IntervalConstraint]
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
     Q_INVOKABLE explicit QUmlIntervalConstraintObject(QUmlIntervalConstraint *qModelingObject);
diff --git a/src/uml/qobjects/qumlintervalobject_p.h b/src/uml/qobjects/qumlintervalobject_p.h
index 09d3ed05..d728b747 100644
--- a/src/uml/qobjects/qumlintervalobject_p.h
+++ b/src/uml/qobjects/qumlintervalobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlIntervalObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Interval]
-    Q_PROPERTY(QObject * max READ max)
-    Q_PROPERTY(QObject * min READ min)
+    Q_PROPERTY(QObject * max READ max WRITE setMax)
+    Q_PROPERTY(QObject * min READ min WRITE setMin)
 
 public:
     Q_INVOKABLE explicit QUmlIntervalObject(QUmlInterval *qModelingObject);
diff --git a/src/uml/qobjects/qumljoinnodeobject_p.h b/src/uml/qobjects/qumljoinnodeobject_p.h
index 7c94c2cc..4d9d503b 100644
--- a/src/uml/qobjects/qumljoinnodeobject_p.h
+++ b/src/uml/qobjects/qumljoinnodeobject_p.h
@@ -65,30 +65,30 @@ class Q_UML_EXPORT QUmlJoinNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [JoinNode]
-    Q_PROPERTY(bool isCombineDuplicate READ isCombineDuplicate RESET unsetCombineDuplicate)
-    Q_PROPERTY(QObject * joinSpec READ joinSpec)
+    Q_PROPERTY(bool isCombineDuplicate READ isCombineDuplicate WRITE setCombineDuplicate RESET unsetCombineDuplicate)
+    Q_PROPERTY(QObject * joinSpec READ joinSpec WRITE setJoinSpec)
 
 public:
     Q_INVOKABLE explicit QUmlJoinNodeObject(QUmlJoinNode *qModelingObject);
diff --git a/src/uml/qobjects/qumllifelineobject_p.h b/src/uml/qobjects/qumllifelineobject_p.h
index 39fc3357..cafe05d3 100644
--- a/src/uml/qobjects/qumllifelineobject_p.h
+++ b/src/uml/qobjects/qumllifelineobject_p.h
@@ -65,18 +65,18 @@ class Q_UML_EXPORT QUmlLifelineObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Lifeline]
     Q_PROPERTY(QSet<QObject *> coveredBy READ coveredBy)
-    Q_PROPERTY(QObject * decomposedAs READ decomposedAs)
-    Q_PROPERTY(QObject * interaction READ interaction)
-    Q_PROPERTY(QObject * represents READ represents)
-    Q_PROPERTY(QObject * selector READ selector)
+    Q_PROPERTY(QObject * decomposedAs READ decomposedAs WRITE setDecomposedAs)
+    Q_PROPERTY(QObject * interaction READ interaction WRITE setInteraction)
+    Q_PROPERTY(QObject * represents READ represents WRITE setRepresents)
+    Q_PROPERTY(QObject * selector READ selector WRITE setSelector)
 
 public:
     Q_INVOKABLE explicit QUmlLifelineObject(QUmlLifeline *qModelingObject);
diff --git a/src/uml/qobjects/qumllinkendcreationdataobject_p.h b/src/uml/qobjects/qumllinkendcreationdataobject_p.h
index 5d5aed52..0ed2b7e3 100644
--- a/src/uml/qobjects/qumllinkendcreationdataobject_p.h
+++ b/src/uml/qobjects/qumllinkendcreationdataobject_p.h
@@ -62,13 +62,13 @@ class Q_UML_EXPORT QUmlLinkEndCreationDataObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [LinkEndData]
-    Q_PROPERTY(QObject * end READ end)
+    Q_PROPERTY(QObject * end READ end WRITE setEnd)
     Q_PROPERTY(QSet<QObject *> qualifier READ qualifiers)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
     // Properties [LinkEndCreationData]
-    Q_PROPERTY(QObject * insertAt READ insertAt)
-    Q_PROPERTY(bool isReplaceAll READ isReplaceAll RESET unsetReplaceAll)
+    Q_PROPERTY(QObject * insertAt READ insertAt WRITE setInsertAt)
+    Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
 
 public:
     Q_INVOKABLE explicit QUmlLinkEndCreationDataObject(QUmlLinkEndCreationData *qModelingObject);
diff --git a/src/uml/qobjects/qumllinkenddataobject_p.h b/src/uml/qobjects/qumllinkenddataobject_p.h
index 3960cf71..da251d8a 100644
--- a/src/uml/qobjects/qumllinkenddataobject_p.h
+++ b/src/uml/qobjects/qumllinkenddataobject_p.h
@@ -62,9 +62,9 @@ class Q_UML_EXPORT QUmlLinkEndDataObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [LinkEndData]
-    Q_PROPERTY(QObject * end READ end)
+    Q_PROPERTY(QObject * end READ end WRITE setEnd)
     Q_PROPERTY(QSet<QObject *> qualifier READ qualifiers)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
     Q_INVOKABLE explicit QUmlLinkEndDataObject(QUmlLinkEndData *qModelingObject);
diff --git a/src/uml/qobjects/qumllinkenddestructiondataobject_p.h b/src/uml/qobjects/qumllinkenddestructiondataobject_p.h
index 93f0ff28..e11a7f84 100644
--- a/src/uml/qobjects/qumllinkenddestructiondataobject_p.h
+++ b/src/uml/qobjects/qumllinkenddestructiondataobject_p.h
@@ -62,13 +62,13 @@ class Q_UML_EXPORT QUmlLinkEndDestructionDataObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [LinkEndData]
-    Q_PROPERTY(QObject * end READ end)
+    Q_PROPERTY(QObject * end READ end WRITE setEnd)
     Q_PROPERTY(QSet<QObject *> qualifier READ qualifiers)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
     // Properties [LinkEndDestructionData]
-    Q_PROPERTY(QObject * destroyAt READ destroyAt)
-    Q_PROPERTY(bool isDestroyDuplicates READ isDestroyDuplicates RESET unsetDestroyDuplicates)
+    Q_PROPERTY(QObject * destroyAt READ destroyAt WRITE setDestroyAt)
+    Q_PROPERTY(bool isDestroyDuplicates READ isDestroyDuplicates WRITE setDestroyDuplicates RESET unsetDestroyDuplicates)
 
 public:
     Q_INVOKABLE explicit QUmlLinkEndDestructionDataObject(QUmlLinkEndDestructionData *qModelingObject);
diff --git a/src/uml/qobjects/qumlliteralbooleanobject_p.h b/src/uml/qobjects/qumlliteralbooleanobject_p.h
index 569fdd73..8be14ee0 100644
--- a/src/uml/qobjects/qumlliteralbooleanobject_p.h
+++ b/src/uml/qobjects/qumlliteralbooleanobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlLiteralBooleanObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [LiteralBoolean]
-    Q_PROPERTY(bool value READ value RESET unsetValue)
+    Q_PROPERTY(bool value READ value WRITE setValue RESET unsetValue)
 
 public:
     Q_INVOKABLE explicit QUmlLiteralBooleanObject(QUmlLiteralBoolean *qModelingObject);
diff --git a/src/uml/qobjects/qumlliteralintegerobject_p.h b/src/uml/qobjects/qumlliteralintegerobject_p.h
index 6c98403b..c7f58e72 100644
--- a/src/uml/qobjects/qumlliteralintegerobject_p.h
+++ b/src/uml/qobjects/qumlliteralintegerobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlLiteralIntegerObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [LiteralInteger]
-    Q_PROPERTY(int value READ value RESET unsetValue)
+    Q_PROPERTY(int value READ value WRITE setValue RESET unsetValue)
 
 public:
     Q_INVOKABLE explicit QUmlLiteralIntegerObject(QUmlLiteralInteger *qModelingObject);
diff --git a/src/uml/qobjects/qumlliteralnullobject_p.h b/src/uml/qobjects/qumlliteralnullobject_p.h
index 2ed60abf..1989ac18 100644
--- a/src/uml/qobjects/qumlliteralnullobject_p.h
+++ b/src/uml/qobjects/qumlliteralnullobject_p.h
@@ -65,20 +65,20 @@ class Q_UML_EXPORT QUmlLiteralNullObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
     Q_INVOKABLE explicit QUmlLiteralNullObject(QUmlLiteralNull *qModelingObject);
diff --git a/src/uml/qobjects/qumlliteralrealobject_p.h b/src/uml/qobjects/qumlliteralrealobject_p.h
index 9c9dfef0..5607d07c 100644
--- a/src/uml/qobjects/qumlliteralrealobject_p.h
+++ b/src/uml/qobjects/qumlliteralrealobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlLiteralRealObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [LiteralReal]
-    Q_PROPERTY(double value READ value)
+    Q_PROPERTY(double value READ value WRITE setValue)
 
 public:
     Q_INVOKABLE explicit QUmlLiteralRealObject(QUmlLiteralReal *qModelingObject);
diff --git a/src/uml/qobjects/qumlliteralstringobject_p.h b/src/uml/qobjects/qumlliteralstringobject_p.h
index 21454be9..c43c1d69 100644
--- a/src/uml/qobjects/qumlliteralstringobject_p.h
+++ b/src/uml/qobjects/qumlliteralstringobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlLiteralStringObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [LiteralString]
-    Q_PROPERTY(QString value READ value)
+    Q_PROPERTY(QString value READ value WRITE setValue)
 
 public:
     Q_INVOKABLE explicit QUmlLiteralStringObject(QUmlLiteralString *qModelingObject);
diff --git a/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h b/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h
index e9ec4b49..24bf58a0 100644
--- a/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h
+++ b/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlLiteralUnlimitedNaturalObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [LiteralUnlimitedNatural]
-    Q_PROPERTY(int value READ value RESET unsetValue)
+    Q_PROPERTY(int value READ value WRITE setValue RESET unsetValue)
 
 public:
     Q_INVOKABLE explicit QUmlLiteralUnlimitedNaturalObject(QUmlLiteralUnlimitedNatural *qModelingObject);
diff --git a/src/uml/qobjects/qumlloopnodeobject_p.h b/src/uml/qobjects/qumlloopnodeobject_p.h
index d87967a5..f0dce2f5 100644
--- a/src/uml/qobjects/qumlloopnodeobject_p.h
+++ b/src/uml/qobjects/qumlloopnodeobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlLoopNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -80,7 +80,7 @@ class Q_UML_EXPORT QUmlLoopNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -91,7 +91,7 @@ class Q_UML_EXPORT QUmlLoopNodeObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -111,17 +111,17 @@ class Q_UML_EXPORT QUmlLoopNodeObject : public QObject
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
     // Properties [StructuredActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> edge READ edges)
-    Q_PROPERTY(bool mustIsolate READ mustIsolate RESET unsetMustIsolate)
+    Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate)
     Q_PROPERTY(QSet<QObject *> node READ nodes)
     Q_PROPERTY(QSet<QObject *> variable READ variables)
 
     // Properties [LoopNode]
     Q_PROPERTY(QList<QObject *> bodyOutput READ bodyOutputs)
     Q_PROPERTY(QSet<QObject *> bodyPart READ bodyParts)
-    Q_PROPERTY(QObject * decider READ decider)
-    Q_PROPERTY(bool isTestedFirst READ isTestedFirst RESET unsetTestedFirst)
+    Q_PROPERTY(QObject * decider READ decider WRITE setDecider)
+    Q_PROPERTY(bool isTestedFirst READ isTestedFirst WRITE setTestedFirst RESET unsetTestedFirst)
     Q_PROPERTY(QList<QObject *> loopVariable READ loopVariables)
     Q_PROPERTY(QList<QObject *> loopVariableInput READ loopVariableInputs)
     Q_PROPERTY(QList<QObject *> result READ results)
diff --git a/src/uml/qobjects/qumlmanifestationobject_p.h b/src/uml/qobjects/qumlmanifestationobject_p.h
index 3bbde6cc..8a838661 100644
--- a/src/uml/qobjects/qumlmanifestationobject_p.h
+++ b/src/uml/qobjects/qumlmanifestationobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlManifestationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -89,10 +89,10 @@ class Q_UML_EXPORT QUmlManifestationObject : public QObject
     Q_PROPERTY(QSet<QObject *> supplier READ suppliers)
 
     // Properties [Abstraction]
-    Q_PROPERTY(QObject * mapping READ mapping)
+    Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
     // Properties [Manifestation]
-    Q_PROPERTY(QObject * utilizedElement READ utilizedElement)
+    Q_PROPERTY(QObject * utilizedElement READ utilizedElement WRITE setUtilizedElement)
 
 public:
     Q_INVOKABLE explicit QUmlManifestationObject(QUmlManifestation *qModelingObject);
diff --git a/src/uml/qobjects/qumlmergenodeobject_p.h b/src/uml/qobjects/qumlmergenodeobject_p.h
index 56ecdefa..5bd9a808 100644
--- a/src/uml/qobjects/qumlmergenodeobject_p.h
+++ b/src/uml/qobjects/qumlmergenodeobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlMergeNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
diff --git a/src/uml/qobjects/qumlmessageobject_p.h b/src/uml/qobjects/qumlmessageobject_p.h
index 78e57548..983a9391 100644
--- a/src/uml/qobjects/qumlmessageobject_p.h
+++ b/src/uml/qobjects/qumlmessageobject_p.h
@@ -65,21 +65,21 @@ class Q_UML_EXPORT QUmlMessageObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Message]
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * connector READ connector)
-    Q_PROPERTY(QObject * interaction READ interaction)
+    Q_PROPERTY(QObject * connector READ connector WRITE setConnector)
+    Q_PROPERTY(QObject * interaction READ interaction WRITE setInteraction)
     Q_PROPERTY(QtUml::MessageKind messageKind READ messageKind RESET unsetMessageKind STORED false)
-    Q_PROPERTY(QtUml::MessageSort messageSort READ messageSort RESET unsetMessageSort)
-    Q_PROPERTY(QObject * receiveEvent READ receiveEvent)
-    Q_PROPERTY(QObject * sendEvent READ sendEvent)
-    Q_PROPERTY(QObject * signature READ signature)
+    Q_PROPERTY(QtUml::MessageSort messageSort READ messageSort WRITE setMessageSort RESET unsetMessageSort)
+    Q_PROPERTY(QObject * receiveEvent READ receiveEvent WRITE setReceiveEvent)
+    Q_PROPERTY(QObject * sendEvent READ sendEvent WRITE setSendEvent)
+    Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
 public:
     Q_INVOKABLE explicit QUmlMessageObject(QUmlMessage *qModelingObject);
diff --git a/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h b/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h
index 388787a1..a9d1277b 100644
--- a/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlMessageOccurrenceSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [OccurrenceSpecification]
-    Q_PROPERTY(QObject * covered READ covered)
+    Q_PROPERTY(QObject * covered READ covered WRITE setCovered)
     Q_PROPERTY(QSet<QObject *> toAfter READ toAfters)
     Q_PROPERTY(QSet<QObject *> toBefore READ toBefores)
 
     // Properties [MessageEnd]
-    Q_PROPERTY(QObject * message READ message)
+    Q_PROPERTY(QObject * message READ message WRITE setMessage)
 
 public:
     Q_INVOKABLE explicit QUmlMessageOccurrenceSpecificationObject(QUmlMessageOccurrenceSpecification *qModelingObject);
diff --git a/src/uml/qobjects/qumlmodelobject_p.h b/src/uml/qobjects/qumlmodelobject_p.h
index 3ca8e006..635eb0fd 100644
--- a/src/uml/qobjects/qumlmodelobject_p.h
+++ b/src/uml/qobjects/qumlmodelobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlModelObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,20 +79,20 @@ class Q_UML_EXPORT QUmlModelObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [TemplateableElement]
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> templateBinding READ templateBindings)
 
     // Properties [Package]
-    Q_PROPERTY(QString URI READ URI)
+    Q_PROPERTY(QString URI READ URI WRITE setURI)
     Q_PROPERTY(QSet<QObject *> nestedPackage READ nestedPackages STORED false)
-    Q_PROPERTY(QObject * nestingPackage READ nestingPackage)
+    Q_PROPERTY(QObject * nestingPackage READ nestingPackage WRITE setNestingPackage)
     Q_PROPERTY(QSet<QObject *> ownedStereotype READ ownedStereotypes STORED false)
     Q_PROPERTY(QSet<QObject *> ownedType READ ownedTypes STORED false)
     Q_PROPERTY(QSet<QObject *> packageMerge READ packageMerges)
@@ -100,7 +100,7 @@ class Q_UML_EXPORT QUmlModelObject : public QObject
     Q_PROPERTY(QSet<QObject *> profileApplication READ profileApplications)
 
     // Properties [Model]
-    Q_PROPERTY(QString viewpoint READ viewpoint)
+    Q_PROPERTY(QString viewpoint READ viewpoint WRITE setViewpoint)
 
 public:
     Q_INVOKABLE explicit QUmlModelObject(QUmlModel *qModelingObject);
diff --git a/src/uml/qobjects/qumlnodeobject_p.h b/src/uml/qobjects/qumlnodeobject_p.h
index 7d0fc82b..de1d43b6 100644
--- a/src/uml/qobjects/qumlnodeobject_p.h
+++ b/src/uml/qobjects/qumlnodeobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
diff --git a/src/uml/qobjects/qumlobjectflowobject_p.h b/src/uml/qobjects/qumlobjectflowobject_p.h
index edce503e..50cb383a 100644
--- a/src/uml/qobjects/qumlobjectflowobject_p.h
+++ b/src/uml/qobjects/qumlobjectflowobject_p.h
@@ -65,34 +65,34 @@ class Q_UML_EXPORT QUmlObjectFlowObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityEdge]
-    Q_PROPERTY(QObject * activity READ activity)
-    Q_PROPERTY(QObject * guard READ guard)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
+    Q_PROPERTY(QObject * guard READ guard WRITE setGuard)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
-    Q_PROPERTY(QObject * interrupts READ interrupts)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
+    Q_PROPERTY(QObject * interrupts READ interrupts WRITE setInterrupts)
     Q_PROPERTY(QSet<QObject *> redefinedEdge READ redefinedEdges)
-    Q_PROPERTY(QObject * source READ source)
-    Q_PROPERTY(QObject * target READ target)
-    Q_PROPERTY(QObject * weight READ weight)
+    Q_PROPERTY(QObject * source READ source WRITE setSource)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
+    Q_PROPERTY(QObject * weight READ weight WRITE setWeight)
 
     // Properties [ObjectFlow]
-    Q_PROPERTY(bool isMulticast READ isMulticast RESET unsetMulticast)
-    Q_PROPERTY(bool isMultireceive READ isMultireceive RESET unsetMultireceive)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * transformation READ transformation)
+    Q_PROPERTY(bool isMulticast READ isMulticast WRITE setMulticast RESET unsetMulticast)
+    Q_PROPERTY(bool isMultireceive READ isMultireceive WRITE setMultireceive RESET unsetMultireceive)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * transformation READ transformation WRITE setTransformation)
 
 public:
     Q_INVOKABLE explicit QUmlObjectFlowObject(QUmlObjectFlow *qModelingObject);
diff --git a/src/uml/qobjects/qumloccurrencespecificationobject_p.h b/src/uml/qobjects/qumloccurrencespecificationobject_p.h
index f472632c..171cf720 100644
--- a/src/uml/qobjects/qumloccurrencespecificationobject_p.h
+++ b/src/uml/qobjects/qumloccurrencespecificationobject_p.h
@@ -65,19 +65,19 @@ class Q_UML_EXPORT QUmlOccurrenceSpecificationObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [OccurrenceSpecification]
-    Q_PROPERTY(QObject * covered READ covered)
+    Q_PROPERTY(QObject * covered READ covered WRITE setCovered)
     Q_PROPERTY(QSet<QObject *> toAfter READ toAfters)
     Q_PROPERTY(QSet<QObject *> toBefore READ toBefores)
 
diff --git a/src/uml/qobjects/qumlopaqueactionobject_p.h b/src/uml/qobjects/qumlopaqueactionobject_p.h
index e3d1d8dc..fa476efd 100644
--- a/src/uml/qobjects/qumlopaqueactionobject_p.h
+++ b/src/uml/qobjects/qumlopaqueactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlOpaqueActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,7 +92,7 @@ class Q_UML_EXPORT QUmlOpaqueActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
diff --git a/src/uml/qobjects/qumlopaquebehaviorobject_p.h b/src/uml/qobjects/qumlopaquebehaviorobject_p.h
index 4fb47a16..dd2386fa 100644
--- a/src/uml/qobjects/qumlopaquebehaviorobject_p.h
+++ b/src/uml/qobjects/qumlopaquebehaviorobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -136,13 +136,13 @@ class Q_UML_EXPORT QUmlOpaqueBehaviorObject : public QObject
 
     // Properties [Behavior]
     Q_PROPERTY(QObject * context READ context STORED false)
-    Q_PROPERTY(bool isReentrant READ isReentrant RESET unsetReentrant)
+    Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> postcondition READ postconditions)
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
     Q_PROPERTY(QSet<QObject *> redefinedBehavior READ redefinedBehaviors)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [OpaqueBehavior]
     Q_PROPERTY(QList<QString> body READ bodies)
diff --git a/src/uml/qobjects/qumlopaqueexpressionobject_p.h b/src/uml/qobjects/qumlopaqueexpressionobject_p.h
index aeeaa81f..88f7a7b5 100644
--- a/src/uml/qobjects/qumlopaqueexpressionobject_p.h
+++ b/src/uml/qobjects/qumlopaqueexpressionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlOpaqueExpressionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [OpaqueExpression]
-    Q_PROPERTY(QObject * behavior READ behavior)
+    Q_PROPERTY(QObject * behavior READ behavior WRITE setBehavior)
     Q_PROPERTY(QList<QString> body READ bodies)
     Q_PROPERTY(QList<QString> language READ languages)
     Q_PROPERTY(QObject * result READ result STORED false)
diff --git a/src/uml/qobjects/qumloperationobject_p.h b/src/uml/qobjects/qumloperationobject_p.h
index 10fc2260..207b486e 100644
--- a/src/uml/qobjects/qumloperationobject_p.h
+++ b/src/uml/qobjects/qumloperationobject_p.h
@@ -64,16 +64,16 @@ class Q_UML_EXPORT QUmlOperationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [TemplateableElement]
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> templateBinding READ templateBindings)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Namespace]
     Q_PROPERTY(QSet<QObject *> elementImport READ elementImports)
@@ -84,30 +84,30 @@ class Q_UML_EXPORT QUmlOperationObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [Feature]
     Q_PROPERTY(QSet<QObject *> featuringClassifier READ featuringClassifiers)
-    Q_PROPERTY(bool isStatic READ isStatic RESET unsetStatic)
+    Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
 
     // Properties [BehavioralFeature]
-    Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency RESET unsetConcurrency)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
+    Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
     Q_PROPERTY(QSet<QObject *> method READ methods)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [Operation]
-    Q_PROPERTY(QObject * bodyCondition READ bodyCondition)
-    Q_PROPERTY(QObject * class_ READ class_)
-    Q_PROPERTY(QObject * datatype READ datatype)
-    Q_PROPERTY(QObject * interface_ READ interface_)
+    Q_PROPERTY(QObject * bodyCondition READ bodyCondition WRITE setBodyCondition)
+    Q_PROPERTY(QObject * class_ READ class_ WRITE setClass)
+    Q_PROPERTY(QObject * datatype READ datatype WRITE setDatatype)
+    Q_PROPERTY(QObject * interface_ READ interface_ WRITE setInterface)
     Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered STORED false)
-    Q_PROPERTY(bool isQuery READ isQuery RESET unsetQuery)
+    Q_PROPERTY(bool isQuery READ isQuery WRITE setQuery RESET unsetQuery)
     Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique STORED false)
     Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
@@ -115,7 +115,7 @@ class Q_UML_EXPORT QUmlOperationObject : public QObject
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
     Q_PROPERTY(QSet<QObject *> raisedException READ raisedExceptions)
     Q_PROPERTY(QSet<QObject *> redefinedOperation READ redefinedOperations)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QObject * type READ type STORED false)
     Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
 
diff --git a/src/uml/qobjects/qumloperationtemplateparameterobject_p.h b/src/uml/qobjects/qumloperationtemplateparameterobject_p.h
index cf60eff6..00a4d2ae 100644
--- a/src/uml/qobjects/qumloperationtemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumloperationtemplateparameterobject_p.h
@@ -62,13 +62,13 @@ class Q_UML_EXPORT QUmlOperationTemplateParameterObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [TemplateParameter]
-    Q_PROPERTY(QObject * default_ READ default_)
-    Q_PROPERTY(QObject * ownedDefault READ ownedDefault)
-    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement)
-    Q_PROPERTY(QObject * signature READ signature)
+    Q_PROPERTY(QObject * default_ READ default_ WRITE setDefault)
+    Q_PROPERTY(QObject * ownedDefault READ ownedDefault WRITE setOwnedDefault)
+    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement WRITE setOwnedParameteredElement)
+    Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
     // Properties [OperationTemplateParameter]
-    Q_PROPERTY(QObject * parameteredElement READ parameteredElement)
+    Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
 
 public:
     Q_INVOKABLE explicit QUmlOperationTemplateParameterObject(QUmlOperationTemplateParameter *qModelingObject);
diff --git a/src/uml/qobjects/qumloutputpinobject_p.h b/src/uml/qobjects/qumloutputpinobject_p.h
index 726a80a5..9886163f 100644
--- a/src/uml/qobjects/qumloutputpinobject_p.h
+++ b/src/uml/qobjects/qumloutputpinobject_p.h
@@ -64,48 +64,48 @@ class Q_UML_EXPORT QUmlOutputPinObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
     // Properties [Pin]
-    Q_PROPERTY(bool isControl READ isControl RESET unsetControl)
+    Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl)
 
 public:
     Q_INVOKABLE explicit QUmlOutputPinObject(QUmlOutputPin *qModelingObject);
diff --git a/src/uml/qobjects/qumlpackageimportobject_p.h b/src/uml/qobjects/qumlpackageimportobject_p.h
index 5f228674..36b48c7b 100644
--- a/src/uml/qobjects/qumlpackageimportobject_p.h
+++ b/src/uml/qobjects/qumlpackageimportobject_p.h
@@ -71,9 +71,9 @@ class Q_UML_EXPORT QUmlPackageImportObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [PackageImport]
-    Q_PROPERTY(QObject * importedPackage READ importedPackage)
-    Q_PROPERTY(QObject * importingNamespace READ importingNamespace)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QObject * importedPackage READ importedPackage WRITE setImportedPackage)
+    Q_PROPERTY(QObject * importingNamespace READ importingNamespace WRITE setImportingNamespace)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
 public:
     Q_INVOKABLE explicit QUmlPackageImportObject(QUmlPackageImport *qModelingObject);
diff --git a/src/uml/qobjects/qumlpackagemergeobject_p.h b/src/uml/qobjects/qumlpackagemergeobject_p.h
index c338d88e..5cc9a019 100644
--- a/src/uml/qobjects/qumlpackagemergeobject_p.h
+++ b/src/uml/qobjects/qumlpackagemergeobject_p.h
@@ -69,8 +69,8 @@ class Q_UML_EXPORT QUmlPackageMergeObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [PackageMerge]
-    Q_PROPERTY(QObject * mergedPackage READ mergedPackage)
-    Q_PROPERTY(QObject * receivingPackage READ receivingPackage)
+    Q_PROPERTY(QObject * mergedPackage READ mergedPackage WRITE setMergedPackage)
+    Q_PROPERTY(QObject * receivingPackage READ receivingPackage WRITE setReceivingPackage)
 
 public:
     Q_INVOKABLE explicit QUmlPackageMergeObject(QUmlPackageMerge *qModelingObject);
diff --git a/src/uml/qobjects/qumlpackageobject_p.h b/src/uml/qobjects/qumlpackageobject_p.h
index 6d018836..d120de35 100644
--- a/src/uml/qobjects/qumlpackageobject_p.h
+++ b/src/uml/qobjects/qumlpackageobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlPackageObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,20 +79,20 @@ class Q_UML_EXPORT QUmlPackageObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [TemplateableElement]
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> templateBinding READ templateBindings)
 
     // Properties [Package]
-    Q_PROPERTY(QString URI READ URI)
+    Q_PROPERTY(QString URI READ URI WRITE setURI)
     Q_PROPERTY(QSet<QObject *> nestedPackage READ nestedPackages STORED false)
-    Q_PROPERTY(QObject * nestingPackage READ nestingPackage)
+    Q_PROPERTY(QObject * nestingPackage READ nestingPackage WRITE setNestingPackage)
     Q_PROPERTY(QSet<QObject *> ownedStereotype READ ownedStereotypes STORED false)
     Q_PROPERTY(QSet<QObject *> ownedType READ ownedTypes STORED false)
     Q_PROPERTY(QSet<QObject *> packageMerge READ packageMerges)
diff --git a/src/uml/qobjects/qumlparameterobject_p.h b/src/uml/qobjects/qumlparameterobject_p.h
index a921fa8d..fd21ec92 100644
--- a/src/uml/qobjects/qumlparameterobject_p.h
+++ b/src/uml/qobjects/qumlparameterobject_p.h
@@ -64,39 +64,39 @@ class Q_UML_EXPORT QUmlParameterObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [ConnectableElement]
     Q_PROPERTY(QList<QObject *> end READ ends STORED false)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [Parameter]
-    Q_PROPERTY(QString default_ READ default_ STORED false)
-    Q_PROPERTY(QObject * defaultValue READ defaultValue)
-    Q_PROPERTY(QtUml::ParameterDirectionKind direction READ direction RESET unsetDirection)
-    Q_PROPERTY(QtUml::ParameterEffectKind effect READ effect)
-    Q_PROPERTY(bool isException READ isException RESET unsetException)
-    Q_PROPERTY(bool isStream READ isStream RESET unsetStream)
-    Q_PROPERTY(QObject * operation READ operation)
+    Q_PROPERTY(QString default_ READ default_ WRITE setDefault STORED false)
+    Q_PROPERTY(QObject * defaultValue READ defaultValue WRITE setDefaultValue)
+    Q_PROPERTY(QtUml::ParameterDirectionKind direction READ direction WRITE setDirection RESET unsetDirection)
+    Q_PROPERTY(QtUml::ParameterEffectKind effect READ effect WRITE setEffect)
+    Q_PROPERTY(bool isException READ isException WRITE setException RESET unsetException)
+    Q_PROPERTY(bool isStream READ isStream WRITE setStream RESET unsetStream)
+    Q_PROPERTY(QObject * operation READ operation WRITE setOperation)
     Q_PROPERTY(QSet<QObject *> parameterSet READ parameterSets)
 
 public:
diff --git a/src/uml/qobjects/qumlparametersetobject_p.h b/src/uml/qobjects/qumlparametersetobject_p.h
index 552f9f79..33d9af02 100644
--- a/src/uml/qobjects/qumlparametersetobject_p.h
+++ b/src/uml/qobjects/qumlparametersetobject_p.h
@@ -65,11 +65,11 @@ class Q_UML_EXPORT QUmlParameterSetObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [ParameterSet]
     Q_PROPERTY(QSet<QObject *> condition READ conditions)
diff --git a/src/uml/qobjects/qumlpartdecompositionobject_p.h b/src/uml/qobjects/qumlpartdecompositionobject_p.h
index 056d78ec..1945b8ef 100644
--- a/src/uml/qobjects/qumlpartdecompositionobject_p.h
+++ b/src/uml/qobjects/qumlpartdecompositionobject_p.h
@@ -65,24 +65,24 @@ class Q_UML_EXPORT QUmlPartDecompositionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
     Q_PROPERTY(QSet<QObject *> covered READ covered)
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [InteractionUse]
     Q_PROPERTY(QSet<QObject *> actualGate READ actualGates)
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * refersTo READ refersTo)
-    Q_PROPERTY(QObject * returnValue READ returnValue)
-    Q_PROPERTY(QObject * returnValueRecipient READ returnValueRecipient)
+    Q_PROPERTY(QObject * refersTo READ refersTo WRITE setRefersTo)
+    Q_PROPERTY(QObject * returnValue READ returnValue WRITE setReturnValue)
+    Q_PROPERTY(QObject * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient)
 
 public:
     Q_INVOKABLE explicit QUmlPartDecompositionObject(QUmlPartDecomposition *qModelingObject);
diff --git a/src/uml/qobjects/qumlportobject_p.h b/src/uml/qobjects/qumlportobject_p.h
index 48657a49..8472cbc4 100644
--- a/src/uml/qobjects/qumlportobject_p.h
+++ b/src/uml/qobjects/qumlportobject_p.h
@@ -65,70 +65,70 @@ class Q_UML_EXPORT QUmlPortObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [Feature]
     Q_PROPERTY(QSet<QObject *> featuringClassifier READ featuringClassifiers)
-    Q_PROPERTY(bool isStatic READ isStatic RESET unsetStatic)
+    Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
 
     // Properties [StructuralFeature]
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [ConnectableElement]
     Q_PROPERTY(QList<QObject *> end READ ends STORED false)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [DeploymentTarget]
     Q_PROPERTY(QSet<QObject *> deployedElement READ deployedElements STORED false)
     Q_PROPERTY(QSet<QObject *> deployment READ deployments)
 
     // Properties [Property]
-    Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation RESET unsetAggregation)
-    Q_PROPERTY(QObject * association READ association)
-    Q_PROPERTY(QObject * associationEnd READ associationEnd)
-    Q_PROPERTY(QObject * class_ READ class_)
-    Q_PROPERTY(QObject * datatype READ datatype)
-    Q_PROPERTY(QString default_ READ default_ STORED false)
-    Q_PROPERTY(QObject * defaultValue READ defaultValue)
-    Q_PROPERTY(QObject * interface_ READ interface_)
-    Q_PROPERTY(bool isComposite READ isComposite RESET unsetComposite STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
-    Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion RESET unsetDerivedUnion)
-    Q_PROPERTY(bool isID READ isID RESET unsetID)
-    Q_PROPERTY(bool isReadOnly READ isReadOnly RESET unsetReadOnly)
-    Q_PROPERTY(QObject * opposite READ opposite STORED false)
-    Q_PROPERTY(QObject * owningAssociation READ owningAssociation)
+    Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation)
+    Q_PROPERTY(QObject * association READ association WRITE setAssociation)
+    Q_PROPERTY(QObject * associationEnd READ associationEnd WRITE setAssociationEnd)
+    Q_PROPERTY(QObject * class_ READ class_ WRITE setClass)
+    Q_PROPERTY(QObject * datatype READ datatype WRITE setDatatype)
+    Q_PROPERTY(QString default_ READ default_ WRITE setDefault STORED false)
+    Q_PROPERTY(QObject * defaultValue READ defaultValue WRITE setDefaultValue)
+    Q_PROPERTY(QObject * interface_ READ interface_ WRITE setInterface)
+    Q_PROPERTY(bool isComposite READ isComposite WRITE setComposite RESET unsetComposite STORED false)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion)
+    Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID)
+    Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly)
+    Q_PROPERTY(QObject * opposite READ opposite WRITE setOpposite STORED false)
+    Q_PROPERTY(QObject * owningAssociation READ owningAssociation WRITE setOwningAssociation)
     Q_PROPERTY(QList<QObject *> qualifier READ qualifiers)
     Q_PROPERTY(QSet<QObject *> redefinedProperty READ redefinedProperties)
     Q_PROPERTY(QSet<QObject *> subsettedProperty READ subsettedProperties)
 
     // Properties [Port]
-    Q_PROPERTY(bool isBehavior READ isBehavior RESET unsetBehavior)
-    Q_PROPERTY(bool isConjugated READ isConjugated RESET unsetConjugated)
-    Q_PROPERTY(bool isService READ isService RESET unsetService)
-    Q_PROPERTY(QObject * protocol READ protocol)
+    Q_PROPERTY(bool isBehavior READ isBehavior WRITE setBehavior RESET unsetBehavior)
+    Q_PROPERTY(bool isConjugated READ isConjugated WRITE setConjugated RESET unsetConjugated)
+    Q_PROPERTY(bool isService READ isService WRITE setService RESET unsetService)
+    Q_PROPERTY(QObject * protocol READ protocol WRITE setProtocol)
     Q_PROPERTY(QSet<QObject *> provided READ provided STORED false)
     Q_PROPERTY(QSet<QObject *> redefinedPort READ redefinedPorts)
     Q_PROPERTY(QSet<QObject *> required READ required STORED false)
diff --git a/src/uml/qobjects/qumlprimitivetypeobject_p.h b/src/uml/qobjects/qumlprimitivetypeobject_p.h
index f7cdfd49..0e6a4503 100644
--- a/src/uml/qobjects/qumlprimitivetypeobject_p.h
+++ b/src/uml/qobjects/qumlprimitivetypeobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlPrimitiveTypeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlPrimitiveTypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlPrimitiveTypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [DataType]
diff --git a/src/uml/qobjects/qumlprofileapplicationobject_p.h b/src/uml/qobjects/qumlprofileapplicationobject_p.h
index 1629fa75..16e186a2 100644
--- a/src/uml/qobjects/qumlprofileapplicationobject_p.h
+++ b/src/uml/qobjects/qumlprofileapplicationobject_p.h
@@ -69,9 +69,9 @@ class Q_UML_EXPORT QUmlProfileApplicationObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [ProfileApplication]
-    Q_PROPERTY(QObject * appliedProfile READ appliedProfile)
-    Q_PROPERTY(QObject * applyingPackage READ applyingPackage)
-    Q_PROPERTY(bool isStrict READ isStrict RESET unsetStrict)
+    Q_PROPERTY(QObject * appliedProfile READ appliedProfile WRITE setAppliedProfile)
+    Q_PROPERTY(QObject * applyingPackage READ applyingPackage WRITE setApplyingPackage)
+    Q_PROPERTY(bool isStrict READ isStrict WRITE setStrict RESET unsetStrict)
 
 public:
     Q_INVOKABLE explicit QUmlProfileApplicationObject(QUmlProfileApplication *qModelingObject);
diff --git a/src/uml/qobjects/qumlprofileobject_p.h b/src/uml/qobjects/qumlprofileobject_p.h
index e5e70dc4..332a99a5 100644
--- a/src/uml/qobjects/qumlprofileobject_p.h
+++ b/src/uml/qobjects/qumlprofileobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlProfileObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,20 +79,20 @@ class Q_UML_EXPORT QUmlProfileObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [TemplateableElement]
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> templateBinding READ templateBindings)
 
     // Properties [Package]
-    Q_PROPERTY(QString URI READ URI)
+    Q_PROPERTY(QString URI READ URI WRITE setURI)
     Q_PROPERTY(QSet<QObject *> nestedPackage READ nestedPackages STORED false)
-    Q_PROPERTY(QObject * nestingPackage READ nestingPackage)
+    Q_PROPERTY(QObject * nestingPackage READ nestingPackage WRITE setNestingPackage)
     Q_PROPERTY(QSet<QObject *> ownedStereotype READ ownedStereotypes STORED false)
     Q_PROPERTY(QSet<QObject *> ownedType READ ownedTypes STORED false)
     Q_PROPERTY(QSet<QObject *> packageMerge READ packageMerges)
diff --git a/src/uml/qobjects/qumlpropertyobject_p.h b/src/uml/qobjects/qumlpropertyobject_p.h
index ebc97886..cd559107 100644
--- a/src/uml/qobjects/qumlpropertyobject_p.h
+++ b/src/uml/qobjects/qumlpropertyobject_p.h
@@ -65,61 +65,61 @@ class Q_UML_EXPORT QUmlPropertyObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [Feature]
     Q_PROPERTY(QSet<QObject *> featuringClassifier READ featuringClassifiers)
-    Q_PROPERTY(bool isStatic READ isStatic RESET unsetStatic)
+    Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
 
     // Properties [StructuralFeature]
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [ConnectableElement]
     Q_PROPERTY(QList<QObject *> end READ ends STORED false)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [DeploymentTarget]
     Q_PROPERTY(QSet<QObject *> deployedElement READ deployedElements STORED false)
     Q_PROPERTY(QSet<QObject *> deployment READ deployments)
 
     // Properties [Property]
-    Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation RESET unsetAggregation)
-    Q_PROPERTY(QObject * association READ association)
-    Q_PROPERTY(QObject * associationEnd READ associationEnd)
-    Q_PROPERTY(QObject * class_ READ class_)
-    Q_PROPERTY(QObject * datatype READ datatype)
-    Q_PROPERTY(QString default_ READ default_ STORED false)
-    Q_PROPERTY(QObject * defaultValue READ defaultValue)
-    Q_PROPERTY(QObject * interface_ READ interface_)
-    Q_PROPERTY(bool isComposite READ isComposite RESET unsetComposite STORED false)
-    Q_PROPERTY(bool isDerived READ isDerived RESET unsetDerived)
-    Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion RESET unsetDerivedUnion)
-    Q_PROPERTY(bool isID READ isID RESET unsetID)
-    Q_PROPERTY(bool isReadOnly READ isReadOnly RESET unsetReadOnly)
-    Q_PROPERTY(QObject * opposite READ opposite STORED false)
-    Q_PROPERTY(QObject * owningAssociation READ owningAssociation)
+    Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation)
+    Q_PROPERTY(QObject * association READ association WRITE setAssociation)
+    Q_PROPERTY(QObject * associationEnd READ associationEnd WRITE setAssociationEnd)
+    Q_PROPERTY(QObject * class_ READ class_ WRITE setClass)
+    Q_PROPERTY(QObject * datatype READ datatype WRITE setDatatype)
+    Q_PROPERTY(QString default_ READ default_ WRITE setDefault STORED false)
+    Q_PROPERTY(QObject * defaultValue READ defaultValue WRITE setDefaultValue)
+    Q_PROPERTY(QObject * interface_ READ interface_ WRITE setInterface)
+    Q_PROPERTY(bool isComposite READ isComposite WRITE setComposite RESET unsetComposite STORED false)
+    Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived)
+    Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion)
+    Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID)
+    Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly)
+    Q_PROPERTY(QObject * opposite READ opposite WRITE setOpposite STORED false)
+    Q_PROPERTY(QObject * owningAssociation READ owningAssociation WRITE setOwningAssociation)
     Q_PROPERTY(QList<QObject *> qualifier READ qualifiers)
     Q_PROPERTY(QSet<QObject *> redefinedProperty READ redefinedProperties)
     Q_PROPERTY(QSet<QObject *> subsettedProperty READ subsettedProperties)
diff --git a/src/uml/qobjects/qumlprotocolconformanceobject_p.h b/src/uml/qobjects/qumlprotocolconformanceobject_p.h
index 22d1f274..902f3127 100644
--- a/src/uml/qobjects/qumlprotocolconformanceobject_p.h
+++ b/src/uml/qobjects/qumlprotocolconformanceobject_p.h
@@ -69,8 +69,8 @@ class Q_UML_EXPORT QUmlProtocolConformanceObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [ProtocolConformance]
-    Q_PROPERTY(QObject * generalMachine READ generalMachine)
-    Q_PROPERTY(QObject * specificMachine READ specificMachine)
+    Q_PROPERTY(QObject * generalMachine READ generalMachine WRITE setGeneralMachine)
+    Q_PROPERTY(QObject * specificMachine READ specificMachine WRITE setSpecificMachine)
 
 public:
     Q_INVOKABLE explicit QUmlProtocolConformanceObject(QUmlProtocolConformance *qModelingObject);
diff --git a/src/uml/qobjects/qumlprotocolstatemachineobject_p.h b/src/uml/qobjects/qumlprotocolstatemachineobject_p.h
index 3fe7d49b..82fc2f84 100644
--- a/src/uml/qobjects/qumlprotocolstatemachineobject_p.h
+++ b/src/uml/qobjects/qumlprotocolstatemachineobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -136,12 +136,12 @@ class Q_UML_EXPORT QUmlProtocolStateMachineObject : public QObject
 
     // Properties [Behavior]
     Q_PROPERTY(QObject * context READ context STORED false)
-    Q_PROPERTY(bool isReentrant READ isReentrant RESET unsetReentrant)
+    Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> postcondition READ postconditions)
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [StateMachine]
     Q_PROPERTY(QSet<QObject *> connectionPoint READ connectionPoints)
diff --git a/src/uml/qobjects/qumlprotocoltransitionobject_p.h b/src/uml/qobjects/qumlprotocoltransitionobject_p.h
index 7b13f18f..84f524a5 100644
--- a/src/uml/qobjects/qumlprotocoltransitionobject_p.h
+++ b/src/uml/qobjects/qumlprotocoltransitionobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlProtocolTransitionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
 
     // Properties [Namespace]
@@ -84,19 +84,19 @@ class Q_UML_EXPORT QUmlProtocolTransitionObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [Transition]
-    Q_PROPERTY(QObject * container READ container)
-    Q_PROPERTY(QObject * effect READ effect)
-    Q_PROPERTY(QObject * guard READ guard)
-    Q_PROPERTY(QtUml::TransitionKind kind READ kind RESET unsetKind)
-    Q_PROPERTY(QObject * redefinedTransition READ redefinedTransition)
+    Q_PROPERTY(QObject * container READ container WRITE setContainer)
+    Q_PROPERTY(QObject * effect READ effect WRITE setEffect)
+    Q_PROPERTY(QObject * guard READ guard WRITE setGuard)
+    Q_PROPERTY(QtUml::TransitionKind kind READ kind WRITE setKind RESET unsetKind)
+    Q_PROPERTY(QObject * redefinedTransition READ redefinedTransition WRITE setRedefinedTransition)
     Q_PROPERTY(QObject * redefinitionContext READ redefinitionContext STORED false)
-    Q_PROPERTY(QObject * source READ source)
-    Q_PROPERTY(QObject * target READ target)
+    Q_PROPERTY(QObject * source READ source WRITE setSource)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
     Q_PROPERTY(QSet<QObject *> trigger READ triggers)
 
     // Properties [ProtocolTransition]
-    Q_PROPERTY(QObject * postCondition READ postCondition)
-    Q_PROPERTY(QObject * preCondition READ preCondition)
+    Q_PROPERTY(QObject * postCondition READ postCondition WRITE setPostCondition)
+    Q_PROPERTY(QObject * preCondition READ preCondition WRITE setPreCondition)
     Q_PROPERTY(QSet<QObject *> referred READ referred STORED false)
 
 public:
diff --git a/src/uml/qobjects/qumlpseudostateobject_p.h b/src/uml/qobjects/qumlpseudostateobject_p.h
index 57275384..02b0040e 100644
--- a/src/uml/qobjects/qumlpseudostateobject_p.h
+++ b/src/uml/qobjects/qumlpseudostateobject_p.h
@@ -65,21 +65,21 @@ class Q_UML_EXPORT QUmlPseudostateObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Vertex]
-    Q_PROPERTY(QObject * container READ container)
+    Q_PROPERTY(QObject * container READ container WRITE setContainer)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings STORED false)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings STORED false)
 
     // Properties [Pseudostate]
-    Q_PROPERTY(QtUml::PseudostateKind kind READ kind RESET unsetKind)
-    Q_PROPERTY(QObject * state READ state)
-    Q_PROPERTY(QObject * stateMachine READ stateMachine)
+    Q_PROPERTY(QtUml::PseudostateKind kind READ kind WRITE setKind RESET unsetKind)
+    Q_PROPERTY(QObject * state READ state WRITE setState)
+    Q_PROPERTY(QObject * stateMachine READ stateMachine WRITE setStateMachine)
 
 public:
     Q_INVOKABLE explicit QUmlPseudostateObject(QUmlPseudostate *qModelingObject);
diff --git a/src/uml/qobjects/qumlqualifiervalueobject_p.h b/src/uml/qobjects/qumlqualifiervalueobject_p.h
index 6588942b..2746d6e4 100644
--- a/src/uml/qobjects/qumlqualifiervalueobject_p.h
+++ b/src/uml/qobjects/qumlqualifiervalueobject_p.h
@@ -62,8 +62,8 @@ class Q_UML_EXPORT QUmlQualifierValueObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [QualifierValue]
-    Q_PROPERTY(QObject * qualifier READ qualifier)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * qualifier READ qualifier WRITE setQualifier)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
     Q_INVOKABLE explicit QUmlQualifierValueObject(QUmlQualifierValue *qModelingObject);
diff --git a/src/uml/qobjects/qumlraiseexceptionactionobject_p.h b/src/uml/qobjects/qumlraiseexceptionactionobject_p.h
index 26291e3a..b753b764 100644
--- a/src/uml/qobjects/qumlraiseexceptionactionobject_p.h
+++ b/src/uml/qobjects/qumlraiseexceptionactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlRaiseExceptionActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,13 +92,13 @@ class Q_UML_EXPORT QUmlRaiseExceptionActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [RaiseExceptionAction]
-    Q_PROPERTY(QObject * exception READ exception)
+    Q_PROPERTY(QObject * exception READ exception WRITE setException)
 
 public:
     Q_INVOKABLE explicit QUmlRaiseExceptionActionObject(QUmlRaiseExceptionAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadextentactionobject_p.h b/src/uml/qobjects/qumlreadextentactionobject_p.h
index c9ec04b5..36864826 100644
--- a/src/uml/qobjects/qumlreadextentactionobject_p.h
+++ b/src/uml/qobjects/qumlreadextentactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadExtentActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,14 +92,14 @@ class Q_UML_EXPORT QUmlReadExtentActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReadExtentAction]
-    Q_PROPERTY(QObject * classifier READ classifier)
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * classifier READ classifier WRITE setClassifier)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadExtentActionObject(QUmlReadExtentAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h
index 2ffc71a9..0ad93cd4 100644
--- a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadIsClassifiedObjectActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,16 +92,16 @@ class Q_UML_EXPORT QUmlReadIsClassifiedObjectActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReadIsClassifiedObjectAction]
-    Q_PROPERTY(QObject * classifier READ classifier)
-    Q_PROPERTY(bool isDirect READ isDirect RESET unsetDirect)
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * classifier READ classifier WRITE setClassifier)
+    Q_PROPERTY(bool isDirect READ isDirect WRITE setDirect RESET unsetDirect)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadIsClassifiedObjectActionObject(QUmlReadIsClassifiedObjectAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadlinkactionobject_p.h b/src/uml/qobjects/qumlreadlinkactionobject_p.h
index 9613d7c5..709f171c 100644
--- a/src/uml/qobjects/qumlreadlinkactionobject_p.h
+++ b/src/uml/qobjects/qumlreadlinkactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadLinkActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,7 +92,7 @@ class Q_UML_EXPORT QUmlReadLinkActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -102,7 +102,7 @@ class Q_UML_EXPORT QUmlReadLinkActionObject : public QObject
     Q_PROPERTY(QSet<QObject *> inputValue READ inputValues)
 
     // Properties [ReadLinkAction]
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadLinkActionObject(QUmlReadLinkAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h b/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h
index 69c73a54..b4daa539 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h
+++ b/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReadLinkObjectEndAction]
-    Q_PROPERTY(QObject * end READ end)
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * end READ end WRITE setEnd)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadLinkObjectEndActionObject(QUmlReadLinkObjectEndAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h
index 9cf19023..dd1b68e9 100644
--- a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h
+++ b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReadLinkObjectEndQualifierAction]
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * qualifier READ qualifier)
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * qualifier READ qualifier WRITE setQualifier)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadLinkObjectEndQualifierActionObject(QUmlReadLinkObjectEndQualifierAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadselfactionobject_p.h b/src/uml/qobjects/qumlreadselfactionobject_p.h
index a5e5103c..fbd4cf93 100644
--- a/src/uml/qobjects/qumlreadselfactionobject_p.h
+++ b/src/uml/qobjects/qumlreadselfactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadSelfActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,13 +92,13 @@ class Q_UML_EXPORT QUmlReadSelfActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReadSelfAction]
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadSelfActionObject(QUmlReadSelfAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h b/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h
index 6dc134a6..a3017c4f 100644
--- a/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h
+++ b/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadStructuralFeatureActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,17 +92,17 @@ class Q_UML_EXPORT QUmlReadStructuralFeatureActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [StructuralFeatureAction]
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * structuralFeature READ structuralFeature)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * structuralFeature READ structuralFeature WRITE setStructuralFeature)
 
     // Properties [ReadStructuralFeatureAction]
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadStructuralFeatureActionObject(QUmlReadStructuralFeatureAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreadvariableactionobject_p.h b/src/uml/qobjects/qumlreadvariableactionobject_p.h
index 16654772..61a04fbf 100644
--- a/src/uml/qobjects/qumlreadvariableactionobject_p.h
+++ b/src/uml/qobjects/qumlreadvariableactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReadVariableActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,16 +92,16 @@ class Q_UML_EXPORT QUmlReadVariableActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [VariableAction]
-    Q_PROPERTY(QObject * variable READ variable)
+    Q_PROPERTY(QObject * variable READ variable WRITE setVariable)
 
     // Properties [ReadVariableAction]
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReadVariableActionObject(QUmlReadVariableAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlrealizationobject_p.h b/src/uml/qobjects/qumlrealizationobject_p.h
index 4c644ef4..9b866f62 100644
--- a/src/uml/qobjects/qumlrealizationobject_p.h
+++ b/src/uml/qobjects/qumlrealizationobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlRealizationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -89,7 +89,7 @@ class Q_UML_EXPORT QUmlRealizationObject : public QObject
     Q_PROPERTY(QSet<QObject *> supplier READ suppliers)
 
     // Properties [Abstraction]
-    Q_PROPERTY(QObject * mapping READ mapping)
+    Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
 public:
     Q_INVOKABLE explicit QUmlRealizationObject(QUmlRealization *qModelingObject);
diff --git a/src/uml/qobjects/qumlreceptionobject_p.h b/src/uml/qobjects/qumlreceptionobject_p.h
index 98d62412..0117390e 100644
--- a/src/uml/qobjects/qumlreceptionobject_p.h
+++ b/src/uml/qobjects/qumlreceptionobject_p.h
@@ -65,11 +65,11 @@ class Q_UML_EXPORT QUmlReceptionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Namespace]
     Q_PROPERTY(QSet<QObject *> elementImport READ elementImports)
@@ -80,24 +80,24 @@ class Q_UML_EXPORT QUmlReceptionObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [Feature]
     Q_PROPERTY(QSet<QObject *> featuringClassifier READ featuringClassifiers)
-    Q_PROPERTY(bool isStatic READ isStatic RESET unsetStatic)
+    Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic)
 
     // Properties [BehavioralFeature]
-    Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency RESET unsetConcurrency)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
+    Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
     Q_PROPERTY(QSet<QObject *> method READ methods)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> raisedException READ raisedExceptions)
 
     // Properties [Reception]
-    Q_PROPERTY(QObject * signal READ signal)
+    Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
 
 public:
     Q_INVOKABLE explicit QUmlReceptionObject(QUmlReception *qModelingObject);
diff --git a/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h b/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h
index 5c9c15a8..141bf83f 100644
--- a/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReclassifyObjectActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlReclassifyObjectActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReclassifyObjectAction]
-    Q_PROPERTY(bool isReplaceAll READ isReplaceAll RESET unsetReplaceAll)
+    Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll)
     Q_PROPERTY(QSet<QObject *> newClassifier READ newClassifiers)
-    Q_PROPERTY(QObject * object READ object)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
     Q_PROPERTY(QSet<QObject *> oldClassifier READ oldClassifiers)
 
 public:
diff --git a/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h b/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h
index 851519ab..b8cfefac 100644
--- a/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h
+++ b/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h
@@ -66,23 +66,23 @@ class Q_UML_EXPORT QUmlRedefinableTemplateSignatureObject : public QObject
     // Properties [TemplateSignature]
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QList<QObject *> parameter READ parameters)
-    Q_PROPERTY(QObject * template_ READ template_)
+    Q_PROPERTY(QObject * template_ READ template_ WRITE setTemplate)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [RedefinableTemplateSignature]
-    Q_PROPERTY(QObject * classifier READ classifier)
+    Q_PROPERTY(QObject * classifier READ classifier WRITE setClassifier)
     Q_PROPERTY(QSet<QObject *> extendedSignature READ extendedSignatures)
     Q_PROPERTY(QSet<QObject *> inheritedParameter READ inheritedParameters STORED false)
 
diff --git a/src/uml/qobjects/qumlreduceactionobject_p.h b/src/uml/qobjects/qumlreduceactionobject_p.h
index b4171bdd..bd6939e2 100644
--- a/src/uml/qobjects/qumlreduceactionobject_p.h
+++ b/src/uml/qobjects/qumlreduceactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReduceActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,16 +92,16 @@ class Q_UML_EXPORT QUmlReduceActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReduceAction]
-    Q_PROPERTY(QObject * collection READ collection)
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(QObject * reducer READ reducer)
-    Q_PROPERTY(QObject * result READ result)
+    Q_PROPERTY(QObject * collection READ collection WRITE setCollection)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(QObject * reducer READ reducer WRITE setReducer)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
 
 public:
     Q_INVOKABLE explicit QUmlReduceActionObject(QUmlReduceAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlregionobject_p.h b/src/uml/qobjects/qumlregionobject_p.h
index 75cdaa86..22ac4ba6 100644
--- a/src/uml/qobjects/qumlregionobject_p.h
+++ b/src/uml/qobjects/qumlregionobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlRegionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
 
     // Properties [Namespace]
@@ -84,10 +84,10 @@ class Q_UML_EXPORT QUmlRegionObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [Region]
-    Q_PROPERTY(QObject * extendedRegion READ extendedRegion)
+    Q_PROPERTY(QObject * extendedRegion READ extendedRegion WRITE setExtendedRegion)
     Q_PROPERTY(QObject * redefinitionContext READ redefinitionContext STORED false)
-    Q_PROPERTY(QObject * state READ state)
-    Q_PROPERTY(QObject * stateMachine READ stateMachine)
+    Q_PROPERTY(QObject * state READ state WRITE setState)
+    Q_PROPERTY(QObject * stateMachine READ stateMachine WRITE setStateMachine)
     Q_PROPERTY(QSet<QObject *> subvertex READ subvertices)
     Q_PROPERTY(QSet<QObject *> transition READ transitions)
 
diff --git a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h
index a009eaef..971c864e 100644
--- a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h
+++ b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,22 +92,22 @@ class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [StructuralFeatureAction]
-    Q_PROPERTY(QObject * object READ object)
-    Q_PROPERTY(QObject * structuralFeature READ structuralFeature)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
+    Q_PROPERTY(QObject * structuralFeature READ structuralFeature WRITE setStructuralFeature)
 
     // Properties [WriteStructuralFeatureAction]
-    Q_PROPERTY(QObject * result READ result)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
     // Properties [RemoveStructuralFeatureValueAction]
-    Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates RESET unsetRemoveDuplicates)
-    Q_PROPERTY(QObject * removeAt READ removeAt)
+    Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates)
+    Q_PROPERTY(QObject * removeAt READ removeAt WRITE setRemoveAt)
 
 public:
     Q_INVOKABLE explicit QUmlRemoveStructuralFeatureValueActionObject(QUmlRemoveStructuralFeatureValueAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h b/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h
index 1dc2f1e8..ae7e8a2c 100644
--- a/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h
+++ b/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlRemoveVariableValueActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,20 +92,20 @@ class Q_UML_EXPORT QUmlRemoveVariableValueActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [VariableAction]
-    Q_PROPERTY(QObject * variable READ variable)
+    Q_PROPERTY(QObject * variable READ variable WRITE setVariable)
 
     // Properties [WriteVariableAction]
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
     // Properties [RemoveVariableValueAction]
-    Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates RESET unsetRemoveDuplicates)
-    Q_PROPERTY(QObject * removeAt READ removeAt)
+    Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates)
+    Q_PROPERTY(QObject * removeAt READ removeAt WRITE setRemoveAt)
 
 public:
     Q_INVOKABLE explicit QUmlRemoveVariableValueActionObject(QUmlRemoveVariableValueAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlreplyactionobject_p.h b/src/uml/qobjects/qumlreplyactionobject_p.h
index c28e82f9..91cc77ae 100644
--- a/src/uml/qobjects/qumlreplyactionobject_p.h
+++ b/src/uml/qobjects/qumlreplyactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlReplyActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlReplyActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ReplyAction]
-    Q_PROPERTY(QObject * replyToCall READ replyToCall)
+    Q_PROPERTY(QObject * replyToCall READ replyToCall WRITE setReplyToCall)
     Q_PROPERTY(QSet<QObject *> replyValue READ replyValues)
-    Q_PROPERTY(QObject * returnInformation READ returnInformation)
+    Q_PROPERTY(QObject * returnInformation READ returnInformation WRITE setReturnInformation)
 
 public:
     Q_INVOKABLE explicit QUmlReplyActionObject(QUmlReplyAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlsendobjectactionobject_p.h b/src/uml/qobjects/qumlsendobjectactionobject_p.h
index 7ab2107f..28c567e9 100644
--- a/src/uml/qobjects/qumlsendobjectactionobject_p.h
+++ b/src/uml/qobjects/qumlsendobjectactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlSendObjectActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,17 +92,17 @@ class Q_UML_EXPORT QUmlSendObjectActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [InvocationAction]
-    Q_PROPERTY(QObject * onPort READ onPort)
+    Q_PROPERTY(QObject * onPort READ onPort WRITE setOnPort)
 
     // Properties [SendObjectAction]
-    Q_PROPERTY(QObject * request READ request)
-    Q_PROPERTY(QObject * target READ target)
+    Q_PROPERTY(QObject * request READ request WRITE setRequest)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
     Q_INVOKABLE explicit QUmlSendObjectActionObject(QUmlSendObjectAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlsendsignalactionobject_p.h b/src/uml/qobjects/qumlsendsignalactionobject_p.h
index 7f583c23..b4bbdbbf 100644
--- a/src/uml/qobjects/qumlsendsignalactionobject_p.h
+++ b/src/uml/qobjects/qumlsendsignalactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlSendSignalActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,18 +92,18 @@ class Q_UML_EXPORT QUmlSendSignalActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [InvocationAction]
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * onPort READ onPort)
+    Q_PROPERTY(QObject * onPort READ onPort WRITE setOnPort)
 
     // Properties [SendSignalAction]
-    Q_PROPERTY(QObject * signal READ signal)
-    Q_PROPERTY(QObject * target READ target)
+    Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
 
 public:
     Q_INVOKABLE explicit QUmlSendSignalActionObject(QUmlSendSignalAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlsequencenodeobject_p.h b/src/uml/qobjects/qumlsequencenodeobject_p.h
index 513856ad..b62be020 100644
--- a/src/uml/qobjects/qumlsequencenodeobject_p.h
+++ b/src/uml/qobjects/qumlsequencenodeobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlSequenceNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -80,7 +80,7 @@ class Q_UML_EXPORT QUmlSequenceNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -91,7 +91,7 @@ class Q_UML_EXPORT QUmlSequenceNodeObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -111,9 +111,9 @@ class Q_UML_EXPORT QUmlSequenceNodeObject : public QObject
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
     // Properties [StructuredActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> edge READ edges)
-    Q_PROPERTY(bool mustIsolate READ mustIsolate RESET unsetMustIsolate)
+    Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate)
     Q_PROPERTY(QSet<QObject *> structuredNodeInput READ structuredNodeInputs)
     Q_PROPERTY(QSet<QObject *> structuredNodeOutput READ structuredNodeOutputs)
     Q_PROPERTY(QSet<QObject *> variable READ variables)
diff --git a/src/uml/qobjects/qumlsignaleventobject_p.h b/src/uml/qobjects/qumlsignaleventobject_p.h
index 7a2b72a6..5f7a0cd4 100644
--- a/src/uml/qobjects/qumlsignaleventobject_p.h
+++ b/src/uml/qobjects/qumlsignaleventobject_p.h
@@ -64,21 +64,21 @@ class Q_UML_EXPORT QUmlSignalEventObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [SignalEvent]
-    Q_PROPERTY(QObject * signal READ signal)
+    Q_PROPERTY(QObject * signal READ signal WRITE setSignal)
 
 public:
     Q_INVOKABLE explicit QUmlSignalEventObject(QUmlSignalEvent *qModelingObject);
diff --git a/src/uml/qobjects/qumlsignalobject_p.h b/src/uml/qobjects/qumlsignalobject_p.h
index f3c71805..f8d75266 100644
--- a/src/uml/qobjects/qumlsignalobject_p.h
+++ b/src/uml/qobjects/qumlsignalobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlSignalObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlSignalObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,15 +102,15 @@ class Q_UML_EXPORT QUmlSignalObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [Signal]
diff --git a/src/uml/qobjects/qumlslotobject_p.h b/src/uml/qobjects/qumlslotobject_p.h
index 287645f4..ad4d57d0 100644
--- a/src/uml/qobjects/qumlslotobject_p.h
+++ b/src/uml/qobjects/qumlslotobject_p.h
@@ -62,8 +62,8 @@ class Q_UML_EXPORT QUmlSlotObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [Slot]
-    Q_PROPERTY(QObject * definingFeature READ definingFeature)
-    Q_PROPERTY(QObject * owningInstance READ owningInstance)
+    Q_PROPERTY(QObject * definingFeature READ definingFeature WRITE setDefiningFeature)
+    Q_PROPERTY(QObject * owningInstance READ owningInstance WRITE setOwningInstance)
     Q_PROPERTY(QList<QObject *> value READ values)
 
 public:
diff --git a/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h b/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h
index 91b89da6..8d5978e6 100644
--- a/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h
+++ b/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlStartClassifierBehaviorActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,13 +92,13 @@ class Q_UML_EXPORT QUmlStartClassifierBehaviorActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [StartClassifierBehaviorAction]
-    Q_PROPERTY(QObject * object READ object)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
 
 public:
     Q_INVOKABLE explicit QUmlStartClassifierBehaviorActionObject(QUmlStartClassifierBehaviorAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h b/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h
index c6bec43b..7536a448 100644
--- a/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h
+++ b/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlStartObjectBehaviorActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,21 +92,21 @@ class Q_UML_EXPORT QUmlStartObjectBehaviorActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [InvocationAction]
     Q_PROPERTY(QList<QObject *> argument READ arguments)
-    Q_PROPERTY(QObject * onPort READ onPort)
+    Q_PROPERTY(QObject * onPort READ onPort WRITE setOnPort)
 
     // Properties [CallAction]
-    Q_PROPERTY(bool isSynchronous READ isSynchronous RESET unsetSynchronous)
+    Q_PROPERTY(bool isSynchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous)
     Q_PROPERTY(QList<QObject *> result READ results)
 
     // Properties [StartObjectBehaviorAction]
-    Q_PROPERTY(QObject * object READ object)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
 
 public:
     Q_INVOKABLE explicit QUmlStartObjectBehaviorActionObject(QUmlStartObjectBehaviorAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlstateinvariantobject_p.h b/src/uml/qobjects/qumlstateinvariantobject_p.h
index 1b42ccb3..8fdb559d 100644
--- a/src/uml/qobjects/qumlstateinvariantobject_p.h
+++ b/src/uml/qobjects/qumlstateinvariantobject_p.h
@@ -65,20 +65,20 @@ class Q_UML_EXPORT QUmlStateInvariantObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [InteractionFragment]
-    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand)
+    Q_PROPERTY(QObject * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction)
+    Q_PROPERTY(QObject * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand)
     Q_PROPERTY(QSet<QObject *> generalOrdering READ generalOrderings)
 
     // Properties [StateInvariant]
-    Q_PROPERTY(QObject * covered READ covered)
-    Q_PROPERTY(QObject * invariant READ invariant)
+    Q_PROPERTY(QObject * covered READ covered WRITE setCovered)
+    Q_PROPERTY(QObject * invariant READ invariant WRITE setInvariant)
 
 public:
     Q_INVOKABLE explicit QUmlStateInvariantObject(QUmlStateInvariant *qModelingObject);
diff --git a/src/uml/qobjects/qumlstatemachineobject_p.h b/src/uml/qobjects/qumlstatemachineobject_p.h
index 6a0f4f77..146d1bcc 100644
--- a/src/uml/qobjects/qumlstatemachineobject_p.h
+++ b/src/uml/qobjects/qumlstatemachineobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlStateMachineObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlStateMachineObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
@@ -136,12 +136,12 @@ class Q_UML_EXPORT QUmlStateMachineObject : public QObject
 
     // Properties [Behavior]
     Q_PROPERTY(QObject * context READ context STORED false)
-    Q_PROPERTY(bool isReentrant READ isReentrant RESET unsetReentrant)
+    Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant)
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QSet<QObject *> ownedParameterSet READ ownedParameterSets)
     Q_PROPERTY(QSet<QObject *> postcondition READ postconditions)
     Q_PROPERTY(QSet<QObject *> precondition READ preconditions)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
     // Properties [StateMachine]
     Q_PROPERTY(QSet<QObject *> connectionPoint READ connectionPoints)
diff --git a/src/uml/qobjects/qumlstateobject_p.h b/src/uml/qobjects/qumlstateobject_p.h
index 639e0968..fef59b37 100644
--- a/src/uml/qobjects/qumlstateobject_p.h
+++ b/src/uml/qobjects/qumlstateobject_p.h
@@ -65,11 +65,11 @@ class Q_UML_EXPORT QUmlStateObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Namespace]
     Q_PROPERTY(QSet<QObject *> elementImport READ elementImports)
@@ -80,11 +80,11 @@ class Q_UML_EXPORT QUmlStateObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
 
     // Properties [Vertex]
-    Q_PROPERTY(QObject * container READ container)
+    Q_PROPERTY(QObject * container READ container WRITE setContainer)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings STORED false)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings STORED false)
 
@@ -92,18 +92,18 @@ class Q_UML_EXPORT QUmlStateObject : public QObject
     Q_PROPERTY(QSet<QObject *> connection READ connections)
     Q_PROPERTY(QSet<QObject *> connectionPoint READ connectionPoints)
     Q_PROPERTY(QSet<QObject *> deferrableTrigger READ deferrableTriggers)
-    Q_PROPERTY(QObject * doActivity READ doActivity)
-    Q_PROPERTY(QObject * entry READ entry)
-    Q_PROPERTY(QObject * exit READ exit)
+    Q_PROPERTY(QObject * doActivity READ doActivity WRITE setDoActivity)
+    Q_PROPERTY(QObject * entry READ entry WRITE setEntry)
+    Q_PROPERTY(QObject * exit READ exit WRITE setExit)
     Q_PROPERTY(bool isComposite READ isComposite RESET unsetComposite STORED false)
     Q_PROPERTY(bool isOrthogonal READ isOrthogonal RESET unsetOrthogonal STORED false)
     Q_PROPERTY(bool isSimple READ isSimple RESET unsetSimple STORED false)
     Q_PROPERTY(bool isSubmachineState READ isSubmachineState RESET unsetSubmachineState STORED false)
-    Q_PROPERTY(QObject * redefinedState READ redefinedState)
+    Q_PROPERTY(QObject * redefinedState READ redefinedState WRITE setRedefinedState)
     Q_PROPERTY(QObject * redefinitionContext READ redefinitionContext STORED false)
     Q_PROPERTY(QSet<QObject *> region READ regions)
-    Q_PROPERTY(QObject * stateInvariant READ stateInvariant)
-    Q_PROPERTY(QObject * submachine READ submachine)
+    Q_PROPERTY(QObject * stateInvariant READ stateInvariant WRITE setStateInvariant)
+    Q_PROPERTY(QObject * submachine READ submachine WRITE setSubmachine)
 
 public:
     Q_INVOKABLE explicit QUmlStateObject(QUmlState *qModelingObject);
diff --git a/src/uml/qobjects/qumlstereotypeobject_p.h b/src/uml/qobjects/qumlstereotypeobject_p.h
index 53a8b955..f1773af5 100644
--- a/src/uml/qobjects/qumlstereotypeobject_p.h
+++ b/src/uml/qobjects/qumlstereotypeobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlStereotypeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlStereotypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -101,14 +101,14 @@ class Q_UML_EXPORT QUmlStereotypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> feature READ features)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [StructuredClassifier]
@@ -120,14 +120,14 @@ class Q_UML_EXPORT QUmlStereotypeObject : public QObject
     Q_PROPERTY(QSet<QObject *> ownedPort READ ownedPorts STORED false)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
     // Properties [Class]
     Q_PROPERTY(QSet<QObject *> extension READ extensions STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isActive READ isActive RESET unsetActive)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive)
     Q_PROPERTY(QList<QObject *> nestedClassifier READ nestedClassifiers)
     Q_PROPERTY(QList<QObject *> ownedAttribute READ ownedAttributes)
     Q_PROPERTY(QList<QObject *> ownedOperation READ ownedOperations)
diff --git a/src/uml/qobjects/qumlstringexpressionobject_p.h b/src/uml/qobjects/qumlstringexpressionobject_p.h
index ed64b9fe..f57f4595 100644
--- a/src/uml/qobjects/qumlstringexpressionobject_p.h
+++ b/src/uml/qobjects/qumlstringexpressionobject_p.h
@@ -65,31 +65,31 @@ class Q_UML_EXPORT QUmlStringExpressionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Expression]
     Q_PROPERTY(QList<QObject *> operand READ operands)
-    Q_PROPERTY(QString symbol READ symbol)
+    Q_PROPERTY(QString symbol READ symbol WRITE setSymbol)
 
     // Properties [TemplateableElement]
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> templateBinding READ templateBindings)
 
     // Properties [StringExpression]
-    Q_PROPERTY(QObject * owningExpression READ owningExpression)
+    Q_PROPERTY(QObject * owningExpression READ owningExpression WRITE setOwningExpression)
     Q_PROPERTY(QSet<QObject *> subExpression READ subExpressions)
 
 public:
diff --git a/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h b/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h
index 577f1d70..a61dae2c 100644
--- a/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h
+++ b/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -80,7 +80,7 @@ class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QObject
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -91,7 +91,7 @@ class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
@@ -111,9 +111,9 @@ class Q_UML_EXPORT QUmlStructuredActivityNodeObject : public QObject
     Q_PROPERTY(QObject * superGroup READ superGroup)
 
     // Properties [StructuredActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> edge READ edges)
-    Q_PROPERTY(bool mustIsolate READ mustIsolate RESET unsetMustIsolate)
+    Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate)
     Q_PROPERTY(QSet<QObject *> node READ nodes)
     Q_PROPERTY(QSet<QObject *> structuredNodeInput READ structuredNodeInputs)
     Q_PROPERTY(QSet<QObject *> structuredNodeOutput READ structuredNodeOutputs)
diff --git a/src/uml/qobjects/qumlsubstitutionobject_p.h b/src/uml/qobjects/qumlsubstitutionobject_p.h
index ca26987c..f92a72e8 100644
--- a/src/uml/qobjects/qumlsubstitutionobject_p.h
+++ b/src/uml/qobjects/qumlsubstitutionobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlSubstitutionObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
@@ -89,11 +89,11 @@ class Q_UML_EXPORT QUmlSubstitutionObject : public QObject
     Q_PROPERTY(QSet<QObject *> supplier READ suppliers)
 
     // Properties [Abstraction]
-    Q_PROPERTY(QObject * mapping READ mapping)
+    Q_PROPERTY(QObject * mapping READ mapping WRITE setMapping)
 
     // Properties [Substitution]
-    Q_PROPERTY(QObject * contract READ contract)
-    Q_PROPERTY(QObject * substitutingClassifier READ substitutingClassifier)
+    Q_PROPERTY(QObject * contract READ contract WRITE setContract)
+    Q_PROPERTY(QObject * substitutingClassifier READ substitutingClassifier WRITE setSubstitutingClassifier)
 
 public:
     Q_INVOKABLE explicit QUmlSubstitutionObject(QUmlSubstitution *qModelingObject);
diff --git a/src/uml/qobjects/qumltemplatebindingobject_p.h b/src/uml/qobjects/qumltemplatebindingobject_p.h
index e021e2bd..81879c93 100644
--- a/src/uml/qobjects/qumltemplatebindingobject_p.h
+++ b/src/uml/qobjects/qumltemplatebindingobject_p.h
@@ -69,9 +69,9 @@ class Q_UML_EXPORT QUmlTemplateBindingObject : public QObject
     Q_PROPERTY(QSet<QObject *> target READ targets)
 
     // Properties [TemplateBinding]
-    Q_PROPERTY(QObject * boundElement READ boundElement)
+    Q_PROPERTY(QObject * boundElement READ boundElement WRITE setBoundElement)
     Q_PROPERTY(QSet<QObject *> parameterSubstitution READ parameterSubstitutions)
-    Q_PROPERTY(QObject * signature READ signature)
+    Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
 public:
     Q_INVOKABLE explicit QUmlTemplateBindingObject(QUmlTemplateBinding *qModelingObject);
diff --git a/src/uml/qobjects/qumltemplateparameterobject_p.h b/src/uml/qobjects/qumltemplateparameterobject_p.h
index 582e686e..e55fe062 100644
--- a/src/uml/qobjects/qumltemplateparameterobject_p.h
+++ b/src/uml/qobjects/qumltemplateparameterobject_p.h
@@ -62,11 +62,11 @@ class Q_UML_EXPORT QUmlTemplateParameterObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [TemplateParameter]
-    Q_PROPERTY(QObject * default_ READ default_)
-    Q_PROPERTY(QObject * ownedDefault READ ownedDefault)
-    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement)
-    Q_PROPERTY(QObject * parameteredElement READ parameteredElement)
-    Q_PROPERTY(QObject * signature READ signature)
+    Q_PROPERTY(QObject * default_ READ default_ WRITE setDefault)
+    Q_PROPERTY(QObject * ownedDefault READ ownedDefault WRITE setOwnedDefault)
+    Q_PROPERTY(QObject * ownedParameteredElement READ ownedParameteredElement WRITE setOwnedParameteredElement)
+    Q_PROPERTY(QObject * parameteredElement READ parameteredElement WRITE setParameteredElement)
+    Q_PROPERTY(QObject * signature READ signature WRITE setSignature)
 
 public:
     Q_INVOKABLE explicit QUmlTemplateParameterObject(QUmlTemplateParameter *qModelingObject);
diff --git a/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h b/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h
index ddf4cf49..7a2d2dac 100644
--- a/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h
+++ b/src/uml/qobjects/qumltemplateparametersubstitutionobject_p.h
@@ -62,10 +62,10 @@ class Q_UML_EXPORT QUmlTemplateParameterSubstitutionObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [TemplateParameterSubstitution]
-    Q_PROPERTY(QObject * actual READ actual)
-    Q_PROPERTY(QObject * formal READ formal)
-    Q_PROPERTY(QObject * ownedActual READ ownedActual)
-    Q_PROPERTY(QObject * templateBinding READ templateBinding)
+    Q_PROPERTY(QObject * actual READ actual WRITE setActual)
+    Q_PROPERTY(QObject * formal READ formal WRITE setFormal)
+    Q_PROPERTY(QObject * ownedActual READ ownedActual WRITE setOwnedActual)
+    Q_PROPERTY(QObject * templateBinding READ templateBinding WRITE setTemplateBinding)
 
 public:
     Q_INVOKABLE explicit QUmlTemplateParameterSubstitutionObject(QUmlTemplateParameterSubstitution *qModelingObject);
diff --git a/src/uml/qobjects/qumltemplatesignatureobject_p.h b/src/uml/qobjects/qumltemplatesignatureobject_p.h
index d439e5d9..909ad1ec 100644
--- a/src/uml/qobjects/qumltemplatesignatureobject_p.h
+++ b/src/uml/qobjects/qumltemplatesignatureobject_p.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QUmlTemplateSignatureObject : public QObject
     // Properties [TemplateSignature]
     Q_PROPERTY(QList<QObject *> ownedParameter READ ownedParameters)
     Q_PROPERTY(QList<QObject *> parameter READ parameters)
-    Q_PROPERTY(QObject * template_ READ template_)
+    Q_PROPERTY(QObject * template_ READ template_ WRITE setTemplate)
 
 public:
     Q_INVOKABLE explicit QUmlTemplateSignatureObject(QUmlTemplateSignature *qModelingObject);
diff --git a/src/uml/qobjects/qumltestidentityactionobject_p.h b/src/uml/qobjects/qumltestidentityactionobject_p.h
index 6600b9ab..718eff0e 100644
--- a/src/uml/qobjects/qumltestidentityactionobject_p.h
+++ b/src/uml/qobjects/qumltestidentityactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlTestIdentityActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlTestIdentityActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [TestIdentityAction]
-    Q_PROPERTY(QObject * first READ first)
-    Q_PROPERTY(QObject * result READ result)
-    Q_PROPERTY(QObject * second READ second)
+    Q_PROPERTY(QObject * first READ first WRITE setFirst)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
+    Q_PROPERTY(QObject * second READ second WRITE setSecond)
 
 public:
     Q_INVOKABLE explicit QUmlTestIdentityActionObject(QUmlTestIdentityAction *qModelingObject);
diff --git a/src/uml/qobjects/qumltimeconstraintobject_p.h b/src/uml/qobjects/qumltimeconstraintobject_p.h
index cd794ba6..59920e7b 100644
--- a/src/uml/qobjects/qumltimeconstraintobject_p.h
+++ b/src/uml/qobjects/qumltimeconstraintobject_p.h
@@ -64,28 +64,28 @@ class Q_UML_EXPORT QUmlTimeConstraintObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Constraint]
     Q_PROPERTY(QList<QObject *> constrainedElement READ constrainedElements)
-    Q_PROPERTY(QObject * context READ context)
+    Q_PROPERTY(QObject * context READ context WRITE setContext)
 
     // Properties [IntervalConstraint]
 
     // Properties [TimeConstraint]
-    Q_PROPERTY(bool firstEvent READ firstEvent RESET unsetFirstEvent)
-    Q_PROPERTY(QObject * specification READ specification)
+    Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent RESET unsetFirstEvent)
+    Q_PROPERTY(QObject * specification READ specification WRITE setSpecification)
 
 public:
     Q_INVOKABLE explicit QUmlTimeConstraintObject(QUmlTimeConstraint *qModelingObject);
diff --git a/src/uml/qobjects/qumltimeeventobject_p.h b/src/uml/qobjects/qumltimeeventobject_p.h
index 7c8c4672..238c9365 100644
--- a/src/uml/qobjects/qumltimeeventobject_p.h
+++ b/src/uml/qobjects/qumltimeeventobject_p.h
@@ -64,22 +64,22 @@ class Q_UML_EXPORT QUmlTimeEventObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [TimeEvent]
-    Q_PROPERTY(bool isRelative READ isRelative RESET unsetRelative)
-    Q_PROPERTY(QObject * when READ when)
+    Q_PROPERTY(bool isRelative READ isRelative WRITE setRelative RESET unsetRelative)
+    Q_PROPERTY(QObject * when READ when WRITE setWhen)
 
 public:
     Q_INVOKABLE explicit QUmlTimeEventObject(QUmlTimeEvent *qModelingObject);
diff --git a/src/uml/qobjects/qumltimeexpressionobject_p.h b/src/uml/qobjects/qumltimeexpressionobject_p.h
index 6ade4791..86a2e8e7 100644
--- a/src/uml/qobjects/qumltimeexpressionobject_p.h
+++ b/src/uml/qobjects/qumltimeexpressionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlTimeExpressionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [TimeExpression]
-    Q_PROPERTY(QObject * expr READ expr)
+    Q_PROPERTY(QObject * expr READ expr WRITE setExpr)
     Q_PROPERTY(QSet<QObject *> observation READ observations)
 
 public:
diff --git a/src/uml/qobjects/qumltimeintervalobject_p.h b/src/uml/qobjects/qumltimeintervalobject_p.h
index afe87b13..5ace21c8 100644
--- a/src/uml/qobjects/qumltimeintervalobject_p.h
+++ b/src/uml/qobjects/qumltimeintervalobject_p.h
@@ -65,26 +65,26 @@ class Q_UML_EXPORT QUmlTimeIntervalObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Interval]
 
     // Properties [TimeInterval]
-    Q_PROPERTY(QObject * max READ max)
-    Q_PROPERTY(QObject * min READ min)
+    Q_PROPERTY(QObject * max READ max WRITE setMax)
+    Q_PROPERTY(QObject * min READ min WRITE setMin)
 
 public:
     Q_INVOKABLE explicit QUmlTimeIntervalObject(QUmlTimeInterval *qModelingObject);
diff --git a/src/uml/qobjects/qumltimeobservationobject_p.h b/src/uml/qobjects/qumltimeobservationobject_p.h
index 21f63bbc..c77c6ef4 100644
--- a/src/uml/qobjects/qumltimeobservationobject_p.h
+++ b/src/uml/qobjects/qumltimeobservationobject_p.h
@@ -64,22 +64,22 @@ class Q_UML_EXPORT QUmlTimeObservationObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [TimeObservation]
-    Q_PROPERTY(QObject * event READ event)
-    Q_PROPERTY(bool firstEvent READ firstEvent RESET unsetFirstEvent)
+    Q_PROPERTY(QObject * event READ event WRITE setEvent)
+    Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent RESET unsetFirstEvent)
 
 public:
     Q_INVOKABLE explicit QUmlTimeObservationObject(QUmlTimeObservation *qModelingObject);
diff --git a/src/uml/qobjects/qumltransitionobject_p.h b/src/uml/qobjects/qumltransitionobject_p.h
index f473df23..11132a55 100644
--- a/src/uml/qobjects/qumltransitionobject_p.h
+++ b/src/uml/qobjects/qumltransitionobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlTransitionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
 
     // Properties [Namespace]
@@ -84,14 +84,14 @@ class Q_UML_EXPORT QUmlTransitionObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [Transition]
-    Q_PROPERTY(QObject * container READ container)
-    Q_PROPERTY(QObject * effect READ effect)
-    Q_PROPERTY(QObject * guard READ guard)
-    Q_PROPERTY(QtUml::TransitionKind kind READ kind RESET unsetKind)
-    Q_PROPERTY(QObject * redefinedTransition READ redefinedTransition)
+    Q_PROPERTY(QObject * container READ container WRITE setContainer)
+    Q_PROPERTY(QObject * effect READ effect WRITE setEffect)
+    Q_PROPERTY(QObject * guard READ guard WRITE setGuard)
+    Q_PROPERTY(QtUml::TransitionKind kind READ kind WRITE setKind RESET unsetKind)
+    Q_PROPERTY(QObject * redefinedTransition READ redefinedTransition WRITE setRedefinedTransition)
     Q_PROPERTY(QObject * redefinitionContext READ redefinitionContext STORED false)
-    Q_PROPERTY(QObject * source READ source)
-    Q_PROPERTY(QObject * target READ target)
+    Q_PROPERTY(QObject * source READ source WRITE setSource)
+    Q_PROPERTY(QObject * target READ target WRITE setTarget)
     Q_PROPERTY(QSet<QObject *> trigger READ triggers)
 
 public:
diff --git a/src/uml/qobjects/qumltriggerobject_p.h b/src/uml/qobjects/qumltriggerobject_p.h
index c38cf495..ce7d1309 100644
--- a/src/uml/qobjects/qumltriggerobject_p.h
+++ b/src/uml/qobjects/qumltriggerobject_p.h
@@ -65,14 +65,14 @@ class Q_UML_EXPORT QUmlTriggerObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [Trigger]
-    Q_PROPERTY(QObject * event READ event)
+    Q_PROPERTY(QObject * event READ event WRITE setEvent)
     Q_PROPERTY(QSet<QObject *> port READ ports)
 
 public:
diff --git a/src/uml/qobjects/qumlunmarshallactionobject_p.h b/src/uml/qobjects/qumlunmarshallactionobject_p.h
index 68e147d0..b7cfb8a6 100644
--- a/src/uml/qobjects/qumlunmarshallactionobject_p.h
+++ b/src/uml/qobjects/qumlunmarshallactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlUnmarshallActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,15 +92,15 @@ class Q_UML_EXPORT QUmlUnmarshallActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [UnmarshallAction]
-    Q_PROPERTY(QObject * object READ object)
+    Q_PROPERTY(QObject * object READ object WRITE setObject)
     Q_PROPERTY(QSet<QObject *> result READ results)
-    Q_PROPERTY(QObject * unmarshallType READ unmarshallType)
+    Q_PROPERTY(QObject * unmarshallType READ unmarshallType WRITE setUnmarshallType)
 
 public:
     Q_INVOKABLE explicit QUmlUnmarshallActionObject(QUmlUnmarshallAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlusageobject_p.h b/src/uml/qobjects/qumlusageobject_p.h
index fc6b870d..a75fd0e2 100644
--- a/src/uml/qobjects/qumlusageobject_p.h
+++ b/src/uml/qobjects/qumlusageobject_p.h
@@ -64,18 +64,18 @@ class Q_UML_EXPORT QUmlUsageObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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 RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Relationship]
     Q_PROPERTY(QSet<QObject *> relatedElement READ relatedElements)
diff --git a/src/uml/qobjects/qumlusecaseobject_p.h b/src/uml/qobjects/qumlusecaseobject_p.h
index 1fa6cc83..2cb97eb0 100644
--- a/src/uml/qobjects/qumlusecaseobject_p.h
+++ b/src/uml/qobjects/qumlusecaseobject_p.h
@@ -65,8 +65,8 @@ class Q_UML_EXPORT QUmlUseCaseObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
 
@@ -79,16 +79,16 @@ class Q_UML_EXPORT QUmlUseCaseObject : public QObject
     Q_PROPERTY(QSet<QObject *> packageImport READ packageImports)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [PackageableElement]
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility RESET unsetVisibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility)
 
     // Properties [Type]
-    Q_PROPERTY(QObject * package READ package)
+    Q_PROPERTY(QObject * package READ package WRITE setPackage)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
@@ -102,19 +102,19 @@ class Q_UML_EXPORT QUmlUseCaseObject : public QObject
     Q_PROPERTY(QSet<QObject *> general READ generals STORED false)
     Q_PROPERTY(QSet<QObject *> generalization READ generalizations)
     Q_PROPERTY(QSet<QObject *> inheritedMember READ inheritedMembers STORED false)
-    Q_PROPERTY(bool isAbstract READ isAbstract RESET unsetAbstract)
-    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization RESET unsetFinalSpecialization)
-    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature)
+    Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract)
+    Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization)
+    Q_PROPERTY(QObject * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature)
     Q_PROPERTY(QSet<QObject *> ownedUseCase READ ownedUseCases)
     Q_PROPERTY(QSet<QObject *> powertypeExtent READ powertypeExtents)
     Q_PROPERTY(QSet<QObject *> redefinedClassifier READ redefinedClassifiers)
-    Q_PROPERTY(QObject * representation READ representation)
+    Q_PROPERTY(QObject * representation READ representation WRITE setRepresentation)
     Q_PROPERTY(QSet<QObject *> substitution READ substitutions)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
     Q_PROPERTY(QSet<QObject *> useCase READ useCases)
 
     // Properties [BehavioredClassifier]
-    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior)
+    Q_PROPERTY(QObject * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior)
     Q_PROPERTY(QSet<QObject *> interfaceRealization READ interfaceRealizations)
     Q_PROPERTY(QSet<QObject *> ownedBehavior READ ownedBehaviors)
 
diff --git a/src/uml/qobjects/qumlvaluepinobject_p.h b/src/uml/qobjects/qumlvaluepinobject_p.h
index 6e4aaec4..7d835948 100644
--- a/src/uml/qobjects/qumlvaluepinobject_p.h
+++ b/src/uml/qobjects/qumlvaluepinobject_p.h
@@ -64,51 +64,51 @@ class Q_UML_EXPORT QUmlValuePinObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ObjectNode]
     Q_PROPERTY(QSet<QObject *> inState READ inStates)
-    Q_PROPERTY(bool isControlType READ isControlType RESET unsetControlType)
-    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering RESET unsetOrdering)
-    Q_PROPERTY(QObject * selection READ selection)
-    Q_PROPERTY(QObject * upperBound READ upperBound)
+    Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType)
+    Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering)
+    Q_PROPERTY(QObject * selection READ selection WRITE setSelection)
+    Q_PROPERTY(QObject * upperBound READ upperBound WRITE setUpperBound)
 
     // Properties [Pin]
-    Q_PROPERTY(bool isControl READ isControl RESET unsetControl)
+    Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl)
 
     // Properties [ValuePin]
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
     Q_INVOKABLE explicit QUmlValuePinObject(QUmlValuePin *qModelingObject);
diff --git a/src/uml/qobjects/qumlvaluespecificationactionobject_p.h b/src/uml/qobjects/qumlvaluespecificationactionobject_p.h
index 4b66e4d0..87dfb7a1 100644
--- a/src/uml/qobjects/qumlvaluespecificationactionobject_p.h
+++ b/src/uml/qobjects/qumlvaluespecificationactionobject_p.h
@@ -65,23 +65,23 @@ class Q_UML_EXPORT QUmlValueSpecificationActionObject : public QObject
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf RESET unsetLeaf)
+    Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf)
     Q_PROPERTY(QSet<QObject *> redefinedElement READ redefinedElements)
     Q_PROPERTY(QSet<QObject *> redefinitionContext READ redefinitionContexts)
 
     // Properties [ActivityNode]
-    Q_PROPERTY(QObject * activity READ activity)
+    Q_PROPERTY(QObject * activity READ activity WRITE setActivity)
     Q_PROPERTY(QSet<QObject *> inGroup READ inGroups)
     Q_PROPERTY(QSet<QObject *> inInterruptibleRegion READ inInterruptibleRegions)
     Q_PROPERTY(QSet<QObject *> inPartition READ inPartitions)
-    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode)
+    Q_PROPERTY(QObject * inStructuredNode READ inStructuredNode WRITE setInStructuredNode)
     Q_PROPERTY(QSet<QObject *> incoming READ incomings)
     Q_PROPERTY(QSet<QObject *> outgoing READ outgoings)
     Q_PROPERTY(QSet<QObject *> redefinedNode READ redefinedNodes)
@@ -92,14 +92,14 @@ class Q_UML_EXPORT QUmlValueSpecificationActionObject : public QObject
     // Properties [Action]
     Q_PROPERTY(QObject * context READ context STORED false)
     Q_PROPERTY(QList<QObject *> input READ inputs)
-    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant RESET unsetLocallyReentrant)
+    Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant)
     Q_PROPERTY(QSet<QObject *> localPostcondition READ localPostconditions)
     Q_PROPERTY(QSet<QObject *> localPrecondition READ localPreconditions)
     Q_PROPERTY(QList<QObject *> output READ outputs)
 
     // Properties [ValueSpecificationAction]
-    Q_PROPERTY(QObject * result READ result)
-    Q_PROPERTY(QObject * value READ value)
+    Q_PROPERTY(QObject * result READ result WRITE setResult)
+    Q_PROPERTY(QObject * value READ value WRITE setValue)
 
 public:
     Q_INVOKABLE explicit QUmlValueSpecificationActionObject(QUmlValueSpecificationAction *qModelingObject);
diff --git a/src/uml/qobjects/qumlvariableobject_p.h b/src/uml/qobjects/qumlvariableobject_p.h
index 7414dd3c..2b0af90c 100644
--- a/src/uml/qobjects/qumlvariableobject_p.h
+++ b/src/uml/qobjects/qumlvariableobject_p.h
@@ -64,34 +64,34 @@ class Q_UML_EXPORT QUmlVariableObject : public QObject
     Q_PROPERTY(QObject * owner READ owner)
 
     // Properties [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered RESET unsetOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique RESET unsetUnique)
-    Q_PROPERTY(int lower READ lower RESET unsetLower STORED false)
-    Q_PROPERTY(QObject * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper RESET unsetUpper STORED false)
-    Q_PROPERTY(QObject * upperValue READ upperValue)
+    Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered)
+    Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique)
+    Q_PROPERTY(int lower READ lower WRITE setLower RESET unsetLower STORED false)
+    Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue)
+    Q_PROPERTY(int upper READ upper WRITE setUpper RESET unsetUpper STORED false)
+    Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue)
 
     // Properties [NamedElement]
     Q_PROPERTY(QSet<QObject *> clientDependency READ clientDependencies)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QObject * nameExpression READ nameExpression)
+    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)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
+    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility)
 
     // Properties [TypedElement]
-    Q_PROPERTY(QObject * type READ type)
+    Q_PROPERTY(QObject * type READ type WRITE setType)
 
     // Properties [ParameterableElement]
-    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter)
+    Q_PROPERTY(QObject * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter)
 
     // Properties [ConnectableElement]
     Q_PROPERTY(QList<QObject *> end READ ends STORED false)
-    Q_PROPERTY(QObject * templateParameter READ templateParameter)
+    Q_PROPERTY(QObject * templateParameter READ templateParameter WRITE setTemplateParameter)
 
     // Properties [Variable]
-    Q_PROPERTY(QObject * activityScope READ activityScope)
-    Q_PROPERTY(QObject * scope READ scope)
+    Q_PROPERTY(QObject * activityScope READ activityScope WRITE setActivityScope)
+    Q_PROPERTY(QObject * scope READ scope WRITE setScope)
 
 public:
     Q_INVOKABLE explicit QUmlVariableObject(QUmlVariable *qModelingObject);
diff --git a/src/uml/qumlabstraction.cpp b/src/uml/qumlabstraction.cpp
index 4706f48e..0b53931a 100644
--- a/src/uml/qumlabstraction.cpp
+++ b/src/uml/qumlabstraction.cpp
@@ -136,14 +136,14 @@ void QUmlAbstraction::setMapping(QUmlOpaqueExpression *mapping)
 
 void QUmlAbstraction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("mapping")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("mapping")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAbstraction");
-    QModelingObject::propertyDataHash[QStringLiteral("mapping")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("mapping")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("mapping")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("mapping")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("mapping")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlacceptcallaction.cpp b/src/uml/qumlacceptcallaction.cpp
index bdc3babb..8fc22c54 100644
--- a/src/uml/qumlacceptcallaction.cpp
+++ b/src/uml/qumlacceptcallaction.cpp
@@ -166,14 +166,14 @@ void QUmlAcceptCallAction::setReturnInformation(QUmlOutputPin *returnInformation
 
 void QUmlAcceptCallAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptCallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("returnInformation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlaccepteventaction.cpp b/src/uml/qumlaccepteventaction.cpp
index 6de5459d..62a17bc4 100644
--- a/src/uml/qumlaccepteventaction.cpp
+++ b/src/uml/qumlaccepteventaction.cpp
@@ -231,32 +231,32 @@ void QUmlAcceptEventAction::removeTrigger(QUmlTrigger *trigger)
 
 void QUmlAcceptEventAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isUnmarshall")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnmarshall")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnmarshall")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isUnmarshall")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isUnmarshall")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnmarshall")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnmarshall")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][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("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][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("trigger")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("result")][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("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAcceptEventAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][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("trigger")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAcceptEventAction")][QStringLiteral("trigger")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp
index 39e0200b..527397d7 100644
--- a/src/uml/qumlaction.cpp
+++ b/src/uml/qumlaction.cpp
@@ -318,59 +318,59 @@ void QUmlAction::removeOutput(QUmlOutputPin *output)
 
 void QUmlAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::DocumentationRole] = QStringLiteral("The classifier that owns the behavior of which this action is a part.");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of input pins connected to the Action. These are among the total set of inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("input")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isLocallyReentrant")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isLocallyReentrant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isLocallyReentrant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isLocallyReentrant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isLocallyReentrant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isLocallyReentrant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isLocallyReentrant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that must be satisfied when executed is completed.");
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("localPostcondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that must be satisfied when execution is started.");
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("localPrecondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("output")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("output")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
-    QModelingObject::propertyDataHash[QStringLiteral("output")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("output")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("output")][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("output")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("output")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("output")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("input")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("input")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("input")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("input")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("input")][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("input")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("input")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("input")][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("localPostcondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that must be satisfied when executed is completed.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPostcondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::DocumentationRole] = QStringLiteral("Constraint that must be satisfied when execution is started.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("localPrecondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][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("output")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAction")][QStringLiteral("output")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlactionexecutionspecification.cpp b/src/uml/qumlactionexecutionspecification.cpp
index 9ce6b2bc..d227b33a 100644
--- a/src/uml/qumlactionexecutionspecification.cpp
+++ b/src/uml/qumlactionexecutionspecification.cpp
@@ -133,14 +133,14 @@ void QUmlActionExecutionSpecification::setAction(QUmlAction *action)
 
 void QUmlActionExecutionSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActionExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::DocumentationRole] = QStringLiteral("Action whose execution is occurring.");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlactioninputpin.cpp b/src/uml/qumlactioninputpin.cpp
index 0c63b1c6..eee2bc50 100644
--- a/src/uml/qumlactioninputpin.cpp
+++ b/src/uml/qumlactioninputpin.cpp
@@ -172,14 +172,14 @@ void QUmlActionInputPin::setFromAction(QUmlAction *fromAction)
 
 void QUmlActionInputPin::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActionInputPin");
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::DocumentationRole] = QStringLiteral("The action used to provide values.");
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("fromAction")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlactivity.cpp b/src/uml/qumlactivity.cpp
index b5096c48..793632c2 100644
--- a/src/uml/qumlactivity.cpp
+++ b/src/uml/qumlactivity.cpp
@@ -534,77 +534,77 @@ void QUmlActivity::removeVariable(QUmlVariable *variable)
 
 void QUmlActivity::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::DocumentationRole] = QStringLiteral("Edges expressing flow between nodes of the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-activity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::DocumentationRole] = QStringLiteral("Top-level groups in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("group")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-inActivity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isReadOnly")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::DocumentationRole] = QStringLiteral("If true, all invocations of the activity are handled by the same execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSingleExecution")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes coordinated by the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-activity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::DocumentationRole] = QStringLiteral("Top-level partitions in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Activity-group");
-    QModelingObject::propertyDataHash[QStringLiteral("partition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::DocumentationRole] = QStringLiteral("Top-level structured nodes in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Activity-group Activity-node");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNode")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-activity");
-
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::DocumentationRole] = QStringLiteral("Top-level variables in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::OppositeEndRole] = QStringLiteral("Variable-activityScope");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::DocumentationRole] = QStringLiteral("Edges expressing flow between nodes of the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("edge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-activity");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::DocumentationRole] = QStringLiteral("Top-level groups in the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("group")][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("node")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes coordinated by the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-activity");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::DocumentationRole] = QStringLiteral("Top-level partitions in the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Activity-group");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("partition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::DocumentationRole] = QStringLiteral("Top-level structured nodes in the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Activity-group Activity-node");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("structuredNode")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-activity");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivity");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::DocumentationRole] = QStringLiteral("Top-level variables in the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivity")][QStringLiteral("variable")][QtModeling::OppositeEndRole] = QStringLiteral("Variable-activityScope");
 
 }
 
diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp
index 5ce8c8c5..036e3e70 100644
--- a/src/uml/qumlactivityedge.cpp
+++ b/src/uml/qumlactivityedge.cpp
@@ -418,95 +418,95 @@ void QUmlActivityEdge::setWeight(QUmlValueSpecification *weight)
 
 void QUmlActivityEdge::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::DocumentationRole] = QStringLiteral("Activity containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-edge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::DocumentationRole] = QStringLiteral("Specification evaluated at runtime to determine if the edge can be traversed.");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::DocumentationRole] = QStringLiteral("Groups containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-containedEdge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::DocumentationRole] = QStringLiteral("Partitions containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityEdge-inGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-edge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::DocumentationRole] = QStringLiteral("Structured activity node containing the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityEdge-inGroup Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-edge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::DocumentationRole] = QStringLiteral("Region that the edge can interrupt.");
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interrupts")][QtModeling::OppositeEndRole] = QStringLiteral("InterruptibleActivityRegion-interruptingEdge");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::DocumentationRole] = QStringLiteral("Inherited edges replaced by this edge in a specialization of the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedEdge")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::DocumentationRole] = QStringLiteral("Node from which tokens are taken when they traverse the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-outgoing");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("Node to which tokens are put when they traverse the edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-incoming");
-
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::DocumentationRole] = QStringLiteral("The minimum number of tokens that must traverse the edge at the same time.");
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("weight")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("inGroup")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::DocumentationRole] = QStringLiteral("Groups containing the edge.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inGroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-containedEdge");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::DocumentationRole] = QStringLiteral("Partitions containing the edge.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityEdge-inGroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("inPartition")][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("redefinedEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityEdge");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][QtModeling::DocumentationRole] = QStringLiteral("Inherited edges replaced by this edge in a specialization of the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityEdge")][QStringLiteral("redefinedEdge")][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/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp
index 1bb044db..277e352b 100644
--- a/src/uml/qumlactivitygroup.cpp
+++ b/src/uml/qumlactivitygroup.cpp
@@ -260,50 +260,50 @@ void QUmlActivityGroup::setSuperGroup(QUmlActivityGroup *superGroup)
 
 void QUmlActivityGroup::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("containedEdge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inGroup");
-
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("containedNode")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inGroup");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::DocumentationRole] = QStringLiteral("Activity containing the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("inActivity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-group");
-
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::DocumentationRole] = QStringLiteral("Groups immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("subgroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-superGroup");
-
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::DocumentationRole] = QStringLiteral("Group immediately containing the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("superGroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-subgroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedEdge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inGroup");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("containedNode")][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("subgroup")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityGroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][QtModeling::DocumentationRole] = QStringLiteral("Groups immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityGroup")][QStringLiteral("subgroup")][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/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp
index c3ff7247..bce90208 100644
--- a/src/uml/qumlactivitynode.cpp
+++ b/src/uml/qumlactivitynode.cpp
@@ -411,77 +411,77 @@ void QUmlActivityNode::removeRedefinedNode(QUmlActivityNode *redefinedNode)
 
 void QUmlActivityNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::DocumentationRole] = QStringLiteral("Activity containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::DocumentationRole] = QStringLiteral("Groups containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inGroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-containedNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::DocumentationRole] = QStringLiteral("Interruptible regions containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("inInterruptibleRegion")][QtModeling::OppositeEndRole] = QStringLiteral("InterruptibleActivityRegion-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::DocumentationRole] = QStringLiteral("Partitions containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("inPartition")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::DocumentationRole] = QStringLiteral("Structured activity node containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("inStructuredNode")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-node");
-
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::DocumentationRole] = QStringLiteral("Edges that have the node as target.");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-target");
-
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::DocumentationRole] = QStringLiteral("Edges that have the node as source.");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-source");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::DocumentationRole] = QStringLiteral("Inherited nodes replaced by this node in a specialization of the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedNode")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("inGroup")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::DocumentationRole] = QStringLiteral("Groups containing the node.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inGroup")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityGroup-containedNode");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::DocumentationRole] = QStringLiteral("Interruptible regions containing the node.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inInterruptibleRegion")][QtModeling::OppositeEndRole] = QStringLiteral("InterruptibleActivityRegion-node");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::DocumentationRole] = QStringLiteral("Partitions containing the node.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityNode-inGroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("inPartition")][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("incoming")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::DocumentationRole] = QStringLiteral("Edges that have the node as target.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("incoming")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-target");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::DocumentationRole] = QStringLiteral("Edges that have the node as source.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("outgoing")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-source");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::DocumentationRole] = QStringLiteral("Inherited nodes replaced by this node in a specialization of the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityNode")][QStringLiteral("redefinedNode")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlactivityparameternode.cpp b/src/uml/qumlactivityparameternode.cpp
index fce18131..2648bfdb 100644
--- a/src/uml/qumlactivityparameternode.cpp
+++ b/src/uml/qumlactivityparameternode.cpp
@@ -154,14 +154,14 @@ void QUmlActivityParameterNode::setParameter(QUmlParameter *parameter)
 
 void QUmlActivityParameterNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityParameterNode");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::DocumentationRole] = QStringLiteral("The parameter the object node will be accepting or providing values for.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp
index de818463..1f7eca18 100644
--- a/src/uml/qumlactivitypartition.cpp
+++ b/src/uml/qumlactivitypartition.cpp
@@ -331,68 +331,68 @@ void QUmlActivityPartition::setSuperPartition(QUmlActivityPartition *superPartit
 
 void QUmlActivityPartition::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedEdge");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inPartition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the partition groups other partitions along a dimension.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDimension")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the partition represents an entity to which the partitioning structure does not apply.");
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isExternal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inPartition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::DocumentationRole] = QStringLiteral("An element constraining behaviors invoked by nodes in the partition.");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::DocumentationRole] = QStringLiteral("Partitions immediately contained in the partition.");
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-subgroup");
-    QModelingObject::propertyDataHash[QStringLiteral("subpartition")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-superPartition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::DocumentationRole] = QStringLiteral("Partition immediately containing the partition.");
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-superGroup");
-    QModelingObject::propertyDataHash[QStringLiteral("superPartition")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityPartition-subpartition");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedEdge");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("edge")][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("node")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("node")][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("subpartition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlActivityPartition");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][QtModeling::DocumentationRole] = QStringLiteral("Partitions immediately contained in the partition.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-subgroup");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlActivityPartition")][QStringLiteral("subpartition")][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/qumladdstructuralfeaturevalueaction.cpp b/src/uml/qumladdstructuralfeaturevalueaction.cpp
index 008fbbf1..f0aabdc8 100644
--- a/src/uml/qumladdstructuralfeaturevalueaction.cpp
+++ b/src/uml/qumladdstructuralfeaturevalueaction.cpp
@@ -190,23 +190,23 @@ void QUmlAddStructuralFeatureValueAction::setReplaceAll(bool isReplaceAll)
 
 void QUmlAddStructuralFeatureValueAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("insertAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumladdvariablevalueaction.cpp b/src/uml/qumladdvariablevalueaction.cpp
index da9d0780..18f7d02f 100644
--- a/src/uml/qumladdvariablevalueaction.cpp
+++ b/src/uml/qumladdvariablevalueaction.cpp
@@ -186,23 +186,23 @@ void QUmlAddVariableValueAction::setReplaceAll(bool isReplaceAll)
 
 void QUmlAddVariableValueAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("insertAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAddVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether existing values of the variable should be removed before adding the new value.");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlartifact.cpp b/src/uml/qumlartifact.cpp
index 1a4abae8..560b72f9 100644
--- a/src/uml/qumlartifact.cpp
+++ b/src/uml/qumlartifact.cpp
@@ -338,50 +338,50 @@ void QUmlArtifact::removeOwnedOperation(QUmlOperation *ownedOperation)
 
 void QUmlArtifact::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("fileName")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("fileName")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("fileName")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fileName")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("fileName")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("fileName")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("fileName")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][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("manifestation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("manifestation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][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("nestedArtifact")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedArtifact")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The Operations defined for the Artifact. The association is a specialization of the ownedMember association.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("manifestation")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestation")][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("manifestation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("manifestation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][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("nestedArtifact")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("nestedArtifact")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][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("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlArtifact");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The Operations defined for the Artifact. The association is a specialization of the ownedMember association.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlArtifact")][QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp
index 889bcac3..eea3978e 100644
--- a/src/uml/qumlassociation.cpp
+++ b/src/uml/qumlassociation.cpp
@@ -351,50 +351,50 @@ void QUmlAssociation::removeOwnedEnd(QUmlProperty *ownedEnd)
 
 void QUmlAssociation::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::DocumentationRole] = QStringLiteral("References the classifiers that are used as types of the ends of the association.");
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("endType")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether the association is derived from other model elements such as other associations or constraints.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::DocumentationRole] = QStringLiteral("Each end represents participation of instances of the classifier connected to the end in links of the association.");
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("memberEnd")][QtModeling::OppositeEndRole] = QStringLiteral("Property-association");
-
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::DocumentationRole] = QStringLiteral("The navigable ends that are owned by the association itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Association-ownedEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("navigableOwnedEnd")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::DocumentationRole] = QStringLiteral("The ends that are owned by the association itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Association-memberEnd Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::OppositeEndRole] = QStringLiteral("Property-owningAssociation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::DocumentationRole] = QStringLiteral("References the classifiers that are used as types of the ends of the association.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("endType")][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("memberEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnd")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnd")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnd")][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("memberEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("memberEnd")][QtModeling::OppositeEndRole] = QStringLiteral("Property-association");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::DocumentationRole] = QStringLiteral("The navigable ends that are owned by the association itself.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Association-ownedEnd");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("navigableOwnedEnd")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlAssociation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::DocumentationRole] = QStringLiteral("The ends that are owned by the association itself.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Association-memberEnd Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlAssociation")][QStringLiteral("ownedEnd")][QtModeling::OppositeEndRole] = QStringLiteral("Property-owningAssociation");
 
 }
 
diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp
index fded45ef..607cd153 100644
--- a/src/uml/qumlbehavior.cpp
+++ b/src/uml/qumlbehavior.cpp
@@ -447,77 +447,77 @@ void QUmlBehavior::setSpecification(QUmlBehavioralFeature *specification)
 
 void QUmlBehavior::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("context")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the behavior can be invoked while it is still executing from a previous invocation.");
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReentrant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][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("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::DocumentationRole] = QStringLiteral("The ParameterSets owned by this Behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][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("postcondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying what must be fulfilled when the behavior is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][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("redefinedBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-redefinedClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("BehavioralFeature-method");
+    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("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameter")][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("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::DocumentationRole] = QStringLiteral("The ParameterSets owned by this Behavior.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("ownedParameterSet")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][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("postcondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("postcondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying what must be fulfilled when the behavior is invoked.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("precondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][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("redefinedBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-redefinedClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavior")][QStringLiteral("redefinedBehavior")][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/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp
index e1edfb57..bad8ff56 100644
--- a/src/uml/qumlbehavioralfeature.cpp
+++ b/src/uml/qumlbehavioralfeature.cpp
@@ -314,59 +314,59 @@ bool QUmlBehavioralFeature::isDistinguishableFrom(QUmlNamedElement *n, QUmlNames
 
 void QUmlBehavioralFeature::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("concurrency")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("concurrency")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("concurrency")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("concurrency")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("concurrency")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("concurrency")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("concurrency")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isAbstract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("method")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("method")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("method")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("method")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("method")][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("method")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("method")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("method")][QtModeling::OppositeEndRole] = QStringLiteral("Behavior-specification");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the ordered set of formal parameters of this BehavioralFeature.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::DocumentationRole] = QStringLiteral("The ParameterSets owned by this BehavioralFeature.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameterSet")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::DocumentationRole] = QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this feature.");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("method")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("method")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("method")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("method")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("method")][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("method")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("method")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("method")][QtModeling::OppositeEndRole] = QStringLiteral("Behavior-specification");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the ordered set of formal parameters of this BehavioralFeature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::DocumentationRole] = QStringLiteral("The ParameterSets owned by this BehavioralFeature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("ownedParameterSet")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioralFeature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::DocumentationRole] = QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this feature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioralFeature")][QStringLiteral("raisedException")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp
index b8b2d22c..255ef922 100644
--- a/src/uml/qumlbehavioredclassifier.cpp
+++ b/src/uml/qumlbehavioredclassifier.cpp
@@ -265,32 +265,32 @@ void QUmlBehavioredClassifier::removeOwnedBehavior(QUmlBehavior *ownedBehavior)
 
 void QUmlBehavioredClassifier::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::DocumentationRole] = QStringLiteral("A behavior specification that specifies the behavior of the classifier itself.");
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("BehavioredClassifier-ownedBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("classifierBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][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("interfaceRealization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("interfaceRealization")][QtModeling::OppositeEndRole] = QStringLiteral("InterfaceRealization-implementingClassifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::DocumentationRole] = QStringLiteral("References behavior specifications owned by a classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("interfaceRealization")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealization")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealization")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealization")][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("interfaceRealization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("interfaceRealization")][QtModeling::OppositeEndRole] = QStringLiteral("InterfaceRealization-implementingClassifier");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehavioredClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::DocumentationRole] = QStringLiteral("References behavior specifications owned by a classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlBehavioredClassifier")][QStringLiteral("ownedBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlbehaviorexecutionspecification.cpp b/src/uml/qumlbehaviorexecutionspecification.cpp
index 48ccdcbd..8cc4846f 100644
--- a/src/uml/qumlbehaviorexecutionspecification.cpp
+++ b/src/uml/qumlbehaviorexecutionspecification.cpp
@@ -133,14 +133,14 @@ void QUmlBehaviorExecutionSpecification::setBehavior(QUmlBehavior *behavior)
 
 void QUmlBehaviorExecutionSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBehaviorExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::DocumentationRole] = QStringLiteral("Behavior whose execution is occurring.");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlbroadcastsignalaction.cpp b/src/uml/qumlbroadcastsignalaction.cpp
index 6c407b0b..55c83a58 100644
--- a/src/uml/qumlbroadcastsignalaction.cpp
+++ b/src/uml/qumlbroadcastsignalaction.cpp
@@ -156,14 +156,14 @@ void QUmlBroadcastSignalAction::setSignal(QUmlSignal *signal)
 
 void QUmlBroadcastSignalAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlBroadcastSignalAction");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The specification of signal object transmitted to the target objects.");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcallaction.cpp b/src/uml/qumlcallaction.cpp
index 35b47e77..17d8a1c4 100644
--- a/src/uml/qumlcallaction.cpp
+++ b/src/uml/qumlcallaction.cpp
@@ -185,23 +185,23 @@ void QUmlCallAction::removeResult(QUmlOutputPin *result)
 
 void QUmlCallAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isSynchronous")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isSynchronous")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isSynchronous")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isSynchronous")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isSynchronous")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSynchronous")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSynchronous")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins where the results of performing the invocation are placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins where the results of performing the invocation are placed.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCallAction")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlcallbehavioraction.cpp b/src/uml/qumlcallbehavioraction.cpp
index b10de827..7d1b2683 100644
--- a/src/uml/qumlcallbehavioraction.cpp
+++ b/src/uml/qumlcallbehavioraction.cpp
@@ -159,14 +159,14 @@ void QUmlCallBehaviorAction::setBehavior(QUmlBehavior *behavior)
 
 void QUmlCallBehaviorAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallBehaviorAction");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::DocumentationRole] = QStringLiteral("The invoked behavior. It must be capable of accepting and returning control.");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcallevent.cpp b/src/uml/qumlcallevent.cpp
index c07a2c24..fdd964c2 100644
--- a/src/uml/qumlcallevent.cpp
+++ b/src/uml/qumlcallevent.cpp
@@ -122,14 +122,14 @@ void QUmlCallEvent::setOperation(QUmlOperation *operation)
 
 void QUmlCallEvent::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::DocumentationRole] = QStringLiteral("Designates the operation whose invocation raised the call event.");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcalloperationaction.cpp b/src/uml/qumlcalloperationaction.cpp
index f1d322e8..15b18a5c 100644
--- a/src/uml/qumlcalloperationaction.cpp
+++ b/src/uml/qumlcalloperationaction.cpp
@@ -192,23 +192,23 @@ void QUmlCallOperationAction::setTarget(QUmlInputPin *target)
 
 void QUmlCallOperationAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallOperationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::DocumentationRole] = QStringLiteral("The operation to be invoked by the action execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCallOperationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlchangeevent.cpp b/src/uml/qumlchangeevent.cpp
index 56dc884c..83b2d5c4 100644
--- a/src/uml/qumlchangeevent.cpp
+++ b/src/uml/qumlchangeevent.cpp
@@ -131,14 +131,14 @@ void QUmlChangeEvent::setChangeExpression(QUmlValueSpecification *changeExpressi
 
 void QUmlChangeEvent::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("changeExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("changeExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlChangeEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("changeExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("changeExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("changeExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("changeExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("changeExpression")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlclass.cpp b/src/uml/qumlclass.cpp
index 6f0d9d4a..128724fb 100644
--- a/src/uml/qumlclass.cpp
+++ b/src/uml/qumlclass.cpp
@@ -490,77 +490,77 @@ QSet<QUmlNamedElement *> QUmlClass::inherit(QSet<QUmlNamedElement *> inhs) const
 
 void QUmlClass::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][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("extension")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::OppositeEndRole] = QStringLiteral("Extension-metaclass");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isAbstract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Classifier-isAbstract");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isActive")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isActive")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("isActive")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isActive")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isActive")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isActive")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isActive")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References all the Classifiers that are defined (nested) within the Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes (i.e. the properties) owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredClassifier-ownedAttribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("Property-class");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The operations owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-class");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::DocumentationRole] = QStringLiteral("Receptions that objects of this class are willing to accept.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::DocumentationRole] = QStringLiteral("This gives the superclasses of a class.");
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Classifier-general");
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("superClass")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][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("extension")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("extension")][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("nestedClassifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References all the Classifiers that are defined (nested) within the Class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("nestedClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes (i.e. the properties) owned by the class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredClassifier-ownedAttribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("Property-class");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The operations owned by the class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-class");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::DocumentationRole] = QStringLiteral("Receptions that objects of this class are willing to accept.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("ownedReception")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClass");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::DocumentationRole] = QStringLiteral("This gives the superclasses of a class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Classifier-general");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClass")][QStringLiteral("superClass")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp
index d9054a69..ca70e4db 100644
--- a/src/uml/qumlclassifier.cpp
+++ b/src/uml/qumlclassifier.cpp
@@ -804,149 +804,149 @@ QSet<QUmlClassifier *> QUmlClassifier::parents() const
 
 void QUmlClassifier::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][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("attribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("attribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::DocumentationRole] = QStringLiteral("References the collaboration uses owned by the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationUse")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][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("feature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("feature")][QtModeling::OppositeEndRole] = QStringLiteral("Feature-featuringClassifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy.");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::OppositeEndRole] = QStringLiteral("Generalization-specific");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::DocumentationRole] = QStringLiteral("Specifies all elements inherited by this classifier from the general classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedMember")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isAbstract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAbstract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isFinalSpecialization")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isFinalSpecialization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("isFinalSpecialization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isFinalSpecialization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isFinalSpecialization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isFinalSpecialization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isFinalSpecialization")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::DocumentationRole] = QStringLiteral("The optional template signature specifying the formal template parameters.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateableElement-ownedTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::OppositeEndRole] = QStringLiteral("RedefinableTemplateSignature-classifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use cases owned by this classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedUseCase")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::DocumentationRole] = QStringLiteral("Designates the GeneralizationSet of which the associated Classifier is a power type.");
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("powertypeExtent")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralizationSet-powertype");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References the Classifiers that are redefined by this Classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::DocumentationRole] = QStringLiteral("References a collaboration use which indicates the collaboration that represents this classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-collaborationUse");
-    QModelingObject::propertyDataHash[QStringLiteral("representation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::DocumentationRole] = QStringLiteral("References the substitutions that are owned by this Classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("substitution")][QtModeling::OppositeEndRole] = QStringLiteral("Substitution-substitutingClassifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The template parameter that exposes this element as a formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("ClassifierTemplateParameter-parameteredElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::DocumentationRole] = QStringLiteral("The set of use cases for which this Classifier is the subject.");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-subject");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][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("attribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("attribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::DocumentationRole] = QStringLiteral("References the collaboration uses owned by the classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("collaborationUse")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][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("feature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("feature")][QtModeling::OppositeEndRole] = QStringLiteral("Feature-featuringClassifier");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("general")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][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("generalization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("generalization")][QtModeling::OppositeEndRole] = QStringLiteral("Generalization-specific");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::DocumentationRole] = QStringLiteral("Specifies all elements inherited by this classifier from the general classifiers.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("inheritedMember")][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("ownedUseCase")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use cases owned by this classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("ownedUseCase")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::DocumentationRole] = QStringLiteral("Designates the GeneralizationSet of which the associated Classifier is a power type.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("powertypeExtent")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralizationSet-powertype");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References the Classifiers that are redefined by this Classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("redefinedClassifier")][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("substitution")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][QtModeling::DocumentationRole] = QStringLiteral("References the substitutions that are owned by this Classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("substitution")][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("useCase")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::DocumentationRole] = QStringLiteral("The set of use cases for which this Classifier is the subject.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifier")][QStringLiteral("useCase")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-subject");
 
 }
 
diff --git a/src/uml/qumlclassifiertemplateparameter.cpp b/src/uml/qumlclassifiertemplateparameter.cpp
index 36a14164..6a0c0e00 100644
--- a/src/uml/qumlclassifiertemplateparameter.cpp
+++ b/src/uml/qumlclassifiertemplateparameter.cpp
@@ -170,32 +170,32 @@ void QUmlClassifierTemplateParameter::setParameteredElement(QUmlClassifier *para
 
 void QUmlClassifierTemplateParameter::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::DocumentationRole] = QStringLiteral("Constrains the required relationship between an actual parameter and the parameteredElement for this formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("allowSubstitutable")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][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("constrainingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The parameterable classifier for this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-templateParameter");
+    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("constrainingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClassifierTemplateParameter");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifier")][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("constrainingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClassifierTemplateParameter")][QStringLiteral("constrainingClassifier")][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/qumlclause.cpp b/src/uml/qumlclause.cpp
index 57162aef..5f2f5219 100644
--- a/src/uml/qumlclause.cpp
+++ b/src/uml/qumlclause.cpp
@@ -266,59 +266,59 @@ void QUmlClause::removeTest(QUmlExecutableNode *test)
 
 void QUmlClause::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][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("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][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("bodyOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("decider")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::DocumentationRole] = QStringLiteral("A set of clauses whose tests must all evaluate false before the current clause can be tested.");
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("predecessorClause")][QtModeling::OppositeEndRole] = QStringLiteral("Clause-successorClause");
-
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::DocumentationRole] = QStringLiteral("A set of clauses which may not be tested unless the current clause tests false.");
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("successorClause")][QtModeling::OppositeEndRole] = QStringLiteral("Clause-predecessorClause");
-
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::DocumentationRole] = QStringLiteral("A nested activity fragment with a designated output pin that specifies the result of the test.");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][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("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][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("bodyOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("bodyOutput")][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("predecessorClause")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClause")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClause")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClause")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClause")][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("predecessorClause")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClause")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("predecessorClause")][QtModeling::OppositeEndRole] = QStringLiteral("Clause-successorClause");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::DocumentationRole] = QStringLiteral("A set of clauses which may not be tested unless the current clause tests false.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("successorClause")][QtModeling::OppositeEndRole] = QStringLiteral("Clause-predecessorClause");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClause");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::DocumentationRole] = QStringLiteral("A nested activity fragment with a designated output pin that specifies the result of the test.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlClause")][QStringLiteral("test")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlclearassociationaction.cpp b/src/uml/qumlclearassociationaction.cpp
index 345aa760..f5a0ce31 100644
--- a/src/uml/qumlclearassociationaction.cpp
+++ b/src/uml/qumlclearassociationaction.cpp
@@ -184,23 +184,23 @@ void QUmlClearAssociationAction::setObject(QUmlInputPin *object)
 
 void QUmlClearAssociationAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClearAssociationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::DocumentationRole] = QStringLiteral("Association to be cleared.");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClearAssociationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlclearstructuralfeatureaction.cpp b/src/uml/qumlclearstructuralfeatureaction.cpp
index 64b3fc44..7aa9e85c 100644
--- a/src/uml/qumlclearstructuralfeatureaction.cpp
+++ b/src/uml/qumlclearstructuralfeatureaction.cpp
@@ -164,14 +164,14 @@ void QUmlClearStructuralFeatureAction::setResult(QUmlOutputPin *result)
 
 void QUmlClearStructuralFeatureAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlClearStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcollaboration.cpp b/src/uml/qumlcollaboration.cpp
index 861c892e..6913038b 100644
--- a/src/uml/qumlcollaboration.cpp
+++ b/src/uml/qumlcollaboration.cpp
@@ -198,14 +198,14 @@ void QUmlCollaboration::removeCollaborationRole(QUmlConnectableElement *collabor
 
 void QUmlCollaboration::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaboration");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::DocumentationRole] = QStringLiteral("References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration.");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("StructuredClassifier-role");
-    QModelingObject::propertyDataHash[QStringLiteral("collaborationRole")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaboration");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][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("collaborationRole")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("StructuredClassifier-role");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaboration")][QStringLiteral("collaborationRole")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp
index c40879ea..06aa93d8 100644
--- a/src/uml/qumlcollaborationuse.cpp
+++ b/src/uml/qumlcollaborationuse.cpp
@@ -157,23 +157,23 @@ void QUmlCollaborationUse::setType(QUmlCollaboration *type)
 
 void QUmlCollaborationUse::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaborationUse");
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][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("roleBinding")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("roleBinding")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaborationUse");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCollaborationUse");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][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("roleBinding")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCollaborationUse")][QStringLiteral("roleBinding")][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/qumlcombinedfragment.cpp b/src/uml/qumlcombinedfragment.cpp
index 62962d03..c087decc 100644
--- a/src/uml/qumlcombinedfragment.cpp
+++ b/src/uml/qumlcombinedfragment.cpp
@@ -208,32 +208,32 @@ void QUmlCombinedFragment::removeOperand(QUmlInteractionOperand *operand)
 
 void QUmlCombinedFragment::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the gates that form the interface between this CombinedFragment and its surroundings");
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("cfragmentGate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the operation which defines the semantics of this combination of InteractionFragments.");
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interactionOperator")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::DocumentationRole] = QStringLiteral("The set of operands of the combined fragment.");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the gates that form the interface between this CombinedFragment and its surroundings");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("cfragmentGate")][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("operand")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCombinedFragment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::DocumentationRole] = QStringLiteral("The set of operands of the combined fragment.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlCombinedFragment")][QStringLiteral("operand")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp
index 880b4a4e..11013e2b 100644
--- a/src/uml/qumlcomment.cpp
+++ b/src/uml/qumlcomment.cpp
@@ -131,23 +131,23 @@ void QUmlComment::setBody(QString body)
 
 void QUmlComment::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComment");
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::DocumentationRole] = QStringLiteral("References the Element(s) being commented.");
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("annotatedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComment");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a string that is the comment.");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::DocumentationRole] = QStringLiteral("References the Element(s) being commented.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComment")][QStringLiteral("annotatedElement")][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/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp
index ef87eddd..cbc594dd 100644
--- a/src/uml/qumlcomponent.cpp
+++ b/src/uml/qumlcomponent.cpp
@@ -385,50 +385,50 @@ QSet<QUmlInterface *> QUmlComponent::usedInterfaces(QUmlClassifier *classifier)
 
 void QUmlComponent::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isIndirectlyInstantiated")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isIndirectlyInstantiated")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("isIndirectlyInstantiated")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isIndirectlyInstantiated")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isIndirectlyInstantiated")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isIndirectlyInstantiated")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isIndirectlyInstantiated")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][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("packagedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("provided")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][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("realization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_supplier_supplierDependency-supplierDependency Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::OppositeEndRole] = QStringLiteral("ComponentRealization-abstraction");
-
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("required")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("packagedElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElement")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElement")][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("packagedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("packagedElement")][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("realization")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponent");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realization")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realization")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realization")][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("realization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_supplier_supplierDependency-supplierDependency Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponent")][QStringLiteral("realization")][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/qumlcomponentrealization.cpp b/src/uml/qumlcomponentrealization.cpp
index 5d1dddbe..3aac15bd 100644
--- a/src/uml/qumlcomponentrealization.cpp
+++ b/src/uml/qumlcomponentrealization.cpp
@@ -178,23 +178,23 @@ void QUmlComponentRealization::removeRealizingClassifier(QUmlClassifier *realizi
 
 void QUmlComponentRealization::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponentRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::DocumentationRole] = QStringLiteral("The Component that owns this ComponentRealization and which is implemented by its realizing classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("abstraction")][QtModeling::OppositeEndRole] = QStringLiteral("Component-realization");
-
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponentRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifiers that are involved in the implementation of the Component that owns this Realization.");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("realizingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlComponentRealization");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifiers that are involved in the implementation of the Component that owns this Realization.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-client");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlComponentRealization")][QStringLiteral("realizingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp
index 89184d25..87d067c0 100644
--- a/src/uml/qumlconditionalnode.cpp
+++ b/src/uml/qumlconditionalnode.cpp
@@ -267,41 +267,41 @@ void QUmlConditionalNode::removeResult(QUmlOutputPin *result)
 
 void QUmlConditionalNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::DocumentationRole] = QStringLiteral("Set of clauses composing the conditional.");
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("clause")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::DocumentationRole] = QStringLiteral("If true, the modeler asserts that at least one test will succeed.");
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isAssured")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::DocumentationRole] = QStringLiteral("If true, the modeler asserts that at most one test will succeed.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDeterminate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that constitute the data flow outputs of the conditional.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeOutput");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::DocumentationRole] = QStringLiteral("Set of clauses composing the conditional.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("clause")][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("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConditionalNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that constitute the data flow outputs of the conditional.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeOutput");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConditionalNode")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp
index 97ef5822..c88d4074 100644
--- a/src/uml/qumlconnectableelement.cpp
+++ b/src/uml/qumlconnectableelement.cpp
@@ -161,23 +161,23 @@ void QUmlConnectableElement::setTemplateParameter(QUmlConnectableElementTemplate
 
 void QUmlConnectableElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::DocumentationRole] = QStringLiteral("Denotes a set of connector ends that attaches to this connectable element.");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectorEnd-role");
-
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The ConnectableElementTemplateParameter for this ConnectableElement parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectableElementTemplateParameter-parameteredElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::DocumentationRole] = QStringLiteral("Denotes a set of connector ends that attaches to this connectable element.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectableElement")][QStringLiteral("end")][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/qumlconnectableelementtemplateparameter.cpp b/src/uml/qumlconnectableelementtemplateparameter.cpp
index b22239be..796688c8 100644
--- a/src/uml/qumlconnectableelementtemplateparameter.cpp
+++ b/src/uml/qumlconnectableelementtemplateparameter.cpp
@@ -116,14 +116,14 @@ void QUmlConnectableElementTemplateParameter::setParameteredElement(QUmlConnecta
 
 void QUmlConnectableElementTemplateParameter::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectableElementTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The ConnectableElement for this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectableElement-templateParameter");
+    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/qumlconnectionpointreference.cpp b/src/uml/qumlconnectionpointreference.cpp
index 3ad9a03c..f99bdd51 100644
--- a/src/uml/qumlconnectionpointreference.cpp
+++ b/src/uml/qumlconnectionpointreference.cpp
@@ -191,32 +191,32 @@ void QUmlConnectionPointReference::setState(QUmlState *state)
 
 void QUmlConnectionPointReference::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::DocumentationRole] = QStringLiteral("The entryPoint kind pseudo states corresponding to this connection point.");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::DocumentationRole] = QStringLiteral("The exitPoints kind pseudo states corresponding to this connection point.");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::DocumentationRole] = QStringLiteral("The State in which the connection point refreshens are defined.");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::OppositeEndRole] = QStringLiteral("State-connection");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::DocumentationRole] = QStringLiteral("The entryPoint kind pseudo states corresponding to this connection point.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("entry")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectionPointReference");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::DocumentationRole] = QStringLiteral("The exitPoints kind pseudo states corresponding to this connection point.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnectionPointReference")][QStringLiteral("exit")][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/qumlconnector.cpp b/src/uml/qumlconnector.cpp
index 71f2391b..09ce188f 100644
--- a/src/uml/qumlconnector.cpp
+++ b/src/uml/qumlconnector.cpp
@@ -257,50 +257,50 @@ void QUmlConnector::setType(QUmlAssociation *type)
 
 void QUmlConnector::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::DocumentationRole] = QStringLiteral("The set of Behaviors that specify the valid interaction patterns across the connector.");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][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("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("kind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][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("redefinedConnector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedConnector")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("An optional association that specifies the link corresponding to this connector.");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::DocumentationRole] = QStringLiteral("The set of Behaviors that specify the valid interaction patterns across the connector.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("contract")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][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("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("end")][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("redefinedConnector")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnector");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnector")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnector")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnector")][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("redefinedConnector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConnector")][QStringLiteral("redefinedConnector")][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/qumlconnectorend.cpp b/src/uml/qumlconnectorend.cpp
index 01c1039f..bc138482 100644
--- a/src/uml/qumlconnectorend.cpp
+++ b/src/uml/qumlconnectorend.cpp
@@ -162,32 +162,32 @@ void QUmlConnectorEnd::setRole(QUmlConnectableElement *role)
 
 void QUmlConnectorEnd::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("definingEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("definingEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectorEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("definingEnd")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("definingEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("definingEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("definingEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("definingEnd")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("partWithPort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("partWithPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectorEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("partWithPort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("partWithPort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("partWithPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("partWithPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("partWithPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConnectorEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("role")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectableElement-end");
+    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/qumlconsiderignorefragment.cpp b/src/uml/qumlconsiderignorefragment.cpp
index 346c85c4..d1d32216 100644
--- a/src/uml/qumlconsiderignorefragment.cpp
+++ b/src/uml/qumlconsiderignorefragment.cpp
@@ -142,14 +142,14 @@ void QUmlConsiderIgnoreFragment::removeMessage(QUmlNamedElement *message)
 
 void QUmlConsiderIgnoreFragment::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConsiderIgnoreFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::DocumentationRole] = QStringLiteral("The set of messages that apply to this fragment");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConsiderIgnoreFragment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::DocumentationRole] = QStringLiteral("The set of messages that apply to this fragment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConsiderIgnoreFragment")][QStringLiteral("message")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlconstraint.cpp b/src/uml/qumlconstraint.cpp
index 09b11c97..1df7f316 100644
--- a/src/uml/qumlconstraint.cpp
+++ b/src/uml/qumlconstraint.cpp
@@ -192,32 +192,32 @@ void QUmlConstraint::setSpecification(QUmlValueSpecification *specification)
 
 void QUmlConstraint::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of Elements referenced by this Constraint.");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("constrainedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the namespace that owns the NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("context")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-ownedRule");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlConstraint");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of Elements referenced by this Constraint.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlConstraint")][QStringLiteral("constrainedElement")][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/qumlcontinuation.cpp b/src/uml/qumlcontinuation.cpp
index dfe4605b..efc9037d 100644
--- a/src/uml/qumlcontinuation.cpp
+++ b/src/uml/qumlcontinuation.cpp
@@ -125,14 +125,14 @@ void QUmlContinuation::setSetting(bool setting)
 
 void QUmlContinuation::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("setting")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("setting")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlContinuation");
-    QModelingObject::propertyDataHash[QStringLiteral("setting")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("setting")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("setting")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("setting")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("setting")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcreatelinkaction.cpp b/src/uml/qumlcreatelinkaction.cpp
index 22028767..77a1957c 100644
--- a/src/uml/qumlcreatelinkaction.cpp
+++ b/src/uml/qumlcreatelinkaction.cpp
@@ -166,14 +166,14 @@ void QUmlCreateLinkAction::removeEndData(QUmlLinkEndCreationData *endData)
 
 void QUmlCreateLinkAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::DocumentationRole] = QStringLiteral("Specifies ends of association and inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("LinkAction-endData");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcreatelinkobjectaction.cpp b/src/uml/qumlcreatelinkobjectaction.cpp
index 6b293510..58247cc3 100644
--- a/src/uml/qumlcreatelinkobjectaction.cpp
+++ b/src/uml/qumlcreatelinkobjectaction.cpp
@@ -167,14 +167,14 @@ void QUmlCreateLinkObjectAction::setResult(QUmlOutputPin *result)
 
 void QUmlCreateLinkObjectAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateLinkObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlcreateobjectaction.cpp b/src/uml/qumlcreateobjectaction.cpp
index 7f6978a0..3857aabe 100644
--- a/src/uml/qumlcreateobjectaction.cpp
+++ b/src/uml/qumlcreateobjectaction.cpp
@@ -183,23 +183,23 @@ void QUmlCreateObjectAction::setResult(QUmlOutputPin *result)
 
 void QUmlCreateObjectAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("Classifier to be instantiated.");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlCreateObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumldatatype.cpp b/src/uml/qumldatatype.cpp
index c0f2d238..9c66bba9 100644
--- a/src/uml/qumldatatype.cpp
+++ b/src/uml/qumldatatype.cpp
@@ -266,23 +266,23 @@ QSet<QUmlNamedElement *> QUmlDataType::inherit(QSet<QUmlNamedElement *> inhs) co
 
 void QUmlDataType::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDataType");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The Attributes owned by the DataType.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("Property-datatype");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDataType");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The Operations owned by the DataType.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-datatype");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDataType");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The Attributes owned by the DataType.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("Property-datatype");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDataType");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The Operations owned by the DataType.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDataType")][QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-datatype");
 
 }
 
diff --git a/src/uml/qumldecisionnode.cpp b/src/uml/qumldecisionnode.cpp
index 8bb2ecc5..1522efa0 100644
--- a/src/uml/qumldecisionnode.cpp
+++ b/src/uml/qumldecisionnode.cpp
@@ -165,23 +165,23 @@ void QUmlDecisionNode::setDecisionInputFlow(QUmlObjectFlow *decisionInputFlow)
 
 void QUmlDecisionNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDecisionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::DocumentationRole] = QStringLiteral("Provides input to guard specifications on edges outgoing from the decision node.");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDecisionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::DocumentationRole] = QStringLiteral("An additional edge incoming to the decision node that provides a decision input value.");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decisionInputFlow")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumldependency.cpp b/src/uml/qumldependency.cpp
index 4917af6f..ae0d2259 100644
--- a/src/uml/qumldependency.cpp
+++ b/src/uml/qumldependency.cpp
@@ -182,23 +182,23 @@ void QUmlDependency::removeSupplier(QUmlNamedElement *supplier)
 
 void QUmlDependency::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("client")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("client")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("client")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("client")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("client")][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("client")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("client")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("client")][QtModeling::OppositeEndRole] = QStringLiteral("NamedElement-clientDependency");
-
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][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("supplier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("supplier")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDependency");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][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("client")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("client")][QtModeling::OppositeEndRole] = QStringLiteral("NamedElement-clientDependency");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDependency");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][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("supplier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDependency")][QStringLiteral("supplier")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp
index 12856aed..4ffadc70 100644
--- a/src/uml/qumldeployment.cpp
+++ b/src/uml/qumldeployment.cpp
@@ -227,32 +227,32 @@ void QUmlDeployment::setLocation(QUmlDeploymentTarget *location)
 
 void QUmlDeployment::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::DocumentationRole] = QStringLiteral("The specification of properties that parameterize the deployment and execution of one or more Artifacts.");
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("configuration")][QtModeling::OppositeEndRole] = QStringLiteral("DeploymentSpecification-deployment");
-
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::DocumentationRole] = QStringLiteral("The Artifacts that are deployed onto a Node. This association specializes the supplier association.");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedArtifact")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::DocumentationRole] = QStringLiteral("The DeployedTarget which is the target of a Deployment.");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::OppositeEndRole] = QStringLiteral("DeploymentTarget-deployment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::DocumentationRole] = QStringLiteral("The specification of properties that parameterize the deployment and execution of one or more Artifacts.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("configuration")][QtModeling::OppositeEndRole] = QStringLiteral("DeploymentSpecification-deployment");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeployment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::DocumentationRole] = QStringLiteral("The Artifacts that are deployed onto a Node. This association specializes the supplier association.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeployment")][QStringLiteral("deployedArtifact")][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/qumldeploymentspecification.cpp b/src/uml/qumldeploymentspecification.cpp
index ae0886a2..cc87be3e 100644
--- a/src/uml/qumldeploymentspecification.cpp
+++ b/src/uml/qumldeploymentspecification.cpp
@@ -229,32 +229,32 @@ void QUmlDeploymentSpecification::setExecutionLocation(QString executionLocation
 
 void QUmlDeploymentSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::DocumentationRole] = QStringLiteral("The deployment with which the DeploymentSpecification is associated.");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::OppositeEndRole] = QStringLiteral("Deployment-configuration");
+    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("deploymentLocation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("deploymentLocation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("deploymentLocation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deploymentLocation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("deploymentLocation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deploymentLocation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deploymentLocation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("executionLocation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][QtModeling::DocumentationRole] = QStringLiteral("The location where a component Artifact executes. This may be a local or remote location.");
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("executionLocation")][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/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp
index d9685ce1..353e26a9 100644
--- a/src/uml/qumldeploymenttarget.cpp
+++ b/src/uml/qumldeploymenttarget.cpp
@@ -173,23 +173,23 @@ void QUmlDeploymentTarget::removeDeployment(QUmlDeployment *deployment)
 
 void QUmlDeploymentTarget::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentTarget");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::DocumentationRole] = QStringLiteral("The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget.");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deployedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentTarget");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::DocumentationRole] = QStringLiteral("The set of Deployments for a DeploymentTarget.");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
-    QModelingObject::propertyDataHash[QStringLiteral("deployment")][QtModeling::OppositeEndRole] = QStringLiteral("Deployment-location");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentTarget");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][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("deployedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDeploymentTarget");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::DocumentationRole] = QStringLiteral("The set of Deployments for a DeploymentTarget.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement NamedElement-clientDependency");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDeploymentTarget")][QStringLiteral("deployment")][QtModeling::OppositeEndRole] = QStringLiteral("Deployment-location");
 
 }
 
diff --git a/src/uml/qumldestroylinkaction.cpp b/src/uml/qumldestroylinkaction.cpp
index cf86deae..2399c563 100644
--- a/src/uml/qumldestroylinkaction.cpp
+++ b/src/uml/qumldestroylinkaction.cpp
@@ -166,14 +166,14 @@ void QUmlDestroyLinkAction::removeEndData(QUmlLinkEndDestructionData *endData)
 
 void QUmlDestroyLinkAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::DocumentationRole] = QStringLiteral("Specifies ends of association and inputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("LinkAction-endData");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumldestroyobjectaction.cpp b/src/uml/qumldestroyobjectaction.cpp
index 1cb496b9..d6359f24 100644
--- a/src/uml/qumldestroyobjectaction.cpp
+++ b/src/uml/qumldestroyobjectaction.cpp
@@ -203,32 +203,32 @@ void QUmlDestroyObjectAction::setTarget(QUmlInputPin *target)
 
 void QUmlDestroyObjectAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether links in which the object participates are destroyed along with the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyLinks")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether objects owned by the object are destroyed along with the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyOwnedObjects")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDestroyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The input pin providing the object to be destroyed.");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumldirectedrelationship.cpp b/src/uml/qumldirectedrelationship.cpp
index 4534f171..22e87fb9 100644
--- a/src/uml/qumldirectedrelationship.cpp
+++ b/src/uml/qumldirectedrelationship.cpp
@@ -143,23 +143,23 @@ void QUmlDirectedRelationship::removeTarget(QUmlElement *target)
 
 void QUmlDirectedRelationship::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDirectedRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the sources of the DirectedRelationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDirectedRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the targets of the DirectedRelationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDirectedRelationship");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the sources of the DirectedRelationship.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("source")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDirectedRelationship");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the targets of the DirectedRelationship.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Relationship-relatedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDirectedRelationship")][QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp
index e6dfc3cc..a23a16c1 100644
--- a/src/uml/qumlduration.cpp
+++ b/src/uml/qumlduration.cpp
@@ -167,23 +167,23 @@ void QUmlDuration::removeObservation(QUmlObservation *observation)
 
 void QUmlDuration::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDuration");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::DocumentationRole] = QStringLiteral("The value of the Duration.");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDuration");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the time and duration observations that are involved in expr.");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("observation")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDuration");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the time and duration observations that are involved in expr.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlDuration")][QStringLiteral("observation")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumldurationconstraint.cpp b/src/uml/qumldurationconstraint.cpp
index 829a19a8..2b3caf9f 100644
--- a/src/uml/qumldurationconstraint.cpp
+++ b/src/uml/qumldurationconstraint.cpp
@@ -150,23 +150,23 @@ void QUmlDurationConstraint::setSpecification(QUmlDurationInterval *specificatio
 
 void QUmlDurationConstraint::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("The interval constraining the duration.");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("IntervalConstraint-specification");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumldurationinterval.cpp b/src/uml/qumldurationinterval.cpp
index e9f3bd32..06ad8497 100644
--- a/src/uml/qumldurationinterval.cpp
+++ b/src/uml/qumldurationinterval.cpp
@@ -151,23 +151,23 @@ void QUmlDurationInterval::setMin(QUmlDuration *min)
 
 void QUmlDurationInterval::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the Duration denoting the maximum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-max");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the Duration denoting the minimum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-min");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumldurationobservation.cpp b/src/uml/qumldurationobservation.cpp
index 93bae8ae..6ac24c68 100644
--- a/src/uml/qumldurationobservation.cpp
+++ b/src/uml/qumldurationobservation.cpp
@@ -141,23 +141,23 @@ void QUmlDurationObservation::setFirstEvent(bool firstEvent)
 
 void QUmlDurationObservation::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::DocumentationRole] = QStringLiteral("The observation is determined by the entering or exiting of the event element during execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlDurationObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlelement.cpp b/src/uml/qumlelement.cpp
index 896a89a2..4093f428 100644
--- a/src/uml/qumlelement.cpp
+++ b/src/uml/qumlelement.cpp
@@ -184,32 +184,32 @@ bool QUmlElement::mustBeOwned() const
 
 void QUmlElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::DocumentationRole] = QStringLiteral("The Comments owned by this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedComment")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::DocumentationRole] = QStringLiteral("The Elements owned by this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedElement")][QtModeling::OppositeEndRole] = QStringLiteral("Element-owner");
-
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::DocumentationRole] = QStringLiteral("The Element that owns this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("owner")][QtModeling::OppositeEndRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::DocumentationRole] = QStringLiteral("The Comments owned by this element.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedComment")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::DocumentationRole] = QStringLiteral("The Elements owned by this element.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlElement")][QStringLiteral("ownedElement")][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");
 
 }
 
diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp
index 6fba8c05..df378bea 100644
--- a/src/uml/qumlelementimport.cpp
+++ b/src/uml/qumlelementimport.cpp
@@ -201,41 +201,41 @@ QString QUmlElementImport::getName() const
 
 void QUmlElementImport::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("alias")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("alias")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("alias")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("alias")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("alias")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("alias")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("alias")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the PackageableElement whose name is to be added to a Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("importedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Namespace that imports a PackageableElement from another Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-elementImport");
-
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlElementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp
index 37efefbc..f512a9fe 100644
--- a/src/uml/qumlencapsulatedclassifier.cpp
+++ b/src/uml/qumlencapsulatedclassifier.cpp
@@ -186,14 +186,14 @@ void QUmlEncapsulatedClassifier::removeOwnedPort(QUmlPort *ownedPort)
 
 void QUmlEncapsulatedClassifier::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEncapsulatedClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::DocumentationRole] = QStringLiteral("References a set of ports that an encapsulated classifier owns.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("StructuredClassifier-ownedAttribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEncapsulatedClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::DocumentationRole] = QStringLiteral("References a set of ports that an encapsulated classifier owns.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("StructuredClassifier-ownedAttribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEncapsulatedClassifier")][QStringLiteral("ownedPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlenumeration.cpp b/src/uml/qumlenumeration.cpp
index 108d8519..e56083f6 100644
--- a/src/uml/qumlenumeration.cpp
+++ b/src/uml/qumlenumeration.cpp
@@ -204,14 +204,14 @@ void QUmlEnumeration::removeOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral)
 
 void QUmlEnumeration::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumeration");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of literals for this Enumeration.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedLiteral")][QtModeling::OppositeEndRole] = QStringLiteral("EnumerationLiteral-enumeration");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumeration");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of literals for this Enumeration.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlEnumeration")][QStringLiteral("ownedLiteral")][QtModeling::OppositeEndRole] = QStringLiteral("EnumerationLiteral-enumeration");
 
 }
 
diff --git a/src/uml/qumlenumerationliteral.cpp b/src/uml/qumlenumerationliteral.cpp
index 2980a678..6a629a8c 100644
--- a/src/uml/qumlenumerationliteral.cpp
+++ b/src/uml/qumlenumerationliteral.cpp
@@ -163,23 +163,23 @@ void QUmlEnumerationLiteral::setEnumeration(QUmlEnumeration *enumeration)
 
 void QUmlEnumerationLiteral::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumerationLiteral");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier of this EnumerationLiteral derived to be equal to its enumeration.");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InstanceSpecification-classifier");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlEnumerationLiteral");
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::DocumentationRole] = QStringLiteral("The Enumeration that this EnumerationLiteral is a member of.");
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("enumeration")][QtModeling::OppositeEndRole] = QStringLiteral("Enumeration-ownedLiteral");
+    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/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp
index 135c10e3..40af2f85 100644
--- a/src/uml/qumlexceptionhandler.cpp
+++ b/src/uml/qumlexceptionhandler.cpp
@@ -192,41 +192,41 @@ void QUmlExceptionHandler::setProtectedNode(QUmlExecutableNode *protectedNode)
 
 void QUmlExceptionHandler::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionInput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("exceptionInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][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("exceptionType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exceptionType")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::DocumentationRole] = QStringLiteral("A node that is executed if the handler satisfies an uncaught exception.");
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("handlerBody")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("protectedNode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("protectedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
-    QModelingObject::propertyDataHash[QStringLiteral("protectedNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("protectedNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("protectedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("protectedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("protectedNode")][QtModeling::OppositeEndRole] = QStringLiteral("ExecutableNode-handler");
+    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("exceptionType")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExceptionHandler");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionType")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionType")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionType")][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("exceptionType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExceptionHandler")][QStringLiteral("exceptionType")][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/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp
index ac3e5bea..b921ce25 100644
--- a/src/uml/qumlexecutablenode.cpp
+++ b/src/uml/qumlexecutablenode.cpp
@@ -158,14 +158,14 @@ void QUmlExecutableNode::removeHandler(QUmlExceptionHandler *handler)
 
 void QUmlExecutableNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutableNode");
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][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("handler")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("handler")][QtModeling::OppositeEndRole] = QStringLiteral("ExceptionHandler-protectedNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutableNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][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("handler")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExecutableNode")][QStringLiteral("handler")][QtModeling::OppositeEndRole] = QStringLiteral("ExceptionHandler-protectedNode");
 
 }
 
diff --git a/src/uml/qumlexecutionoccurrencespecification.cpp b/src/uml/qumlexecutionoccurrencespecification.cpp
index a4b0a417..b39da6f5 100644
--- a/src/uml/qumlexecutionoccurrencespecification.cpp
+++ b/src/uml/qumlexecutionoccurrencespecification.cpp
@@ -133,14 +133,14 @@ void QUmlExecutionOccurrenceSpecification::setExecution(QUmlExecutionSpecificati
 
 void QUmlExecutionOccurrenceSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutionOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::DocumentationRole] = QStringLiteral("References the execution specification describing the execution that is started or finished at this execution event.");
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("execution")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlexecutionspecification.cpp b/src/uml/qumlexecutionspecification.cpp
index acf695e9..51f33769 100644
--- a/src/uml/qumlexecutionspecification.cpp
+++ b/src/uml/qumlexecutionspecification.cpp
@@ -143,23 +143,23 @@ void QUmlExecutionSpecification::setStart(QUmlOccurrenceSpecification *start)
 
 void QUmlExecutionSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::DocumentationRole] = QStringLiteral("References the OccurrenceSpecification that designates the finish of the Action or Behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("finish")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExecutionSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::DocumentationRole] = QStringLiteral("References the OccurrenceSpecification that designates the start of the Action or Behavior");
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("start")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlexpansionnode.cpp b/src/uml/qumlexpansionnode.cpp
index a8ef0ab9..4ff61e68 100644
--- a/src/uml/qumlexpansionnode.cpp
+++ b/src/uml/qumlexpansionnode.cpp
@@ -178,23 +178,23 @@ void QUmlExpansionNode::setRegionAsOutput(QUmlExpansionRegion *regionAsOutput)
 
 void QUmlExpansionNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::DocumentationRole] = QStringLiteral("The expansion region for which the node is an input.");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsInput")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionRegion-inputElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionNode");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::DocumentationRole] = QStringLiteral("The expansion region for which the node is an output.");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("regionAsOutput")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionRegion-outputElement");
+    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/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp
index b143de7c..391fd39a 100644
--- a/src/uml/qumlexpansionregion.cpp
+++ b/src/uml/qumlexpansionregion.cpp
@@ -255,32 +255,32 @@ void QUmlExpansionRegion::removeOutputElement(QUmlExpansionNode *outputElement)
 
 void QUmlExpansionRegion::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][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("inputElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inputElement")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionNode-regionAsInput");
-
-    QModelingObject::propertyDataHash[QStringLiteral("mode")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("mode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("mode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("mode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("mode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("mode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("mode")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][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("outputElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outputElement")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionNode-regionAsOutput");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][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("inputElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("inputElement")][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("outputElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpansionRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElement")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElement")][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("outputElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpansionRegion")][QStringLiteral("outputElement")][QtModeling::OppositeEndRole] = QStringLiteral("ExpansionNode-regionAsOutput");
 
 }
 
diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp
index aefce995..89c2b323 100644
--- a/src/uml/qumlexpression.cpp
+++ b/src/uml/qumlexpression.cpp
@@ -162,23 +162,23 @@ void QUmlExpression::setSymbol(QString symbol)
 
 void QUmlExpression::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a sequence of operands.");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("operand")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::DocumentationRole] = QStringLiteral("The symbol associated with the node in the expression tree.");
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("symbol")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExpression");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a sequence of operands.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExpression")][QStringLiteral("operand")][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/qumlextend.cpp b/src/uml/qumlextend.cpp
index aa12c608..49b17a45 100644
--- a/src/uml/qumlextend.cpp
+++ b/src/uml/qumlextend.cpp
@@ -224,41 +224,41 @@ void QUmlExtend::removeExtensionLocation(QUmlExtensionPoint *extensionLocation)
 
 void QUmlExtend::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("condition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that is being extended.");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedCase")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that represents the extension and owns the extend relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("extension")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-extend");
-
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][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("extensionLocation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionLocation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("extensionLocation")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtend");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocation")][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("extensionLocation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlExtend")][QStringLiteral("extensionLocation")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlextension.cpp b/src/uml/qumlextension.cpp
index 6379f971..488bfb23 100644
--- a/src/uml/qumlextension.cpp
+++ b/src/uml/qumlextension.cpp
@@ -239,32 +239,32 @@ QUmlProperty *QUmlExtension::metaclassEnd() const
 
 void QUmlExtension::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isRequired")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isRequired")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtension");
-    QModelingObject::propertyDataHash[QStringLiteral("isRequired")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isRequired")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isRequired")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRequired")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRequired")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("metaclass")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclass")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtension");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclass")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("metaclass")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("metaclass")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclass")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclass")][QtModeling::OppositeEndRole] = QStringLiteral("Class-extension");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtension");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::DocumentationRole] = QStringLiteral("References the end of the extension that is typed by a Stereotype.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Association-ownedEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedEnd")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlextensionend.cpp b/src/uml/qumlextensionend.cpp
index 6a82b2c4..c49b5b7d 100644
--- a/src/uml/qumlextensionend.cpp
+++ b/src/uml/qumlextensionend.cpp
@@ -208,23 +208,23 @@ int QUmlExtensionEnd::lowerBound() const
 
 void QUmlExtensionEnd::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtensionEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("lower")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("MultiplicityElement-lower");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtensionEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TypedElement-type");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlextensionpoint.cpp b/src/uml/qumlextensionpoint.cpp
index 656a389a..84514bf7 100644
--- a/src/uml/qumlextensionpoint.cpp
+++ b/src/uml/qumlextensionpoint.cpp
@@ -124,14 +124,14 @@ void QUmlExtensionPoint::setUseCase(QUmlUseCase *useCase)
 
 void QUmlExtensionPoint::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlExtensionPoint");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that owns this extension point.");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("useCase")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-extensionPoint");
+    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/qumlfeature.cpp b/src/uml/qumlfeature.cpp
index 81ced58b..4a821718 100644
--- a/src/uml/qumlfeature.cpp
+++ b/src/uml/qumlfeature.cpp
@@ -147,23 +147,23 @@ void QUmlFeature::setStatic(bool isStatic)
 
 void QUmlFeature::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::DocumentationRole] = QStringLiteral("The Classifiers that have this Feature as a feature.");
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("featuringClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-feature");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isStatic")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isStatic")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("isStatic")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isStatic")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isStatic")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isStatic")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isStatic")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlFeature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::DocumentationRole] = QStringLiteral("The Classifiers that have this Feature as a feature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlFeature")][QStringLiteral("featuringClassifier")][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/qumlgeneralization.cpp b/src/uml/qumlgeneralization.cpp
index 228ae985..78784cf5 100644
--- a/src/uml/qumlgeneralization.cpp
+++ b/src/uml/qumlgeneralization.cpp
@@ -211,41 +211,41 @@ void QUmlGeneralization::setSpecific(QUmlClassifier *specific)
 
 void QUmlGeneralization::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::DocumentationRole] = QStringLiteral("References the general classifier in the Generalization relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("general")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::DocumentationRole] = QStringLiteral("Designates a set in which instances of Generalization is considered members.");
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalizationSet")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralizationSet-generalization");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isSubstitutable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubstitutable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubstitutable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isSubstitutable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isSubstitutable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubstitutable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubstitutable")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::DocumentationRole] = QStringLiteral("References the specializing classifier in the Generalization relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("specific")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-generalization");
+    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("generalizationSet")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralization");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][QtModeling::DocumentationRole] = QStringLiteral("Designates a set in which instances of Generalization is considered members.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralization")][QStringLiteral("generalizationSet")][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/qumlgeneralizationset.cpp b/src/uml/qumlgeneralizationset.cpp
index 1a8d85fe..a47fff92 100644
--- a/src/uml/qumlgeneralizationset.cpp
+++ b/src/uml/qumlgeneralizationset.cpp
@@ -209,41 +209,41 @@ void QUmlGeneralizationSet::setPowertype(QUmlClassifier *powertype)
 
 void QUmlGeneralizationSet::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::DocumentationRole] = QStringLiteral("Designates the instances of Generalization which are members of a given GeneralizationSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalization")][QtModeling::OppositeEndRole] = QStringLiteral("Generalization-generalizationSet");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isCovering")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isCovering")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("isCovering")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isCovering")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isCovering")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isCovering")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isCovering")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDisjoint")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDisjoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("isDisjoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDisjoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isDisjoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDisjoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDisjoint")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::DocumentationRole] = QStringLiteral("Designates the Classifier that is defined as the power type for the associated GeneralizationSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("powertype")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-powertypeExtent");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralizationSet");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::DocumentationRole] = QStringLiteral("Designates the instances of Generalization which are members of a given GeneralizationSet.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlGeneralizationSet")][QStringLiteral("generalization")][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/qumlgeneralordering.cpp b/src/uml/qumlgeneralordering.cpp
index 440a607c..82af7c45 100644
--- a/src/uml/qumlgeneralordering.cpp
+++ b/src/uml/qumlgeneralordering.cpp
@@ -140,23 +140,23 @@ void QUmlGeneralOrdering::setBefore(QUmlOccurrenceSpecification *before)
 
 void QUmlGeneralOrdering::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralOrdering");
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::DocumentationRole] = QStringLiteral("The OccurrenceSpecification referenced comes after the OccurrenceSpecification referenced by before.");
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("after")][QtModeling::OppositeEndRole] = QStringLiteral("OccurrenceSpecification-toBefore");
-
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlGeneralOrdering");
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::DocumentationRole] = QStringLiteral("The OccurrenceSpecification referenced comes before the OccurrenceSpecification referenced by after.");
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("before")][QtModeling::OppositeEndRole] = QStringLiteral("OccurrenceSpecification-toAfter");
+    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/qumlimage.cpp b/src/uml/qumlimage.cpp
index 6ebf388e..0df2488e 100644
--- a/src/uml/qumlimage.cpp
+++ b/src/uml/qumlimage.cpp
@@ -140,32 +140,32 @@ void QUmlImage::setLocation(QString location)
 
 void QUmlImage::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("content")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("content")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlImage");
-    QModelingObject::propertyDataHash[QStringLiteral("content")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("content")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("content")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("content")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("content")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("format")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("format")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlImage");
-    QModelingObject::propertyDataHash[QStringLiteral("format")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("format")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("format")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("format")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("format")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlImage");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("location")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("location")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlinclude.cpp b/src/uml/qumlinclude.cpp
index 7e32e112..7bccca9b 100644
--- a/src/uml/qumlinclude.cpp
+++ b/src/uml/qumlinclude.cpp
@@ -157,23 +157,23 @@ void QUmlInclude::setIncludingCase(QUmlUseCase *includingCase)
 
 void QUmlInclude::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInclude");
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::DocumentationRole] = QStringLiteral("References the use case that is to be included.");
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("addition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInclude");
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::DocumentationRole] = QStringLiteral("References the use case which will include the addition and owns the include relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("includingCase")][QtModeling::OppositeEndRole] = QStringLiteral("UseCase-include");
+    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/qumlinformationflow.cpp b/src/uml/qumlinformationflow.cpp
index 792f4a33..7b70616f 100644
--- a/src/uml/qumlinformationflow.cpp
+++ b/src/uml/qumlinformationflow.cpp
@@ -338,68 +338,68 @@ void QUmlInformationFlow::removeRealizingMessage(QUmlMessage *realizingMessage)
 
 void QUmlInformationFlow::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the information items that may circulate on this information flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("conveyed")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::DocumentationRole] = QStringLiteral("Defines from which source the conveyed InformationItems are initiated.");
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("informationSource")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::DocumentationRole] = QStringLiteral("Defines to which target the conveyed InformationItems are directed.");
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("informationTarget")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Relationship will realize the specified flow");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realization")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::DocumentationRole] = QStringLiteral("Determines which ActivityEdges will realize the specified flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingActivityEdge")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Connectors will realize the specified flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingConnector")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Messages will realize the specified flow.");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("realizingMessage")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("informationSource")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::DocumentationRole] = QStringLiteral("Defines from which source the conveyed InformationItems are initiated.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-source");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationSource")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::DocumentationRole] = QStringLiteral("Defines to which target the conveyed InformationItems are directed.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("informationTarget")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Relationship will realize the specified flow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realization")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::DocumentationRole] = QStringLiteral("Determines which ActivityEdges will realize the specified flow.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingActivityEdge")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Connectors will realize the specified flow.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingConnector")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationFlow");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::DocumentationRole] = QStringLiteral("Determines which Messages will realize the specified flow.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInformationFlow")][QStringLiteral("realizingMessage")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp
index 398221c1..9129984d 100644
--- a/src/uml/qumlinformationitem.cpp
+++ b/src/uml/qumlinformationitem.cpp
@@ -178,14 +178,14 @@ void QUmlInformationItem::removeRepresented(QUmlClassifier *represented)
 
 void QUmlInformationItem::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("represented")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("represented")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInformationItem");
-    QModelingObject::propertyDataHash[QStringLiteral("represented")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("represented")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("represented")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("represented")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("represented")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp
index d81fa2a7..e31a6878 100644
--- a/src/uml/qumlinstancespecification.cpp
+++ b/src/uml/qumlinstancespecification.cpp
@@ -220,32 +220,32 @@ void QUmlInstanceSpecification::setSpecification(QUmlValueSpecification *specifi
 
 void QUmlInstanceSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][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("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][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("slot")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("slot")][QtModeling::OppositeEndRole] = QStringLiteral("Slot-owningInstance");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A specification of how to compute, derive, or construct the instance.");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][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("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceSpecification");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][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("slot")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInstanceSpecification")][QStringLiteral("slot")][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/qumlinstancevalue.cpp b/src/uml/qumlinstancevalue.cpp
index adbcb0bd..03b32d14 100644
--- a/src/uml/qumlinstancevalue.cpp
+++ b/src/uml/qumlinstancevalue.cpp
@@ -125,14 +125,14 @@ void QUmlInstanceValue::setInstance(QUmlInstanceSpecification *instance)
 
 void QUmlInstanceValue::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInstanceValue");
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::DocumentationRole] = QStringLiteral("The instance that is the specified value.");
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("instance")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp
index 2ac771dc..5db7671e 100644
--- a/src/uml/qumlinteraction.cpp
+++ b/src/uml/qumlinteraction.cpp
@@ -439,50 +439,50 @@ void QUmlInteraction::removeMessage(QUmlMessage *message)
 
 void QUmlInteraction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::DocumentationRole] = QStringLiteral("Actions owned by the Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("action")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it.");
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("formalGate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of fragments in the Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-enclosingInteraction");
-
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the participants in this Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("lifeline")][QtModeling::OppositeEndRole] = QStringLiteral("Lifeline-interaction");
-
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::DocumentationRole] = QStringLiteral("The Messages contained in this Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::OppositeEndRole] = QStringLiteral("Message-interaction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::DocumentationRole] = QStringLiteral("Actions owned by the Interaction.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("action")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][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("formalGate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("formalGate")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of fragments in the Interaction.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("fragment")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-enclosingInteraction");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the participants in this Interaction.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("lifeline")][QtModeling::OppositeEndRole] = QStringLiteral("Lifeline-interaction");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteraction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::DocumentationRole] = QStringLiteral("The Messages contained in this Interaction.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteraction")][QStringLiteral("message")][QtModeling::OppositeEndRole] = QStringLiteral("Message-interaction");
 
 }
 
diff --git a/src/uml/qumlinteractionconstraint.cpp b/src/uml/qumlinteractionconstraint.cpp
index 2a78d2d6..c5a6fa28 100644
--- a/src/uml/qumlinteractionconstraint.cpp
+++ b/src/uml/qumlinteractionconstraint.cpp
@@ -171,23 +171,23 @@ void QUmlInteractionConstraint::setMinint(QUmlValueSpecification *minint)
 
 void QUmlInteractionConstraint::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::DocumentationRole] = QStringLiteral("The maximum number of iterations of a loop");
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("maxint")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::DocumentationRole] = QStringLiteral("The minimum number of iterations of a loop");
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("minint")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp
index 178bebe9..f8a6ffe1 100644
--- a/src/uml/qumlinteractionfragment.cpp
+++ b/src/uml/qumlinteractionfragment.cpp
@@ -227,41 +227,41 @@ void QUmlInteractionFragment::removeGeneralOrdering(QUmlGeneralOrdering *general
 
 void QUmlInteractionFragment::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::DocumentationRole] = QStringLiteral("References the Lifelines that the InteractionFragment involves.");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::OppositeEndRole] = QStringLiteral("Lifeline-coveredBy");
-
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::DocumentationRole] = QStringLiteral("The Interaction enclosing this InteractionFragment.");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingInteraction")][QtModeling::OppositeEndRole] = QStringLiteral("Interaction-fragment");
-
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::DocumentationRole] = QStringLiteral("The operand enclosing this InteractionFragment (they may nest recursively)");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("enclosingOperand")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionOperand-fragment");
-
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::DocumentationRole] = QStringLiteral("The general ordering relationships contained in this fragment.");
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("generalOrdering")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("generalOrdering")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionFragment");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::DocumentationRole] = QStringLiteral("The general ordering relationships contained in this fragment.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionFragment")][QStringLiteral("generalOrdering")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp
index 19e8c8af..9bf758b1 100644
--- a/src/uml/qumlinteractionoperand.cpp
+++ b/src/uml/qumlinteractionoperand.cpp
@@ -198,23 +198,23 @@ void QUmlInteractionOperand::setGuard(QUmlInteractionConstraint *guard)
 
 void QUmlInteractionOperand::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionOperand");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::DocumentationRole] = QStringLiteral("The fragments of the operand.");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("fragment")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-enclosingOperand");
-
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionOperand");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::DocumentationRole] = QStringLiteral("Constraint of the operand.");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionOperand");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::DocumentationRole] = QStringLiteral("The fragments of the operand.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionOperand")][QStringLiteral("fragment")][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/qumlinteractionuse.cpp b/src/uml/qumlinteractionuse.cpp
index d39a4476..4a0c17be 100644
--- a/src/uml/qumlinteractionuse.cpp
+++ b/src/uml/qumlinteractionuse.cpp
@@ -269,50 +269,50 @@ void QUmlInteractionUse::setReturnValueRecipient(QUmlProperty *returnValueRecipi
 
 void QUmlInteractionUse::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::DocumentationRole] = QStringLiteral("The actual gates of the InteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("actualGate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::DocumentationRole] = QStringLiteral("The actual arguments of the Interaction");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the Interaction that defines its meaning");
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("refersTo")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::DocumentationRole] = QStringLiteral("The value of the executed Interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::DocumentationRole] = QStringLiteral("The recipient of the return value.");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("returnValueRecipient")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::DocumentationRole] = QStringLiteral("The actual gates of the InteractionUse");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("actualGate")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInteractionUse");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::DocumentationRole] = QStringLiteral("The actual arguments of the Interaction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInteractionUse")][QStringLiteral("argument")][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/qumlinterface.cpp b/src/uml/qumlinterface.cpp
index 318fd6ac..748356aa 100644
--- a/src/uml/qumlinterface.cpp
+++ b/src/uml/qumlinterface.cpp
@@ -410,59 +410,59 @@ void QUmlInterface::removeRedefinedInterface(QUmlInterface *redefinedInterface)
 
 void QUmlInterface::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References all the Classifiers that are defined (nested) within the Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes (i.e. the properties) owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("Property-interface");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The operations owned by the class.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-interface");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::DocumentationRole] = QStringLiteral("Receptions that objects providing this interface are willing to accept.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedReception")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("protocol")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::DocumentationRole] = QStringLiteral("References all the Interfaces redefined by this Interface.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-redefinedClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedInterface")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::DocumentationRole] = QStringLiteral("References all the Classifiers that are defined (nested) within the Class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("nestedClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes (i.e. the properties) owned by the class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("Property-interface");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::DocumentationRole] = QStringLiteral("The operations owned by the class.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-interface");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::DocumentationRole] = QStringLiteral("Receptions that objects providing this interface are willing to accept.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("ownedReception")][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("redefinedInterface")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterface");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::DocumentationRole] = QStringLiteral("References all the Interfaces redefined by this Interface.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-redefinedClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterface")][QStringLiteral("redefinedInterface")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlinterfacerealization.cpp b/src/uml/qumlinterfacerealization.cpp
index 43c0408b..696ab76c 100644
--- a/src/uml/qumlinterfacerealization.cpp
+++ b/src/uml/qumlinterfacerealization.cpp
@@ -172,23 +172,23 @@ void QUmlInterfaceRealization::setImplementingClassifier(QUmlBehavioredClassifie
 
 void QUmlInterfaceRealization::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterfaceRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::DocumentationRole] = QStringLiteral("References the Interface specifying the conformance contract.");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("implementingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("implementingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterfaceRealization");
-    QModelingObject::propertyDataHash[QStringLiteral("implementingClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("implementingClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("implementingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("implementingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("implementingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("BehavioredClassifier-interfaceRealization");
+    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/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp
index 1c1ae0be..e6f4fd27 100644
--- a/src/uml/qumlinterruptibleactivityregion.cpp
+++ b/src/uml/qumlinterruptibleactivityregion.cpp
@@ -187,23 +187,23 @@ void QUmlInterruptibleActivityRegion::removeNode(QUmlActivityNode *node)
 
 void QUmlInterruptibleActivityRegion::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterruptibleActivityRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::DocumentationRole] = QStringLiteral("The edges leaving the region that will abort other tokens flowing in the region.");
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interruptingEdge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-interrupts");
-
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterruptibleActivityRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inInterruptibleRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterruptibleActivityRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::DocumentationRole] = QStringLiteral("The edges leaving the region that will abort other tokens flowing in the region.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("interruptingEdge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-interrupts");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterruptibleActivityRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInterruptibleActivityRegion")][QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inInterruptibleRegion");
 
 }
 
diff --git a/src/uml/qumlinterval.cpp b/src/uml/qumlinterval.cpp
index 23edc6e1..9afd3035 100644
--- a/src/uml/qumlinterval.cpp
+++ b/src/uml/qumlinterval.cpp
@@ -149,23 +149,23 @@ void QUmlInterval::setMin(QUmlValueSpecification *min)
 
 void QUmlInterval::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the ValueSpecification denoting the maximum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the ValueSpecification denoting the minimum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlintervalconstraint.cpp b/src/uml/qumlintervalconstraint.cpp
index 7d37da30..fdce5601 100644
--- a/src/uml/qumlintervalconstraint.cpp
+++ b/src/uml/qumlintervalconstraint.cpp
@@ -129,14 +129,14 @@ void QUmlIntervalConstraint::setSpecification(QUmlInterval *specification)
 
 void QUmlIntervalConstraint::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlIntervalConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Constraint-specification");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlinvocationaction.cpp b/src/uml/qumlinvocationaction.cpp
index 74d5d757..c998f913 100644
--- a/src/uml/qumlinvocationaction.cpp
+++ b/src/uml/qumlinvocationaction.cpp
@@ -183,23 +183,23 @@ void QUmlInvocationAction::setOnPort(QUmlPort *onPort)
 
 void QUmlInvocationAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInvocationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::DocumentationRole] = QStringLiteral("Specification of the ordered set of argument values that appears during execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInvocationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::DocumentationRole] = QStringLiteral("A optional port of the receiver object on which the behavioral feature is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("onPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlInvocationAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::DocumentationRole] = QStringLiteral("Specification of the ordered set of argument values that appears during execution.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlInvocationAction")][QStringLiteral("argument")][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/qumljoinnode.cpp b/src/uml/qumljoinnode.cpp
index 6411a609..c73481e1 100644
--- a/src/uml/qumljoinnode.cpp
+++ b/src/uml/qumljoinnode.cpp
@@ -171,23 +171,23 @@ void QUmlJoinNode::setJoinSpec(QUmlValueSpecification *joinSpec)
 
 void QUmlJoinNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlJoinNode");
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether tokens having objects with the same identity are combined into one by the join.");
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isCombineDuplicate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlJoinNode");
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::DocumentationRole] = QStringLiteral("A specification giving the conditions under which the join with emit a token. Default is 'and'.");
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("joinSpec")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumllifeline.cpp b/src/uml/qumllifeline.cpp
index ca55cb91..3ca1bc41 100644
--- a/src/uml/qumllifeline.cpp
+++ b/src/uml/qumllifeline.cpp
@@ -248,50 +248,50 @@ void QUmlLifeline::setSelector(QUmlValueSpecification *selector)
 
 void QUmlLifeline::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::DocumentationRole] = QStringLiteral("References the InteractionFragments in which this Lifeline takes part.");
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("coveredBy")][QtModeling::OppositeEndRole] = QStringLiteral("InteractionFragment-covered");
-
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::DocumentationRole] = QStringLiteral("References the Interaction that represents the decomposition.");
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decomposedAs")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::DocumentationRole] = QStringLiteral("References the Interaction enclosing this Lifeline.");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::OppositeEndRole] = QStringLiteral("Interaction-lifeline");
-
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::DocumentationRole] = QStringLiteral("References the ConnectableElement within the classifier that contains the enclosing interaction.");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("represents")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLifeline");
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::DocumentationRole] = QStringLiteral("If the referenced ConnectableElement is multivalued, then this specifies the specific individual part within that set.");
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("selector")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp
index 5fe35898..63791e7d 100644
--- a/src/uml/qumllinkaction.cpp
+++ b/src/uml/qumllinkaction.cpp
@@ -213,23 +213,23 @@ QUmlAssociation *QUmlLinkAction::association() const
 
 void QUmlLinkAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::DocumentationRole] = QStringLiteral("Data identifying one end of a link by the objects on its ends and qualifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("endData")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::DocumentationRole] = QStringLiteral("Pins taking end objects and qualifier values as input.");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("inputValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::DocumentationRole] = QStringLiteral("Pins taking end objects and qualifier values as input.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkAction")][QStringLiteral("inputValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumllinkendcreationdata.cpp b/src/uml/qumllinkendcreationdata.cpp
index ea4fdb75..5506059b 100644
--- a/src/uml/qumllinkendcreationdata.cpp
+++ b/src/uml/qumllinkendcreationdata.cpp
@@ -136,23 +136,23 @@ void QUmlLinkEndCreationData::setReplaceAll(bool isReplaceAll)
 
 void QUmlLinkEndCreationData::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndCreationData");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("insertAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("insertAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndCreationData");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp
index fef4c823..343d5d81 100644
--- a/src/uml/qumllinkenddata.cpp
+++ b/src/uml/qumllinkenddata.cpp
@@ -172,32 +172,32 @@ void QUmlLinkEndData::setValue(QUmlInputPin *value)
 
 void QUmlLinkEndData::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::DocumentationRole] = QStringLiteral("Association end for which this link-end data specifies values.");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::DocumentationRole] = QStringLiteral("List of qualifier values");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("qualifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndData");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][QtModeling::DocumentationRole] = QStringLiteral("List of qualifier values");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLinkEndData")][QStringLiteral("qualifier")][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/qumllinkenddestructiondata.cpp b/src/uml/qumllinkenddestructiondata.cpp
index 2a84c87b..b54f9cf6 100644
--- a/src/uml/qumllinkenddestructiondata.cpp
+++ b/src/uml/qumllinkenddestructiondata.cpp
@@ -136,23 +136,23 @@ void QUmlLinkEndDestructionData::setDestroyDuplicates(bool isDestroyDuplicates)
 
 void QUmlLinkEndDestructionData::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("destroyAt")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("destroyAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndDestructionData");
-    QModelingObject::propertyDataHash[QStringLiteral("destroyAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("destroyAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("destroyAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("destroyAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("destroyAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLinkEndDestructionData");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether to destroy duplicates of the value in nonunique association ends.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDestroyDuplicates")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlliteralboolean.cpp b/src/uml/qumlliteralboolean.cpp
index 6fad0877..4d4110a4 100644
--- a/src/uml/qumlliteralboolean.cpp
+++ b/src/uml/qumlliteralboolean.cpp
@@ -144,14 +144,14 @@ bool QUmlLiteralBoolean::isComputable() const
 
 void QUmlLiteralBoolean::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralBoolean");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified Boolean value.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlliteralinteger.cpp b/src/uml/qumlliteralinteger.cpp
index f4646f4b..5ce091ee 100644
--- a/src/uml/qumlliteralinteger.cpp
+++ b/src/uml/qumlliteralinteger.cpp
@@ -144,14 +144,14 @@ bool QUmlLiteralInteger::isComputable() const
 
 void QUmlLiteralInteger::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralInteger");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified Integer value.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlliteralreal.cpp b/src/uml/qumlliteralreal.cpp
index 12922aee..83208914 100644
--- a/src/uml/qumlliteralreal.cpp
+++ b/src/uml/qumlliteralreal.cpp
@@ -139,14 +139,14 @@ double QUmlLiteralReal::realValue() const
 
 void QUmlLiteralReal::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralReal");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlliteralstring.cpp b/src/uml/qumlliteralstring.cpp
index f7812114..d789dcab 100644
--- a/src/uml/qumlliteralstring.cpp
+++ b/src/uml/qumlliteralstring.cpp
@@ -142,14 +142,14 @@ QString QUmlLiteralString::stringValue() const
 
 void QUmlLiteralString::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralString");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified String value.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlliteralunlimitednatural.cpp b/src/uml/qumlliteralunlimitednatural.cpp
index 1c3ec85d..d1786727 100644
--- a/src/uml/qumlliteralunlimitednatural.cpp
+++ b/src/uml/qumlliteralunlimitednatural.cpp
@@ -144,14 +144,14 @@ int QUmlLiteralUnlimitedNatural::unlimitedValue() const
 
 void QUmlLiteralUnlimitedNatural::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLiteralUnlimitedNatural");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The specified UnlimitedNatural value.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp
index 579c79a2..4fdcbf88 100644
--- a/src/uml/qumlloopnode.cpp
+++ b/src/uml/qumlloopnode.cpp
@@ -421,86 +421,86 @@ void QUmlLoopNode::removeTest(QUmlExecutableNode *test)
 
 void QUmlLoopNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][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("bodyOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyOutput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][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("bodyPart")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyPart")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("decider")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("decider")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isTestedFirst")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isTestedFirst")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("isTestedFirst")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isTestedFirst")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isTestedFirst")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isTestedFirst")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isTestedFirst")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][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("loopVariable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariable")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][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("loopVariableInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeInput");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("loopVariableInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that constitute the data flow output of the entire loop.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeOutput");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::DocumentationRole] = QStringLiteral("The set of nodes and edges that initialize values or perform other setup computations for the loop.");
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("setupPart")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("test")][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("test")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("test")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][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("bodyOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyOutput")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][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("bodyPart")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("bodyPart")][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("loopVariable")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariable")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariable")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariable")][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("loopVariable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariable")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][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("loopVariableInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeInput");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("loopVariableInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("A list of output pins that constitute the data flow output of the entire loop.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-structuredNodeOutput");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][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("setupPart")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("setupPart")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlLoopNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][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("test")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlLoopNode")][QStringLiteral("test")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlmanifestation.cpp b/src/uml/qumlmanifestation.cpp
index 2d9b1dff..e95af479 100644
--- a/src/uml/qumlmanifestation.cpp
+++ b/src/uml/qumlmanifestation.cpp
@@ -138,14 +138,14 @@ void QUmlManifestation::setUtilizedElement(QUmlPackageableElement *utilizedEleme
 
 void QUmlManifestation::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlManifestation");
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::DocumentationRole] = QStringLiteral("The model element that is utilized in the manifestation in an Artifact.");
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("utilizedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlmessage.cpp b/src/uml/qumlmessage.cpp
index a80f5218..b7b3b64d 100644
--- a/src/uml/qumlmessage.cpp
+++ b/src/uml/qumlmessage.cpp
@@ -307,77 +307,77 @@ void QUmlMessage::setSignature(QUmlNamedElement *signature)
 
 void QUmlMessage::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::DocumentationRole] = QStringLiteral("The arguments of the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("argument")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::DocumentationRole] = QStringLiteral("The Connector on which this Message is sent.");
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("connector")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::DocumentationRole] = QStringLiteral("The enclosing Interaction owning the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("interaction")][QtModeling::OppositeEndRole] = QStringLiteral("Interaction-message");
-
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::DocumentationRole] = QStringLiteral("The derived kind of the Message (complete, lost, found or unknown)");
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("messageKind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::DocumentationRole] = QStringLiteral("The sort of communication reflected by the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("messageSort")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::DocumentationRole] = QStringLiteral("References the Receiving of the Message");
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_message_messageEnd-messageEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("receiveEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::DocumentationRole] = QStringLiteral("References the Sending of the Message.");
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_message_messageEnd-messageEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("sendEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("signature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::DocumentationRole] = QStringLiteral("The arguments of the Message");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlMessage")][QStringLiteral("argument")][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/qumlmessageend.cpp b/src/uml/qumlmessageend.cpp
index 2704f60b..33cd6d15 100644
--- a/src/uml/qumlmessageend.cpp
+++ b/src/uml/qumlmessageend.cpp
@@ -107,14 +107,14 @@ void QUmlMessageEnd::setMessage(QUmlMessage *message)
 
 void QUmlMessageEnd::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMessageEnd");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::DocumentationRole] = QStringLiteral("References a Message.");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("message")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlmodel.cpp b/src/uml/qumlmodel.cpp
index a72a166d..0e7d93e3 100644
--- a/src/uml/qumlmodel.cpp
+++ b/src/uml/qumlmodel.cpp
@@ -148,14 +148,14 @@ void QUmlModel::setViewpoint(QString viewpoint)
 
 void QUmlModel::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("viewpoint")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("viewpoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlModel");
-    QModelingObject::propertyDataHash[QStringLiteral("viewpoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("viewpoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("viewpoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("viewpoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("viewpoint")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp
index 7eadb321..f39a1afa 100644
--- a/src/uml/qumlmultiplicityelement.cpp
+++ b/src/uml/qumlmultiplicityelement.cpp
@@ -307,59 +307,59 @@ int QUmlMultiplicityElement::lowerBound() const
 
 void QUmlMultiplicityElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isOrdered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isUnique")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the lower bound of the multiplicity interval.");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::DocumentationRole] = QStringLiteral("The specification of the lower bound for this multiplicity.");
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("lowerValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the upper bound of the multiplicity interval.");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlMultiplicityElement");
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::DocumentationRole] = QStringLiteral("The specification of the upper bound for this multiplicity.");
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("upperValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp
index 32f01a6a..fd550879 100644
--- a/src/uml/qumlnamedelement.cpp
+++ b/src/uml/qumlnamedelement.cpp
@@ -137,6 +137,7 @@ void QUmlNamedElement::setName(QString name)
 
     if (_name != name) {
         _name = name;
+        asQObject()->setObjectName(name);
     }
 }
 
@@ -299,59 +300,59 @@ QString QUmlNamedElement::separator() const
 
 void QUmlNamedElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the dependencies that reference the client.");
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("clientDependency")][QtModeling::OppositeEndRole] = QStringLiteral("Dependency-client");
-
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::DocumentationRole] = QStringLiteral("The name of the NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("name")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::DocumentationRole] = QStringLiteral("The string expression used to define the name of this named element.");
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("nameExpression")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the namespace that owns the NamedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("namespace")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-ownedMember");
-
-    QModelingObject::propertyDataHash[QStringLiteral("qualifiedName")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifiedName")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifiedName")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifiedName")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("qualifiedName")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifiedName")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifiedName")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::DocumentationRole] = QStringLiteral("Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility.");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the dependencies that reference the client.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamedElement")][QStringLiteral("clientDependency")][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/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp
index ae0f3807..a6e23d9b 100644
--- a/src/uml/qumlnamespace.cpp
+++ b/src/uml/qumlnamespace.cpp
@@ -410,59 +410,59 @@ bool QUmlNamespace::membersAreDistinguishable() const
 
 void QUmlNamespace::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::DocumentationRole] = QStringLiteral("References the ElementImports owned by the Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("elementImport")][QtModeling::OppositeEndRole] = QStringLiteral("ElementImport-importingNamespace");
-
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports.");
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("importedMember")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("member")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("member")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("member")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("member")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("member")][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("member")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("member")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("member")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::DocumentationRole] = QStringLiteral("A collection of NamedElements owned by the Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedMember")][QtModeling::OppositeEndRole] = QStringLiteral("NamedElement-namespace");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a set of Constraints owned by this Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedRule")][QtModeling::OppositeEndRole] = QStringLiteral("Constraint-context");
-
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageImports owned by the Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("packageImport")][QtModeling::OppositeEndRole] = QStringLiteral("PackageImport-importingNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::DocumentationRole] = QStringLiteral("References the ElementImports owned by the Namespace.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("elementImport")][QtModeling::OppositeEndRole] = QStringLiteral("ElementImport-importingNamespace");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][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("importedMember")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("importedMember")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][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("member")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("member")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::DocumentationRole] = QStringLiteral("A collection of NamedElements owned by the Namespace.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedMember")][QtModeling::OppositeEndRole] = QStringLiteral("NamedElement-namespace");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::DocumentationRole] = QStringLiteral("Specifies a set of Constraints owned by this Namespace.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("ownedRule")][QtModeling::OppositeEndRole] = QStringLiteral("Constraint-context");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNamespace");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageImports owned by the Namespace.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNamespace")][QStringLiteral("packageImport")][QtModeling::OppositeEndRole] = QStringLiteral("PackageImport-importingNamespace");
 
 }
 
diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp
index 72f3575b..8488878a 100644
--- a/src/uml/qumlnode.cpp
+++ b/src/uml/qumlnode.cpp
@@ -217,14 +217,14 @@ void QUmlNode::removeNestedNode(QUmlNode *nestedNode)
 
 void QUmlNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNode");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::DocumentationRole] = QStringLiteral("The Nodes that are defined (nested) within the Node.");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedNode")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::DocumentationRole] = QStringLiteral("The Nodes that are defined (nested) within the Node.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlNode")][QStringLiteral("nestedNode")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlobjectflow.cpp b/src/uml/qumlobjectflow.cpp
index 3478a02e..286cd23c 100644
--- a/src/uml/qumlobjectflow.cpp
+++ b/src/uml/qumlobjectflow.cpp
@@ -213,41 +213,41 @@ void QUmlObjectFlow::setTransformation(QUmlBehavior *transformation)
 
 void QUmlObjectFlow::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the objects in the flow are passed by multicasting.");
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isMulticast")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the objects in the flow are gathered from respondents to multicasting.");
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isMultireceive")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::DocumentationRole] = QStringLiteral("Selects tokens from a source object node.");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectFlow");
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::DocumentationRole] = QStringLiteral("Changes or replaces data tokens flowing along edge.");
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("transformation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp
index 30e3b03e..8c7ec98d 100644
--- a/src/uml/qumlobjectnode.cpp
+++ b/src/uml/qumlobjectnode.cpp
@@ -245,50 +245,50 @@ void QUmlObjectNode::setUpperBound(QUmlValueSpecification *upperBound)
 
 void QUmlObjectNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::DocumentationRole] = QStringLiteral("The required states of the object available at this point in the activity.");
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inState")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the type of the object node is to be treated as control.");
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isControlType")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ordering")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("ordering")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("ordering")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ordering")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("ordering")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ordering")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ordering")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::DocumentationRole] = QStringLiteral("Selects tokens for outgoing edges.");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("selection")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("upperBound")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("upperBound")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
-    QModelingObject::propertyDataHash[QStringLiteral("upperBound")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("upperBound")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("upperBound")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("upperBound")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("upperBound")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlObjectNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::DocumentationRole] = QStringLiteral("The required states of the object available at this point in the activity.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlObjectNode")][QStringLiteral("inState")][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/qumloccurrencespecification.cpp b/src/uml/qumloccurrencespecification.cpp
index 7855f6cb..f1653261 100644
--- a/src/uml/qumloccurrencespecification.cpp
+++ b/src/uml/qumloccurrencespecification.cpp
@@ -209,32 +209,32 @@ void QUmlOccurrenceSpecification::removeToBefore(QUmlGeneralOrdering *toBefore)
 
 void QUmlOccurrenceSpecification::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::DocumentationRole] = QStringLiteral("References the Lifeline on which the OccurrenceSpecification appears.");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InteractionFragment-covered");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::DocumentationRole] = QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("toAfter")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralOrdering-before");
-
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::DocumentationRole] = QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification");
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("toBefore")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralOrdering-after");
+    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("toAfter")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::DocumentationRole] = QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toAfter")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralOrdering-before");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOccurrenceSpecification");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::DocumentationRole] = QStringLiteral("References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOccurrenceSpecification")][QStringLiteral("toBefore")][QtModeling::OppositeEndRole] = QStringLiteral("GeneralOrdering-after");
 
 }
 
diff --git a/src/uml/qumlopaqueaction.cpp b/src/uml/qumlopaqueaction.cpp
index 6e3045ce..07dc587f 100644
--- a/src/uml/qumlopaqueaction.cpp
+++ b/src/uml/qumlopaqueaction.cpp
@@ -268,41 +268,41 @@ void QUmlOpaqueAction::removeOutputValue(QUmlOutputPin *outputValue)
 
 void QUmlOpaqueAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the action in one or more languages.");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::DocumentationRole] = QStringLiteral("Provides input to the action.");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("inputValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::DocumentationRole] = QStringLiteral("Languages the body strings use, in the same order as the body strings");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::DocumentationRole] = QStringLiteral("Takes output from the action.");
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("outputValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the action in one or more languages.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::DocumentationRole] = QStringLiteral("Provides input to the action.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("inputValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::DocumentationRole] = QStringLiteral("Languages the body strings use, in the same order as the body strings");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("language")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::DocumentationRole] = QStringLiteral("Takes output from the action.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueAction")][QStringLiteral("outputValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp
index aaa5b0ef..7f7564e3 100644
--- a/src/uml/qumlopaquebehavior.cpp
+++ b/src/uml/qumlopaquebehavior.cpp
@@ -249,23 +249,23 @@ void QUmlOpaqueBehavior::removeLanguage(QString language)
 
 void QUmlOpaqueBehavior::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the behavior in one or more languages.");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the behavior in one or more languages.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::DocumentationRole] = QStringLiteral("Languages the body strings use in the same order as the body strings.");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::DocumentationRole] = QStringLiteral("Languages the body strings use in the same order as the body strings.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueBehavior")][QStringLiteral("language")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp
index eefb773a..b16f8c25 100644
--- a/src/uml/qumlopaqueexpression.cpp
+++ b/src/uml/qumlopaqueexpression.cpp
@@ -252,41 +252,41 @@ int QUmlOpaqueExpression::value() const
 
 void QUmlOpaqueExpression::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the behavior of the opaque expression.");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("behavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("The text of the expression, possibly in multiple languages.");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("language")][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("language")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("language")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("body")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::DocumentationRole] = QStringLiteral("The text of the expression, possibly in multiple languages.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("body")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOpaqueExpression");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][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("language")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOpaqueExpression")][QStringLiteral("language")][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/qumloperation.cpp b/src/uml/qumloperation.cpp
index 8a64b70f..b0394a7c 100644
--- a/src/uml/qumloperation.cpp
+++ b/src/uml/qumloperation.cpp
@@ -659,149 +659,149 @@ QSet<QUmlParameter *> QUmlOperation::returnResult() const
 
 void QUmlOperation::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional Constraint on the result values of an invocation of this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("bodyCondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::DocumentationRole] = QStringLiteral("The class that owns the operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::OppositeEndRole] = QStringLiteral("Class-ownedOperation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::DocumentationRole] = QStringLiteral("The DataType that owns this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::OppositeEndRole] = QStringLiteral("DataType-ownedOperation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::DocumentationRole] = QStringLiteral("The Interface that owns this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::OppositeEndRole] = QStringLiteral("Interface-ownedOperation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isOrdered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isQuery")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isQuery")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("isQuery")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isQuery")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isQuery")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isQuery")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isQuery")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isUnique")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isUnique")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("lower")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("lower")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("BehavioralFeature-ownedParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("Parameter-operation");
-
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying the state of the system when the Operation is completed.");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("postcondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints on the state of the system when the Operation is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("precondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::DocumentationRole] = QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("BehavioralFeature-raisedException");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("raisedException")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::DocumentationRole] = QStringLiteral("References the Operations that are redefined by this Operation.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedOperation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The template parameter that exposes this element as a formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("OperationTemplateParameter-parameteredElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("upper")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("upper")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameter")][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("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("BehavioralFeature-ownedParameter");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("Parameter-operation");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints specifying the state of the system when the Operation is completed.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("postcondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::DocumentationRole] = QStringLiteral("An optional set of Constraints on the state of the system when the Operation is invoked.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("precondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::DocumentationRole] = QStringLiteral("References the Types representing exceptions that may be raised during an invocation of this operation.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("BehavioralFeature-raisedException");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("raisedException")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperation");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::DocumentationRole] = QStringLiteral("References the Operations that are redefined by this Operation.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlOperation")][QStringLiteral("redefinedOperation")][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/qumloperationtemplateparameter.cpp b/src/uml/qumloperationtemplateparameter.cpp
index 22bf7c84..d26062a5 100644
--- a/src/uml/qumloperationtemplateparameter.cpp
+++ b/src/uml/qumloperationtemplateparameter.cpp
@@ -116,14 +116,14 @@ void QUmlOperationTemplateParameter::setParameteredElement(QUmlOperation *parame
 
 void QUmlOperationTemplateParameter::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlOperationTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The operation for this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-templateParameter");
+    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/qumlpackage.cpp b/src/uml/qumlpackage.cpp
index 08365b73..9adba46d 100644
--- a/src/uml/qumlpackage.cpp
+++ b/src/uml/qumlpackage.cpp
@@ -481,77 +481,77 @@ QSet<QUmlPackageableElement *> QUmlPackage::visibleMembers() const
 
 void QUmlPackage::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("URI")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("URI")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("URI")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("URI")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("URI")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("URI")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("URI")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the packaged elements that are Packages.");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("nestedPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-nestingPackage");
-
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the Package that owns this Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_packagedElement_owningPackage-owningPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("nestingPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-nestedPackage");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::DocumentationRole] = QStringLiteral("References the Stereotypes that are owned by the Package");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedStereotype")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::DocumentationRole] = QStringLiteral("References the packaged elements that are Types.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedType")][QtModeling::OppositeEndRole] = QStringLiteral("Type-package");
-
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageMerges that are owned by this Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("packageMerge")][QtModeling::OppositeEndRole] = QStringLiteral("PackageMerge-receivingPackage");
-
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the packageable elements that are owned by this Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("packagedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::DocumentationRole] = QStringLiteral("References the ProfileApplications that indicate which profiles have been applied to the Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("profileApplication")][QtModeling::OppositeEndRole] = QStringLiteral("ProfileApplication-applyingPackage");
+    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("nestedPackage")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the packaged elements that are Packages.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("nestedPackage")][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("ownedStereotype")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::DocumentationRole] = QStringLiteral("References the Stereotypes that are owned by the Package");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedStereotype")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::DocumentationRole] = QStringLiteral("References the packaged elements that are Types.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Package-packagedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("ownedType")][QtModeling::OppositeEndRole] = QStringLiteral("Type-package");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::DocumentationRole] = QStringLiteral("References the PackageMerges that are owned by this Package.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packageMerge")][QtModeling::OppositeEndRole] = QStringLiteral("PackageMerge-receivingPackage");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the packageable elements that are owned by this Package.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("packagedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackage");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::DocumentationRole] = QStringLiteral("References the ProfileApplications that indicate which profiles have been applied to the Package.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPackage")][QStringLiteral("profileApplication")][QtModeling::OppositeEndRole] = QStringLiteral("ProfileApplication-applyingPackage");
 
 }
 
diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp
index b9f71a99..f5e2c5f2 100644
--- a/src/uml/qumlpackageableelement.cpp
+++ b/src/uml/qumlpackageableelement.cpp
@@ -109,14 +109,14 @@ void QUmlPackageableElement::setVisibility(QtUml::VisibilityKind visibility)
 
 void QUmlPackageableElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::DocumentationRole] = QStringLiteral("Indicates that packageable elements must always have a visibility, i.e., visibility is not optional.");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("NamedElement-visibility");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlpackageimport.cpp b/src/uml/qumlpackageimport.cpp
index c4a25980..67ef1941 100644
--- a/src/uml/qumlpackageimport.cpp
+++ b/src/uml/qumlpackageimport.cpp
@@ -169,32 +169,32 @@ void QUmlPackageImport::setVisibility(QtUml::VisibilityKind visibility)
 
 void QUmlPackageImport::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Package whose members are imported into a Namespace.");
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("importedPackage")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the Namespace that imports the members from a Package.");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("importingNamespace")][QtModeling::OppositeEndRole] = QStringLiteral("Namespace-packageImport");
-
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("visibility")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("visibility")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp
index 08493354..943ae7c5 100644
--- a/src/uml/qumlpackagemerge.cpp
+++ b/src/uml/qumlpackagemerge.cpp
@@ -146,23 +146,23 @@ void QUmlPackageMerge::setReceivingPackage(QUmlPackage *receivingPackage)
 
 void QUmlPackageMerge::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageMerge");
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::DocumentationRole] = QStringLiteral("References the Package that is to be merged with the receiving package of the PackageMerge.");
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("mergedPackage")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("receivingPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("receivingPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPackageMerge");
-    QModelingObject::propertyDataHash[QStringLiteral("receivingPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("receivingPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("receivingPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("receivingPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("receivingPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-packageMerge");
+    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/qumlparameter.cpp b/src/uml/qumlparameter.cpp
index f2275c39..a34298db 100644
--- a/src/uml/qumlparameter.cpp
+++ b/src/uml/qumlparameter.cpp
@@ -321,77 +321,77 @@ void QUmlParameter::removeParameterSet(QUmlParameterSet *parameterSet)
 
 void QUmlParameter::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("default")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("defaultValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether a parameter is being sent into or out of a behavioral element.");
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("direction")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("effect")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether an output parameter may emit a value to the exclusion of the other outputs.");
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isException")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isStream")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isStream")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("isStream")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isStream")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isStream")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isStream")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isStream")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::DocumentationRole] = QStringLiteral("References the Operation owning this parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_ownedParameter_ownerFormalParam-ownerFormalParam");
-    QModelingObject::propertyDataHash[QStringLiteral("operation")][QtModeling::OppositeEndRole] = QStringLiteral("Operation-ownedParameter");
-
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::DocumentationRole] = QStringLiteral("The parameter sets containing the parameter. See ParameterSet.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSet")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterSet-parameter");
+    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("parameterSet")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameter");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::DocumentationRole] = QStringLiteral("The parameter sets containing the parameter. See ParameterSet.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameter")][QStringLiteral("parameterSet")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterSet-parameter");
 
 }
 
diff --git a/src/uml/qumlparameterableelement.cpp b/src/uml/qumlparameterableelement.cpp
index 78db1b4d..83131a6e 100644
--- a/src/uml/qumlparameterableelement.cpp
+++ b/src/uml/qumlparameterableelement.cpp
@@ -149,23 +149,23 @@ bool QUmlParameterableElement::isTemplateParameter() const
 
 void QUmlParameterableElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameter that owns this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ParameterableElement-templateParameter Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("owningTemplateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-ownedParameteredElement");
-
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::DocumentationRole] = QStringLiteral("The template parameter that exposes this element as a formal parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateParameter")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-parameteredElement");
+    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/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp
index 0733a195..dad29649 100644
--- a/src/uml/qumlparameterset.cpp
+++ b/src/uml/qumlparameterset.cpp
@@ -176,23 +176,23 @@ void QUmlParameterSet::removeParameter(QUmlParameter *parameter)
 
 void QUmlParameterSet::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterSet");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][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("condition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("condition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterSet");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::DocumentationRole] = QStringLiteral("Parameters in the parameter set.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::OppositeEndRole] = QStringLiteral("Parameter-parameterSet");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterSet");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][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("condition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("condition")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlParameterSet");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::DocumentationRole] = QStringLiteral("Parameters in the parameter set.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlParameterSet")][QStringLiteral("parameter")][QtModeling::OppositeEndRole] = QStringLiteral("Parameter-parameterSet");
 
 }
 
diff --git a/src/uml/qumlpin.cpp b/src/uml/qumlpin.cpp
index 047988d1..4ebfe88c 100644
--- a/src/uml/qumlpin.cpp
+++ b/src/uml/qumlpin.cpp
@@ -149,14 +149,14 @@ void QUmlPin::setControl(bool isControl)
 
 void QUmlPin::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPin");
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the pins provide data to the actions, or just controls when it executes it.");
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isControl")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlport.cpp b/src/uml/qumlport.cpp
index ec66f920..c94ddc2b 100644
--- a/src/uml/qumlport.cpp
+++ b/src/uml/qumlport.cpp
@@ -350,68 +350,68 @@ void QUmlPort::removeRequired(QUmlInterface *required)
 
 void QUmlPort::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isBehavior")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isBehavior")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("isBehavior")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isBehavior")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isBehavior")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isBehavior")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isBehavior")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isConjugated")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isConjugated")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("isConjugated")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isConjugated")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isConjugated")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isConjugated")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isConjugated")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isService")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isService")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("isService")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isService")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isService")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isService")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isService")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::DocumentationRole] = QStringLiteral("References an optional protocol state machine which describes valid interactions at this interaction point.");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("protocol")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("provided")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("provided")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][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("redefinedPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Property-redefinedProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedPort")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("required")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("required")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("redefinedPort")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPort")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPort");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPort")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPort")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPort")][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("redefinedPort")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPort")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Property-redefinedProperty");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlPort")][QStringLiteral("redefinedPort")][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/qumlprofile.cpp b/src/uml/qumlprofile.cpp
index b85ddea8..c0739d72 100644
--- a/src/uml/qumlprofile.cpp
+++ b/src/uml/qumlprofile.cpp
@@ -209,23 +209,23 @@ void QUmlProfile::removeMetamodelReference(QUmlPackageImport *metamodelReference
 
 void QUmlProfile::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfile");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::DocumentationRole] = QStringLiteral("References a metaclass that may be extended.");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-elementImport");
-    QModelingObject::propertyDataHash[QStringLiteral("metaclassReference")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfile");
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::DocumentationRole] = QStringLiteral("References a package containing (directly or indirectly) metaclasses that may be extended.");
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-packageImport");
-    QModelingObject::propertyDataHash[QStringLiteral("metamodelReference")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfile");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::DocumentationRole] = QStringLiteral("References a metaclass that may be extended.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-elementImport");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metaclassReference")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfile");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::DocumentationRole] = QStringLiteral("References a package containing (directly or indirectly) metaclasses that may be extended.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-packageImport");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProfile")][QStringLiteral("metamodelReference")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlprofileapplication.cpp b/src/uml/qumlprofileapplication.cpp
index fb05a465..a0aba5f1 100644
--- a/src/uml/qumlprofileapplication.cpp
+++ b/src/uml/qumlprofileapplication.cpp
@@ -169,32 +169,32 @@ void QUmlProfileApplication::setStrict(bool isStrict)
 
 void QUmlProfileApplication::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfileApplication");
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::DocumentationRole] = QStringLiteral("References the Profiles that are applied to a Package through this ProfileApplication.");
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("appliedProfile")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfileApplication");
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::DocumentationRole] = QStringLiteral("The package that owns the profile application.");
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("applyingPackage")][QtModeling::OppositeEndRole] = QStringLiteral("Package-profileApplication");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isStrict")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isStrict")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProfileApplication");
-    QModelingObject::propertyDataHash[QStringLiteral("isStrict")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isStrict")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isStrict")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isStrict")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isStrict")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlproperty.cpp b/src/uml/qumlproperty.cpp
index f4cdcaac..baed3ed1 100644
--- a/src/uml/qumlproperty.cpp
+++ b/src/uml/qumlproperty.cpp
@@ -681,167 +681,167 @@ QSet<QUmlType *> QUmlProperty::subsettingContext() const
 
 void QUmlProperty::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the kind of aggregation that applies to the Property.");
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("aggregation")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::DocumentationRole] = QStringLiteral("References the association of which this property is a member, if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_member_memberNamespace-memberNamespace");
-    QModelingObject::propertyDataHash[QStringLiteral("association")][QtModeling::OppositeEndRole] = QStringLiteral("Association-memberEnd");
-
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::DocumentationRole] = QStringLiteral("Designates the optional association end that owns a qualifier attribute.");
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("associationEnd")][QtModeling::OppositeEndRole] = QStringLiteral("Property-qualifier");
-
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::DocumentationRole] = QStringLiteral("References the Class that owns the Property.References the Class that owns the Property.");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_attribute_classifier-classifier A_ownedAttribute_structuredClassifier-structuredClassifier NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("class")][QtModeling::OppositeEndRole] = QStringLiteral("Class-ownedAttribute");
-
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::DocumentationRole] = QStringLiteral("The DataType that owns this Property.");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_attribute_classifier-classifier NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("datatype")][QtModeling::OppositeEndRole] = QStringLiteral("DataType-ownedAttribute");
-
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("default")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("defaultValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("defaultValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::DocumentationRole] = QStringLiteral("References the Interface that owns the Property");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_attribute_classifier-classifier NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("interface")][QtModeling::OppositeEndRole] = QStringLiteral("Interface-ownedAttribute");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isComposite")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isDerived")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerived")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDerivedUnion")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerivedUnion")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerivedUnion")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDerivedUnion")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isDerivedUnion")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerivedUnion")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDerivedUnion")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::DocumentationRole] = QStringLiteral("True indicates this property can be used to uniquely identify an instance of the containing Class.");
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isID")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isReadOnly")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuralFeature-isReadOnly");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("opposite")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("opposite")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("opposite")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("opposite")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("opposite")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("opposite")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("opposite")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::DocumentationRole] = QStringLiteral("References the owning association of this property, if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Feature-featuringClassifier RedefinableElement-redefinitionContext NamedElement-namespace Property-association");
-    QModelingObject::propertyDataHash[QStringLiteral("owningAssociation")][QtModeling::OppositeEndRole] = QStringLiteral("Association-ownedEnd");
-
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][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("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("Property-associationEnd");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::DocumentationRole] = QStringLiteral("References the properties that are redefined by this property.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedProperty")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::DocumentationRole] = QStringLiteral("References the properties of which this property is constrained to be a subset.");
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subsettedProperty")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("qualifier")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifier")][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("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("Property-associationEnd");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::DocumentationRole] = QStringLiteral("References the properties that are redefined by this property.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("redefinedProperty")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProperty");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::DocumentationRole] = QStringLiteral("References the properties of which this property is constrained to be a subset.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlProperty")][QStringLiteral("subsettedProperty")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlprotocolconformance.cpp b/src/uml/qumlprotocolconformance.cpp
index 3487af47..3315c050 100644
--- a/src/uml/qumlprotocolconformance.cpp
+++ b/src/uml/qumlprotocolconformance.cpp
@@ -146,23 +146,23 @@ void QUmlProtocolConformance::setSpecificMachine(QUmlProtocolStateMachine *speci
 
 void QUmlProtocolConformance::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolConformance");
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the protocol state machine to which the specific state machine conforms.");
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("generalMachine")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolConformance");
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the state machine which conforms to the general state machine.");
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("specificMachine")][QtModeling::OppositeEndRole] = QStringLiteral("ProtocolStateMachine-conformance");
+    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/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp
index 4c243eef..968bb656 100644
--- a/src/uml/qumlprotocolstatemachine.cpp
+++ b/src/uml/qumlprotocolstatemachine.cpp
@@ -252,14 +252,14 @@ void QUmlProtocolStateMachine::removeConformance(QUmlProtocolConformance *confor
 
 void QUmlProtocolStateMachine::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::DocumentationRole] = QStringLiteral("Conformance between protocol state machines.");
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("conformance")][QtModeling::OppositeEndRole] = QStringLiteral("ProtocolConformance-specificMachine");
+    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/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp
index df72b268..580625ff 100644
--- a/src/uml/qumlprotocoltransition.cpp
+++ b/src/uml/qumlprotocoltransition.cpp
@@ -226,32 +226,32 @@ void QUmlProtocolTransition::removeReferred(QUmlOperation *referred)
 
 void QUmlProtocolTransition::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("postCondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("postCondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("postCondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("postCondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("postCondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("postCondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("postCondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("preCondition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("preCondition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("preCondition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("preCondition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("preCondition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("preCondition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Transition-guard");
-    QModelingObject::propertyDataHash[QStringLiteral("preCondition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("referred")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("referred")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlProtocolTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("referred")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("referred")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("referred")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("referred")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("referred")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlpseudostate.cpp b/src/uml/qumlpseudostate.cpp
index 3bab1f5d..6b0e0643 100644
--- a/src/uml/qumlpseudostate.cpp
+++ b/src/uml/qumlpseudostate.cpp
@@ -177,32 +177,32 @@ void QUmlPseudostate::setStateMachine(QUmlStateMachine *stateMachine)
 
 void QUmlPseudostate::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPseudostate");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("kind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPseudostate");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::DocumentationRole] = QStringLiteral("The State that owns this pseudostate and in which it appears.");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::OppositeEndRole] = QStringLiteral("State-connectionPoint");
-
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlPseudostate");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("stateMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::OppositeEndRole] = QStringLiteral("StateMachine-connectionPoint");
+    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/qumlqualifiervalue.cpp b/src/uml/qumlqualifiervalue.cpp
index f900b6ef..b80aa769 100644
--- a/src/uml/qumlqualifiervalue.cpp
+++ b/src/uml/qumlqualifiervalue.cpp
@@ -130,23 +130,23 @@ void QUmlQualifierValue::setValue(QUmlInputPin *value)
 
 void QUmlQualifierValue::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlQualifierValue");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::DocumentationRole] = QStringLiteral("Attribute representing the qualifier for which the value is to be specified.");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlQualifierValue");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Input pin from which the specified value for the qualifier is taken.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlraiseexceptionaction.cpp b/src/uml/qumlraiseexceptionaction.cpp
index 9d540740..fb2f5de9 100644
--- a/src/uml/qumlraiseexceptionaction.cpp
+++ b/src/uml/qumlraiseexceptionaction.cpp
@@ -159,14 +159,14 @@ void QUmlRaiseExceptionAction::setException(QUmlInputPin *exception)
 
 void QUmlRaiseExceptionAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRaiseExceptionAction");
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::DocumentationRole] = QStringLiteral("An input pin whose value becomes an exception object.");
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("exception")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadextentaction.cpp b/src/uml/qumlreadextentaction.cpp
index 25293203..85c8ebc6 100644
--- a/src/uml/qumlreadextentaction.cpp
+++ b/src/uml/qumlreadextentaction.cpp
@@ -183,23 +183,23 @@ void QUmlReadExtentAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadExtentAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadExtentAction");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier whose instances are to be retrieved.");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadExtentAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("The runtime instances of the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadisclassifiedobjectaction.cpp b/src/uml/qumlreadisclassifiedobjectaction.cpp
index 516565cf..9e21cfa3 100644
--- a/src/uml/qumlreadisclassifiedobjectaction.cpp
+++ b/src/uml/qumlreadisclassifiedobjectaction.cpp
@@ -238,41 +238,41 @@ void QUmlReadIsClassifiedObjectAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadIsClassifiedObjectAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier against which the classification of the input object is tested.");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::DocumentationRole] = QStringLiteral("Indicates whether the classifier must directly classify the input object.");
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isDirect")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object whose classification is to be tested.");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadIsClassifiedObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("After termination of the action, will hold the result of the test.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadlinkaction.cpp b/src/uml/qumlreadlinkaction.cpp
index 090da2f0..2af944fd 100644
--- a/src/uml/qumlreadlinkaction.cpp
+++ b/src/uml/qumlreadlinkaction.cpp
@@ -165,14 +165,14 @@ void QUmlReadLinkAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadLinkAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadlinkobjectendaction.cpp b/src/uml/qumlreadlinkobjectendaction.cpp
index 37ad1b24..446fd9ab 100644
--- a/src/uml/qumlreadlinkobjectendaction.cpp
+++ b/src/uml/qumlreadlinkobjectendaction.cpp
@@ -217,32 +217,32 @@ void QUmlReadLinkObjectEndAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadLinkObjectEndAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndAction");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::DocumentationRole] = QStringLiteral("Link end to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("end")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Gives the input pin from which the link object is obtained.");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Pin where the result value is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadlinkobjectendqualifieraction.cpp b/src/uml/qumlreadlinkobjectendqualifieraction.cpp
index b1acdb91..27f5d632 100644
--- a/src/uml/qumlreadlinkobjectendqualifieraction.cpp
+++ b/src/uml/qumlreadlinkobjectendqualifieraction.cpp
@@ -217,32 +217,32 @@ void QUmlReadLinkObjectEndQualifierAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadLinkObjectEndQualifierAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Gives the input pin from which the link object is obtained.");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::DocumentationRole] = QStringLiteral("The attribute representing the qualifier to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("qualifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadLinkObjectEndQualifierAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Pin where the result value is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadselfaction.cpp b/src/uml/qumlreadselfaction.cpp
index 935632de..e9fe23a8 100644
--- a/src/uml/qumlreadselfaction.cpp
+++ b/src/uml/qumlreadselfaction.cpp
@@ -159,14 +159,14 @@ void QUmlReadSelfAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadSelfAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadSelfAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the hosting object is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadstructuralfeatureaction.cpp b/src/uml/qumlreadstructuralfeatureaction.cpp
index 13a885d9..11431b1b 100644
--- a/src/uml/qumlreadstructuralfeatureaction.cpp
+++ b/src/uml/qumlreadstructuralfeatureaction.cpp
@@ -164,14 +164,14 @@ void QUmlReadStructuralFeatureAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadStructuralFeatureAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreadvariableaction.cpp b/src/uml/qumlreadvariableaction.cpp
index d4145916..7d952998 100644
--- a/src/uml/qumlreadvariableaction.cpp
+++ b/src/uml/qumlreadvariableaction.cpp
@@ -162,14 +162,14 @@ void QUmlReadVariableAction::setResult(QUmlOutputPin *result)
 
 void QUmlReadVariableAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReadVariableAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreception.cpp b/src/uml/qumlreception.cpp
index 60aa38b4..19601448 100644
--- a/src/uml/qumlreception.cpp
+++ b/src/uml/qumlreception.cpp
@@ -144,14 +144,14 @@ void QUmlReception::setSignal(QUmlSignal *signal)
 
 void QUmlReception::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReception");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The signal that this reception handles.");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreclassifyobjectaction.cpp b/src/uml/qumlreclassifyobjectaction.cpp
index 99967668..fb4c87a9 100644
--- a/src/uml/qumlreclassifyobjectaction.cpp
+++ b/src/uml/qumlreclassifyobjectaction.cpp
@@ -245,41 +245,41 @@ void QUmlReclassifyObjectAction::removeOldClassifier(QUmlClassifier *oldClassifi
 
 void QUmlReclassifyObjectAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether existing classifiers should be removed before adding the new classifiers.");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReplaceAll")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::DocumentationRole] = QStringLiteral("A set of classifiers to be added to the classifiers of the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("newClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object to be reclassified.");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::DocumentationRole] = QStringLiteral("A set of classifiers to be removed from the classifiers of the object.");
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("oldClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("newClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][QtModeling::DocumentationRole] = QStringLiteral("A set of classifiers to be added to the classifiers of the object.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("newClassifier")][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("oldClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReclassifyObjectAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::DocumentationRole] = QStringLiteral("A set of classifiers to be removed from the classifiers of the object.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReclassifyObjectAction")][QStringLiteral("oldClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp
index 11a22812..08852ab5 100644
--- a/src/uml/qumlredefinableelement.cpp
+++ b/src/uml/qumlredefinableelement.cpp
@@ -189,32 +189,32 @@ bool QUmlRedefinableElement::isRedefinitionContextValid(QUmlRedefinableElement *
 
 void QUmlRedefinableElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isLeaf")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isLeaf")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("isLeaf")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isLeaf")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isLeaf")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isLeaf")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isLeaf")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::DocumentationRole] = QStringLiteral("The redefinable element that is being redefined by this element.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the contexts that this element may be redefined from.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("redefinedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::DocumentationRole] = QStringLiteral("The redefinable element that is being redefined by this element.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the contexts that this element may be redefined from.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableElement")][QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp
index a526ee47..7c274766 100644
--- a/src/uml/qumlredefinabletemplatesignature.cpp
+++ b/src/uml/qumlredefinabletemplatesignature.cpp
@@ -228,32 +228,32 @@ bool QUmlRedefinableTemplateSignature::isConsistentWith(QUmlRedefinableElement *
 
 void QUmlRedefinableTemplateSignature::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::DocumentationRole] = QStringLiteral("The classifier that owns this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("TemplateSignature-template");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("classifier")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-ownedTemplateSignature");
-
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::DocumentationRole] = QStringLiteral("The template signature that is extended by this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedSignature")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameters of the extendedSignature.");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateSignature-parameter");
-    QModelingObject::propertyDataHash[QStringLiteral("inheritedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("extendedSignature")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::DocumentationRole] = QStringLiteral("The template signature that is extended by this template signature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("extendedSignature")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRedefinableTemplateSignature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameters of the extendedSignature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateSignature-parameter");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRedefinableTemplateSignature")][QStringLiteral("inheritedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlreduceaction.cpp b/src/uml/qumlreduceaction.cpp
index 7e138442..2e7c1f35 100644
--- a/src/uml/qumlreduceaction.cpp
+++ b/src/uml/qumlreduceaction.cpp
@@ -239,41 +239,41 @@ void QUmlReduceAction::setResult(QUmlOutputPin *result)
 
 void QUmlReduceAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::DocumentationRole] = QStringLiteral("The collection to be reduced.");
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("collection")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isOrdered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrdered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("reducer")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("reducer")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("reducer")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("reducer")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("reducer")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("reducer")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("reducer")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReduceAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlregion.cpp b/src/uml/qumlregion.cpp
index 47ef1e47..3a33380b 100644
--- a/src/uml/qumlregion.cpp
+++ b/src/uml/qumlregion.cpp
@@ -368,59 +368,59 @@ bool QUmlRegion::isRedefinitionContextValid(QUmlRegion *redefined) const
 
 void QUmlRegion::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::DocumentationRole] = QStringLiteral("The region of which this region is an extension.");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedRegion")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the classifier in which context this element may be redefined.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("state")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("state")][QtModeling::OppositeEndRole] = QStringLiteral("State-region");
-
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("stateMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("stateMachine")][QtModeling::OppositeEndRole] = QStringLiteral("StateMachine-region");
-
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::DocumentationRole] = QStringLiteral("The set of vertices that are owned by this region.");
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("subvertex")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-container");
-
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::DocumentationRole] = QStringLiteral("The set of transitions owned by the region.");
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("transition")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-container");
+    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("subvertex")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::DocumentationRole] = QStringLiteral("The set of vertices that are owned by this region.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("subvertex")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-container");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRegion");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::DocumentationRole] = QStringLiteral("The set of transitions owned by the region.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRegion")][QStringLiteral("transition")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-container");
 
 }
 
diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp
index 6dc4e333..af8e19ce 100644
--- a/src/uml/qumlrelationship.cpp
+++ b/src/uml/qumlrelationship.cpp
@@ -101,14 +101,14 @@ void QUmlRelationship::removeRelatedElement(QUmlElement *relatedElement)
 
 void QUmlRelationship::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRelationship");
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the elements related by the Relationship.");
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("relatedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRelationship");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the elements related by the Relationship.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlRelationship")][QStringLiteral("relatedElement")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.cpp b/src/uml/qumlremovestructuralfeaturevalueaction.cpp
index 7078cb80..8f8e10c6 100644
--- a/src/uml/qumlremovestructuralfeaturevalueaction.cpp
+++ b/src/uml/qumlremovestructuralfeaturevalueaction.cpp
@@ -190,23 +190,23 @@ void QUmlRemoveStructuralFeatureValueAction::setRemoveAt(QUmlInputPin *removeAt)
 
 void QUmlRemoveStructuralFeatureValueAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether to remove duplicates of the value in nonunique structural features.");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveStructuralFeatureValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("removeAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlremovevariablevalueaction.cpp b/src/uml/qumlremovevariablevalueaction.cpp
index 3593f111..47643f84 100644
--- a/src/uml/qumlremovevariablevalueaction.cpp
+++ b/src/uml/qumlremovevariablevalueaction.cpp
@@ -186,23 +186,23 @@ void QUmlRemoveVariableValueAction::setRemoveAt(QUmlInputPin *removeAt)
 
 void QUmlRemoveVariableValueAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether to remove duplicates of the value in nonunique variables.");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRemoveDuplicates")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlRemoveVariableValueAction");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("removeAt")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("removeAt")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlreplyaction.cpp b/src/uml/qumlreplyaction.cpp
index 82ccd302..6d0583aa 100644
--- a/src/uml/qumlreplyaction.cpp
+++ b/src/uml/qumlreplyaction.cpp
@@ -225,32 +225,32 @@ void QUmlReplyAction::setReturnInformation(QUmlInputPin *returnInformation)
 
 void QUmlReplyAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::DocumentationRole] = QStringLiteral("The trigger specifying the operation whose call is being replied to.");
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("replyToCall")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("replyValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::DocumentationRole] = QStringLiteral("A list of pins containing the reply values of the operation. These values are returned to the caller.");
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("replyValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][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("replyValue")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlReplyAction")][QStringLiteral("replyValue")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlReplyAction");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::DocumentationRole] = QStringLiteral("A pin containing the return information value produced by an earlier AcceptCallAction.");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("returnInformation")][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/qumlsendobjectaction.cpp b/src/uml/qumlsendobjectaction.cpp
index c925173a..03a5101c 100644
--- a/src/uml/qumlsendobjectaction.cpp
+++ b/src/uml/qumlsendobjectaction.cpp
@@ -187,23 +187,23 @@ void QUmlSendObjectAction::setTarget(QUmlInputPin *target)
 
 void QUmlSendObjectAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("request")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("request")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("request")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("request")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("request")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InvocationAction-argument");
-    QModelingObject::propertyDataHash[QStringLiteral("request")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("request")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendObjectAction");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The target object to which the object is sent.");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlsendsignalaction.cpp b/src/uml/qumlsendsignalaction.cpp
index a3023fb6..8e2f7b36 100644
--- a/src/uml/qumlsendsignalaction.cpp
+++ b/src/uml/qumlsendsignalaction.cpp
@@ -189,23 +189,23 @@ void QUmlSendSignalAction::setTarget(QUmlInputPin *target)
 
 void QUmlSendSignalAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendSignalAction");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The type of signal transmitted to the target object.");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSendSignalAction");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("The target object to which the signal is sent.");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp
index baea38f0..20c5d461 100644
--- a/src/uml/qumlsequencenode.cpp
+++ b/src/uml/qumlsequencenode.cpp
@@ -182,14 +182,14 @@ void QUmlSequenceNode::removeExecutableNode(QUmlExecutableNode *executableNode)
 
 void QUmlSequenceNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSequenceNode");
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::DocumentationRole] = QStringLiteral("An ordered set of executable nodes.");
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-node");
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("executableNode")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSequenceNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::DocumentationRole] = QStringLiteral("An ordered set of executable nodes.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("StructuredActivityNode-node");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSequenceNode")][QStringLiteral("executableNode")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp
index 91b96853..fe8f4625 100644
--- a/src/uml/qumlsignal.cpp
+++ b/src/uml/qumlsignal.cpp
@@ -189,14 +189,14 @@ void QUmlSignal::removeOwnedAttribute(QUmlProperty *ownedAttribute)
 
 void QUmlSignal::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSignal");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes owned by the signal.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSignal");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("The attributes owned by the signal.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember Classifier-attribute");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSignal")][QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlsignalevent.cpp b/src/uml/qumlsignalevent.cpp
index 09bc41bd..b4eed98e 100644
--- a/src/uml/qumlsignalevent.cpp
+++ b/src/uml/qumlsignalevent.cpp
@@ -122,14 +122,14 @@ void QUmlSignalEvent::setSignal(QUmlSignal *signal)
 
 void QUmlSignalEvent::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSignalEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::DocumentationRole] = QStringLiteral("The specific signal that is associated with this event.");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signal")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlslot.cpp b/src/uml/qumlslot.cpp
index 150adb2b..3c4dda6d 100644
--- a/src/uml/qumlslot.cpp
+++ b/src/uml/qumlslot.cpp
@@ -177,32 +177,32 @@ void QUmlSlot::removeValue(QUmlValueSpecification *value)
 
 void QUmlSlot::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::DocumentationRole] = QStringLiteral("The structural feature that specifies the values that may be held by the slot.");
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("definingFeature")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::DocumentationRole] = QStringLiteral("The instance specification that owns this slot.");
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("owningInstance")][QtModeling::OppositeEndRole] = QStringLiteral("InstanceSpecification-slot");
-
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The value or values corresponding to the defining feature for the owning instance specification.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSlot");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("The value or values corresponding to the defining feature for the owning instance specification.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlSlot")][QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlstartclassifierbehavioraction.cpp b/src/uml/qumlstartclassifierbehavioraction.cpp
index 7c940f1a..80d10e29 100644
--- a/src/uml/qumlstartclassifierbehavioraction.cpp
+++ b/src/uml/qumlstartclassifierbehavioraction.cpp
@@ -159,14 +159,14 @@ void QUmlStartClassifierBehaviorAction::setObject(QUmlInputPin *object)
 
 void QUmlStartClassifierBehaviorAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStartClassifierBehaviorAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("Holds the object on which to start the owned behavior.");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlstartobjectbehavioraction.cpp b/src/uml/qumlstartobjectbehavioraction.cpp
index d22e7cd4..ae5c9658 100644
--- a/src/uml/qumlstartobjectbehavioraction.cpp
+++ b/src/uml/qumlstartobjectbehavioraction.cpp
@@ -167,14 +167,14 @@ void QUmlStartObjectBehaviorAction::setObject(QUmlInputPin *object)
 
 void QUmlStartObjectBehaviorAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStartObjectBehaviorAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlstate.cpp b/src/uml/qumlstate.cpp
index 62d47bc6..5d099607 100644
--- a/src/uml/qumlstate.cpp
+++ b/src/uml/qumlstate.cpp
@@ -649,140 +649,140 @@ bool QUmlState::isRedefinitionContextValid(QUmlState *redefined) const
 
 void QUmlState::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][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("connection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("connection")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectionPointReference-state");
-
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][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("connectionPoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::OppositeEndRole] = QStringLiteral("Pseudostate-state");
-
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][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("deferrableTrigger")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("deferrableTrigger")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("doActivity")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("doActivity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("doActivity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("doActivity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("doActivity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("doActivity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("doActivity")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("entry")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("entry")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("exit")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("exit")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isComposite")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isComposite")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isOrthogonal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrthogonal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrthogonal")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isOrthogonal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isOrthogonal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrthogonal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isOrthogonal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isSimple")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isSimple")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("isSimple")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isSimple")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isSimple")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSimple")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSimple")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("isSubmachineState")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubmachineState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubmachineState")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("isSubmachineState")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("isSubmachineState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubmachineState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isSubmachineState")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::DocumentationRole] = QStringLiteral("The state of which this state is a redefinition.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedState")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the classifier in which context this element may be redefined.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::DocumentationRole] = QStringLiteral("The regions owned directly by the state.");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::OppositeEndRole] = QStringLiteral("Region-state");
-
-    QModelingObject::propertyDataHash[QStringLiteral("stateInvariant")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("stateInvariant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("stateInvariant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("stateInvariant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("stateInvariant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("stateInvariant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("stateInvariant")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::DocumentationRole] = QStringLiteral("The state machine that is to be inserted in place of the (submachine) state.");
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("submachine")][QtModeling::OppositeEndRole] = QStringLiteral("StateMachine-submachineState");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][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("connection")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connection")][QtModeling::OppositeEndRole] = QStringLiteral("ConnectionPointReference-state");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][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("connectionPoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("connectionPoint")][QtModeling::OppositeEndRole] = QStringLiteral("Pseudostate-state");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][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("deferrableTrigger")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("deferrableTrigger")][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("region")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlState");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][QtModeling::DocumentationRole] = QStringLiteral("The regions owned directly by the state.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlState")][QStringLiteral("region")][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/qumlstateinvariant.cpp b/src/uml/qumlstateinvariant.cpp
index 805f64ce..200e9455 100644
--- a/src/uml/qumlstateinvariant.cpp
+++ b/src/uml/qumlstateinvariant.cpp
@@ -159,23 +159,23 @@ void QUmlStateInvariant::setInvariant(QUmlConstraint *invariant)
 
 void QUmlStateInvariant::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateInvariant");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::DocumentationRole] = QStringLiteral("References the Lifeline on which the StateInvariant appears.");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("InteractionFragment-covered");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("covered")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateInvariant");
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::DocumentationRole] = QStringLiteral("A Constraint that should hold at runtime for this StateInvariant");
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("invariant")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp
index b70322bf..839b109f 100644
--- a/src/uml/qumlstatemachine.cpp
+++ b/src/uml/qumlstatemachine.cpp
@@ -414,41 +414,41 @@ bool QUmlStateMachine::isRedefinitionContextValid(QUmlStateMachine *redefined) c
 
 void QUmlStateMachine::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][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("connectionPoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("connectionPoint")][QtModeling::OppositeEndRole] = QStringLiteral("Pseudostate-stateMachine");
-
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::DocumentationRole] = QStringLiteral("The state machines of which this is an extension.");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Behavior-redefinedBehavior");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extendedStateMachine")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::DocumentationRole] = QStringLiteral("The regions owned directly by the state machine.");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("region")][QtModeling::OppositeEndRole] = QStringLiteral("Region-stateMachine");
-
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][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("submachineState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("submachineState")][QtModeling::OppositeEndRole] = QStringLiteral("State-submachine");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][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("connectionPoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("connectionPoint")][QtModeling::OppositeEndRole] = QStringLiteral("Pseudostate-stateMachine");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::DocumentationRole] = QStringLiteral("The state machines of which this is an extension.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Behavior-redefinedBehavior");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("extendedStateMachine")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::DocumentationRole] = QStringLiteral("The regions owned directly by the state machine.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("region")][QtModeling::OppositeEndRole] = QStringLiteral("Region-stateMachine");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStateMachine");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][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("submachineState")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStateMachine")][QStringLiteral("submachineState")][QtModeling::OppositeEndRole] = QStringLiteral("State-submachine");
 
 }
 
diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp
index 7d57eaa2..fe3c9e5c 100644
--- a/src/uml/qumlstereotype.cpp
+++ b/src/uml/qumlstereotype.cpp
@@ -252,23 +252,23 @@ QUmlProfile *QUmlStereotype::containingProfile() const
 
 void QUmlStereotype::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStereotype");
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][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("icon")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("icon")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStereotype");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][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("icon")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStereotype")][QStringLiteral("icon")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStereotype");
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::DocumentationRole] = QStringLiteral("The profile that directly or indirectly contains this stereotype.");
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("profile")][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/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp
index 42fef96b..ea0310da 100644
--- a/src/uml/qumlstringexpression.cpp
+++ b/src/uml/qumlstringexpression.cpp
@@ -192,23 +192,23 @@ QString QUmlStringExpression::stringValue() const
 
 void QUmlStringExpression::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStringExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::DocumentationRole] = QStringLiteral("The string expression of which this expression is a substring.");
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("owningExpression")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-subExpression");
-
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStringExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::DocumentationRole] = QStringLiteral("The StringExpressions that constitute this StringExpression.");
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("subExpression")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-owningExpression");
+    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("subExpression")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStringExpression");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::DocumentationRole] = QStringLiteral("The StringExpressions that constitute this StringExpression.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStringExpression")][QStringLiteral("subExpression")][QtModeling::OppositeEndRole] = QStringLiteral("StringExpression-owningExpression");
 
 }
 
diff --git a/src/uml/qumlstructuralfeature.cpp b/src/uml/qumlstructuralfeature.cpp
index 4890fbeb..f741d191 100644
--- a/src/uml/qumlstructuralfeature.cpp
+++ b/src/uml/qumlstructuralfeature.cpp
@@ -119,14 +119,14 @@ void QUmlStructuralFeature::setReadOnly(bool isReadOnly)
 
 void QUmlStructuralFeature::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuralFeature");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::DocumentationRole] = QStringLiteral("States whether the feature's value may be modified by a client.");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isReadOnly")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlstructuralfeatureaction.cpp b/src/uml/qumlstructuralfeatureaction.cpp
index 4b798b8b..dc401f15 100644
--- a/src/uml/qumlstructuralfeatureaction.cpp
+++ b/src/uml/qumlstructuralfeatureaction.cpp
@@ -175,23 +175,23 @@ void QUmlStructuralFeatureAction::setStructuralFeature(QUmlStructuralFeature *st
 
 void QUmlStructuralFeatureAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::DocumentationRole] = QStringLiteral("Structural feature to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuralFeature")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp
index 2c1aa952..b6119001 100644
--- a/src/uml/qumlstructuredactivitynode.cpp
+++ b/src/uml/qumlstructuredactivitynode.cpp
@@ -412,68 +412,68 @@ void QUmlStructuredActivityNode::removeVariable(QUmlVariable *variable)
 
 void QUmlStructuredActivityNode::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::DocumentationRole] = QStringLiteral("Activity immediately containing the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("ActivityGroup-inActivity ActivityNode-activity");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("activity")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-structuredNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the structured node.");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedEdge Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("edge")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityEdge-inStructuredNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::DocumentationRole] = QStringLiteral("If true, then the actions in the node execute in isolation from actions outside the node.");
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("mustIsolate")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inStructuredNode");
-
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::DocumentationRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::DocumentationRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("structuredNodeOutput")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][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("variable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::OppositeEndRole] = QStringLiteral("Variable-scope");
+    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("edge")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][QtModeling::DocumentationRole] = QStringLiteral("Edges immediately contained in the structured node.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedEdge Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("edge")][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("node")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::DocumentationRole] = QStringLiteral("Nodes immediately contained in the group.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("ActivityGroup-containedNode Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("node")][QtModeling::OppositeEndRole] = QStringLiteral("ActivityNode-inStructuredNode");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::DocumentationRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeInput")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::DocumentationRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("structuredNodeOutput")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredActivityNode");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][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("variable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredActivityNode")][QStringLiteral("variable")][QtModeling::OppositeEndRole] = QStringLiteral("Variable-scope");
 
 }
 
diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp
index 688b1609..91bb630a 100644
--- a/src/uml/qumlstructuredclassifier.cpp
+++ b/src/uml/qumlstructuredclassifier.cpp
@@ -299,41 +299,41 @@ void QUmlStructuredClassifier::removeRole(QUmlConnectableElement *role)
 
 void QUmlStructuredClassifier::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("References the properties owned by the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-attribute Namespace-ownedMember StructuredClassifier-role");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::DocumentationRole] = QStringLiteral("References the connectors owned by the classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedConnector")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("part")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("part")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("part")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("part")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("part")][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("part")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("part")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("part")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::IsDerivedUnionRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::DocumentationRole] = QStringLiteral("References the roles that instances may play in this classifier.");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
-    QModelingObject::propertyDataHash[QStringLiteral("role")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::DocumentationRole] = QStringLiteral("References the properties owned by the classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-attribute Namespace-ownedMember StructuredClassifier-role");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedAttribute")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::DocumentationRole] = QStringLiteral("References the connectors owned by the classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Classifier-feature A_redefinitionContext_redefinableElement-redefinableElement Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("ownedConnector")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][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("part")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("part")][QtModeling::OppositeEndRole] = QStringLiteral("");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlStructuredClassifier");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::IsDerivedUnionRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::DocumentationRole] = QStringLiteral("References the roles that instances may play in this classifier.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-member");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlStructuredClassifier")][QStringLiteral("role")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumlsubstitution.cpp b/src/uml/qumlsubstitution.cpp
index eee4b78c..db2c0fa1 100644
--- a/src/uml/qumlsubstitution.cpp
+++ b/src/uml/qumlsubstitution.cpp
@@ -171,23 +171,23 @@ void QUmlSubstitution::setSubstitutingClassifier(QUmlClassifier *substitutingCla
 
 void QUmlSubstitution::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::DocumentationRole] = QStringLiteral("The contract with which the substituting classifier complies.");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Dependency-supplier");
-    QModelingObject::propertyDataHash[QStringLiteral("contract")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::DocumentationRole] = QStringLiteral("Instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected.");
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner Dependency-client");
-    QModelingObject::propertyDataHash[QStringLiteral("substitutingClassifier")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-substitution");
+    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/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp
index d85910fa..d838f5d4 100644
--- a/src/uml/qumltemplateableelement.cpp
+++ b/src/uml/qumltemplateableelement.cpp
@@ -180,23 +180,23 @@ QSet<QUmlParameterableElement *> QUmlTemplateableElement::parameterableElements(
 
 void QUmlTemplateableElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::DocumentationRole] = QStringLiteral("The optional template signature specifying the formal template parameters.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedTemplateSignature")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateSignature-template");
-
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateableElement");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::DocumentationRole] = QStringLiteral("The optional bindings from this element to templates.");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateBinding-boundElement");
+    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("templateBinding")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateableElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::DocumentationRole] = QStringLiteral("The optional bindings from this element to templates.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateableElement")][QStringLiteral("templateBinding")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateBinding-boundElement");
 
 }
 
diff --git a/src/uml/qumltemplatebinding.cpp b/src/uml/qumltemplatebinding.cpp
index 2c2356d8..dd70550d 100644
--- a/src/uml/qumltemplatebinding.cpp
+++ b/src/uml/qumltemplatebinding.cpp
@@ -199,32 +199,32 @@ void QUmlTemplateBinding::setSignature(QUmlTemplateSignature *signature)
 
 void QUmlTemplateBinding::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::DocumentationRole] = QStringLiteral("The element that is bound by this binding.");
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner DirectedRelationship-source");
-    QModelingObject::propertyDataHash[QStringLiteral("boundElement")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateableElement-templateBinding");
-
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::DocumentationRole] = QStringLiteral("The parameter substitutions owned by this template binding.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("parameterSubstitution")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameterSubstitution-templateBinding");
-
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::DocumentationRole] = QStringLiteral("The template signature for the template that is the target of the binding.");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("DirectedRelationship-target");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("parameterSubstitution")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateBinding");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][QtModeling::DocumentationRole] = QStringLiteral("The parameter substitutions owned by this template binding.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateBinding")][QStringLiteral("parameterSubstitution")][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/qumltemplateparameter.cpp b/src/uml/qumltemplateparameter.cpp
index 6c74a677..5bf2988a 100644
--- a/src/uml/qumltemplateparameter.cpp
+++ b/src/uml/qumltemplateparameter.cpp
@@ -227,50 +227,50 @@ void QUmlTemplateParameter::setSignature(QUmlTemplateSignature *signature)
 
 void QUmlTemplateParameter::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::DocumentationRole] = QStringLiteral("The element that is the default for this formal template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("default")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::DocumentationRole] = QStringLiteral("The element that is owned by this template parameter for the purpose of providing a default.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement TemplateParameter-default");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedDefault")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The element that is owned by this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateParameter-parameteredElement Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterableElement-owningTemplateParameter");
-
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::DocumentationRole] = QStringLiteral("The element exposed by this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameteredElement")][QtModeling::OppositeEndRole] = QStringLiteral("ParameterableElement-templateParameter");
-
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameter");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::DocumentationRole] = QStringLiteral("The template signature that owns this template parameter.");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner A_parameter_templateSignature-templateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("signature")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateSignature-ownedParameter");
+    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/qumltemplateparametersubstitution.cpp b/src/uml/qumltemplateparametersubstitution.cpp
index 85ca1377..e134eea0 100644
--- a/src/uml/qumltemplateparametersubstitution.cpp
+++ b/src/uml/qumltemplateparametersubstitution.cpp
@@ -194,41 +194,41 @@ void QUmlTemplateParameterSubstitution::setTemplateBinding(QUmlTemplateBinding *
 
 void QUmlTemplateParameterSubstitution::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::DocumentationRole] = QStringLiteral("The element that is the actual parameter for this substitution.");
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("actual")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameter that is associated with this substitution.");
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("formal")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::DocumentationRole] = QStringLiteral("The actual parameter that is owned by this substitution.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement TemplateParameterSubstitution-actual");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedActual")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateParameterSubstitution");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::DocumentationRole] = QStringLiteral("The optional bindings from this element to templates.");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("templateBinding")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateBinding-parameterSubstitution");
+    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/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp
index 6046ee29..e45db5f2 100644
--- a/src/uml/qumltemplatesignature.cpp
+++ b/src/uml/qumltemplatesignature.cpp
@@ -196,32 +196,32 @@ void QUmlTemplateSignature::setTemplate(QUmlTemplateableElement *template_)
 
 void QUmlTemplateSignature::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameters that are owned by this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateSignature-parameter Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-signature");
-
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of all formal template parameters for this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("parameter")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::DocumentationRole] = QStringLiteral("The element that owns this template signature.");
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-owner");
-    QModelingObject::propertyDataHash[QStringLiteral("template")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateableElement-ownedTemplateSignature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::DocumentationRole] = QStringLiteral("The formal template parameters that are owned by this template signature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("TemplateSignature-parameter Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("ownedParameter")][QtModeling::OppositeEndRole] = QStringLiteral("TemplateParameter-signature");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTemplateSignature");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::DocumentationRole] = QStringLiteral("The ordered set of all formal template parameters for this template signature.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTemplateSignature")][QStringLiteral("parameter")][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/qumltestidentityaction.cpp b/src/uml/qumltestidentityaction.cpp
index 3f684b01..80cfc9b3 100644
--- a/src/uml/qumltestidentityaction.cpp
+++ b/src/uml/qumltestidentityaction.cpp
@@ -225,32 +225,32 @@ void QUmlTestIdentityAction::setSecond(QUmlInputPin *second)
 
 void QUmlTestIdentityAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTestIdentityAction");
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::DocumentationRole] = QStringLiteral("Gives the pin on which an object is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("first")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTestIdentityAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Tells whether the two input objects are identical.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][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("second")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("second")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTestIdentityAction");
-    QModelingObject::propertyDataHash[QStringLiteral("second")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("second")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("second")][QtModeling::DocumentationRole] = QStringLiteral("Gives the pin on which an object is placed.");
-    QModelingObject::propertyDataHash[QStringLiteral("second")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("second")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("second")][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/qumltimeconstraint.cpp b/src/uml/qumltimeconstraint.cpp
index a7fb056d..5d30d8e4 100644
--- a/src/uml/qumltimeconstraint.cpp
+++ b/src/uml/qumltimeconstraint.cpp
@@ -152,23 +152,23 @@ void QUmlTimeConstraint::setSpecification(QUmlTimeInterval *specification)
 
 void QUmlTimeConstraint::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeConstraint");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::DocumentationRole] = QStringLiteral("A condition that must be true when evaluated in order for the constraint to be satisfied.");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("IntervalConstraint-specification");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("specification")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumltimeevent.cpp b/src/uml/qumltimeevent.cpp
index c61d7a0d..3f65c4f0 100644
--- a/src/uml/qumltimeevent.cpp
+++ b/src/uml/qumltimeevent.cpp
@@ -153,23 +153,23 @@ void QUmlTimeEvent::setWhen(QUmlTimeExpression *when)
 
 void QUmlTimeEvent::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::DocumentationRole] = QStringLiteral("Specifies whether it is relative or absolute time.");
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("isRelative")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeEvent");
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the corresponding time deadline.");
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("when")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp
index daad44c2..4ab46ac2 100644
--- a/src/uml/qumltimeexpression.cpp
+++ b/src/uml/qumltimeexpression.cpp
@@ -167,23 +167,23 @@ void QUmlTimeExpression::removeObservation(QUmlObservation *observation)
 
 void QUmlTimeExpression::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::DocumentationRole] = QStringLiteral("The value of the time expression.");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("expr")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeExpression");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the time and duration observations that are involved in expr.");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("observation")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("observation")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeExpression");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the time and duration observations that are involved in expr.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTimeExpression")][QStringLiteral("observation")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumltimeinterval.cpp b/src/uml/qumltimeinterval.cpp
index a293025f..94d879b8 100644
--- a/src/uml/qumltimeinterval.cpp
+++ b/src/uml/qumltimeinterval.cpp
@@ -151,23 +151,23 @@ void QUmlTimeInterval::setMin(QUmlTimeExpression *min)
 
 void QUmlTimeInterval::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the TimeExpression denoting the maximum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-max");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("max")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeInterval");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::DocumentationRole] = QStringLiteral("Refers to the TimeExpression denoting the minimum value of the range.");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("Interval-min");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("min")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumltimeobservation.cpp b/src/uml/qumltimeobservation.cpp
index 298c84e2..2c59c94f 100644
--- a/src/uml/qumltimeobservation.cpp
+++ b/src/uml/qumltimeobservation.cpp
@@ -143,23 +143,23 @@ void QUmlTimeObservation::setFirstEvent(bool firstEvent)
 
 void QUmlTimeObservation::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::DocumentationRole] = QStringLiteral("The observation is determined by the entering or exiting of the event element during execution.");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTimeObservation");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("firstEvent")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("firstEvent")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumltransition.cpp b/src/uml/qumltransition.cpp
index 86b7de75..3b8082c8 100644
--- a/src/uml/qumltransition.cpp
+++ b/src/uml/qumltransition.cpp
@@ -394,86 +394,86 @@ bool QUmlTransition::isConsistentWith(QUmlRedefinableElement *redefinee) const
 
 void QUmlTransition::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::DocumentationRole] = QStringLiteral("Designates the region that owns this transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::OppositeEndRole] = QStringLiteral("Region-transition");
-
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::DocumentationRole] = QStringLiteral("Specifies an optional behavior to be performed when the transition fires.");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("effect")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[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("guard")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedRule");
-    QModelingObject::propertyDataHash[QStringLiteral("guard")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::DocumentationRole] = QStringLiteral("Indicates the precise type of the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("kind")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::DocumentationRole] = QStringLiteral("The transition that is redefined by this transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("RedefinableElement-redefinedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinedTransition")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::DocumentationRole] = QStringLiteral("References the classifier in which context this element may be redefined.");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("RedefinableElement-redefinitionContext");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("redefinitionContext")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::DocumentationRole] = QStringLiteral("Designates the originating vertex (state or pseudostate) of the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("source")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-outgoing");
-
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::DocumentationRole] = QStringLiteral("Designates the target vertex that is reached when the transition is taken.");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("target")][QtModeling::OppositeEndRole] = QStringLiteral("Vertex-incoming");
-
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the triggers that may fire the transition.");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("trigger")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("trigger")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTransition");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the triggers that may fire the transition.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTransition")][QStringLiteral("trigger")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp
index 84afbd0d..da442442 100644
--- a/src/uml/qumltrigger.cpp
+++ b/src/uml/qumltrigger.cpp
@@ -149,23 +149,23 @@ void QUmlTrigger::removePort(QUmlPort *port)
 
 void QUmlTrigger::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTrigger");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::DocumentationRole] = QStringLiteral("The event that causes the trigger.");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("event")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTrigger");
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::DocumentationRole] = QStringLiteral("A optional port of the receiver object on which the behavioral feature is invoked.");
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("port")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("port")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTrigger");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::DocumentationRole] = QStringLiteral("A optional port of the receiver object on which the behavioral feature is invoked.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlTrigger")][QStringLiteral("port")][QtModeling::OppositeEndRole] = QStringLiteral("");
 
 }
 
diff --git a/src/uml/qumltype.cpp b/src/uml/qumltype.cpp
index 354b1796..09e0140a 100644
--- a/src/uml/qumltype.cpp
+++ b/src/uml/qumltype.cpp
@@ -125,14 +125,14 @@ bool QUmlType::conformsTo(QUmlType *other) const
 
 void QUmlType::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlType");
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the owning package of this classifier, if any.");
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_packagedElement_owningPackage-owningPackage");
-    QModelingObject::propertyDataHash[QStringLiteral("package")][QtModeling::OppositeEndRole] = QStringLiteral("Package-ownedType");
+    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/qumltypedelement.cpp b/src/uml/qumltypedelement.cpp
index 600e4f93..330fc0ac 100644
--- a/src/uml/qumltypedelement.cpp
+++ b/src/uml/qumltypedelement.cpp
@@ -107,14 +107,14 @@ void QUmlTypedElement::setType(QUmlType *type)
 
 void QUmlTypedElement::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlTypedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::DocumentationRole] = QStringLiteral("This information is derived from the return result for this Operation.The type of the TypedElement.");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("type")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlunmarshallaction.cpp b/src/uml/qumlunmarshallaction.cpp
index 6f93e71b..d0406683 100644
--- a/src/uml/qumlunmarshallaction.cpp
+++ b/src/uml/qumlunmarshallaction.cpp
@@ -224,32 +224,32 @@ void QUmlUnmarshallAction::setUnmarshallType(QUmlClassifier *unmarshallType)
 
 void QUmlUnmarshallAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::DocumentationRole] = QStringLiteral("The object to be unmarshalled.");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("object")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("The values of the structural features of the input object.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::DocumentationRole] = QStringLiteral("The type of the object to be unmarshalled.");
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("unmarshallType")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUnmarshallAction");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("The values of the structural features of the input object.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUnmarshallAction")][QStringLiteral("result")][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/qumlusecase.cpp b/src/uml/qumlusecase.cpp
index 30ad7e8c..c1302426 100644
--- a/src/uml/qumlusecase.cpp
+++ b/src/uml/qumlusecase.cpp
@@ -363,41 +363,41 @@ QSet<QUmlUseCase *> QUmlUseCase::allIncludedUseCases() const
 
 void QUmlUseCase::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::DocumentationRole] = QStringLiteral("References the Extend relationships owned by this use case.");
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("extend")][QtModeling::OppositeEndRole] = QStringLiteral("Extend-extension");
-
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::DocumentationRole] = QStringLiteral("References the ExtensionPoints owned by the use case.");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("extensionPoint")][QtModeling::OppositeEndRole] = QStringLiteral("ExtensionPoint-useCase");
-
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::DocumentationRole] = QStringLiteral("References the Include relationships owned by this use case.");
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember");
-    QModelingObject::propertyDataHash[QStringLiteral("include")][QtModeling::OppositeEndRole] = QStringLiteral("Include-includingCase");
-
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][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("subject")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("subject")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-useCase");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::DocumentationRole] = QStringLiteral("References the Extend relationships owned by this use case.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extend")][QtModeling::OppositeEndRole] = QStringLiteral("Extend-extension");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::DocumentationRole] = QStringLiteral("References the ExtensionPoints owned by the use case.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("extensionPoint")][QtModeling::OppositeEndRole] = QStringLiteral("ExtensionPoint-useCase");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::AggregationRole] = QStringLiteral("composite");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::DocumentationRole] = QStringLiteral("References the Include relationships owned by this use case.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("A_source_directedRelationship-directedRelationship Namespace-ownedMember");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("include")][QtModeling::OppositeEndRole] = QStringLiteral("Include-includingCase");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlUseCase");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][QtModeling::IsDerivedRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][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("subject")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlUseCase")][QStringLiteral("subject")][QtModeling::OppositeEndRole] = QStringLiteral("Classifier-useCase");
 
 }
 
diff --git a/src/uml/qumlvaluepin.cpp b/src/uml/qumlvaluepin.cpp
index 34f7a546..afeeedbb 100644
--- a/src/uml/qumlvaluepin.cpp
+++ b/src/uml/qumlvaluepin.cpp
@@ -171,14 +171,14 @@ void QUmlValuePin::setValue(QUmlValueSpecification *value)
 
 void QUmlValuePin::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlValuePin");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value that the pin will provide.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlvaluespecificationaction.cpp b/src/uml/qumlvaluespecificationaction.cpp
index ef805370..f9e2ea77 100644
--- a/src/uml/qumlvaluespecificationaction.cpp
+++ b/src/uml/qumlvaluespecificationaction.cpp
@@ -193,23 +193,23 @@ void QUmlValueSpecificationAction::setValue(QUmlValueSpecification *value)
 
 void QUmlValueSpecificationAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlValueSpecificationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlValueSpecificationAction");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value specification to be evaluated.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Element-ownedElement");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlvariable.cpp b/src/uml/qumlvariable.cpp
index b24acf16..749b4102 100644
--- a/src/uml/qumlvariable.cpp
+++ b/src/uml/qumlvariable.cpp
@@ -184,23 +184,23 @@ bool QUmlVariable::isAccessibleBy(QUmlAction *a) const
 
 void QUmlVariable::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVariable");
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::DocumentationRole] = QStringLiteral("An activity that owns the variable.");
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("activityScope")][QtModeling::OppositeEndRole] = QStringLiteral("Activity-variable");
-
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVariable");
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::DocumentationRole] = QStringLiteral("A structured activity node that owns the variable.");
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("scope")][QtModeling::OppositeEndRole] = QStringLiteral("StructuredActivityNode-variable");
+    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/qumlvariableaction.cpp b/src/uml/qumlvariableaction.cpp
index c5a21d09..c94a65bf 100644
--- a/src/uml/qumlvariableaction.cpp
+++ b/src/uml/qumlvariableaction.cpp
@@ -142,14 +142,14 @@ void QUmlVariableAction::setVariable(QUmlVariable *variable)
 
 void QUmlVariableAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVariableAction");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::DocumentationRole] = QStringLiteral("Variable to be read.");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("variable")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlvertex.cpp b/src/uml/qumlvertex.cpp
index 889fd0c8..8a707247 100644
--- a/src/uml/qumlvertex.cpp
+++ b/src/uml/qumlvertex.cpp
@@ -218,32 +218,32 @@ QUmlStateMachine *QUmlVertex::containingStateMachine() const
 
 void QUmlVertex::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::DocumentationRole] = QStringLiteral("The region that contains this vertex.");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("NamedElement-namespace");
-    QModelingObject::propertyDataHash[QStringLiteral("container")][QtModeling::OppositeEndRole] = QStringLiteral("Region-subvertex");
-
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the transitions entering this vertex.");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("incoming")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-target");
-
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::AggregationRole] = QStringLiteral("none");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::IsDerivedRole] = true;
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the transitions departing from this vertex.");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("outgoing")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-source");
+    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("incoming")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the transitions entering this vertex.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("incoming")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-target");
+
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::AggregationRole] = QStringLiteral("none");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlVertex");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::IsDerivedRole] = true;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::IsDerivedUnionRole] = false;
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::DocumentationRole] = QStringLiteral("Specifies the transitions departing from this vertex.");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("");
+    QModelingObject::propertyDataHash[QStringLiteral("QUmlVertex")][QStringLiteral("outgoing")][QtModeling::OppositeEndRole] = QStringLiteral("Transition-source");
 
 }
 
diff --git a/src/uml/qumlwritestructuralfeatureaction.cpp b/src/uml/qumlwritestructuralfeatureaction.cpp
index d50c643f..e290a6ad 100644
--- a/src/uml/qumlwritestructuralfeatureaction.cpp
+++ b/src/uml/qumlwritestructuralfeatureaction.cpp
@@ -188,23 +188,23 @@ void QUmlWriteStructuralFeatureAction::setValue(QUmlInputPin *value)
 
 void QUmlWriteStructuralFeatureAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlWriteStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::DocumentationRole] = QStringLiteral("Gives the output pin on which the result is put.");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-output");
-    QModelingObject::propertyDataHash[QStringLiteral("result")][QtModeling::OppositeEndRole] = QStringLiteral("");
-
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlWriteStructuralFeatureAction");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value to be added or removed from the structural feature.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/qumlwritevariableaction.cpp b/src/uml/qumlwritevariableaction.cpp
index 350fa515..68ea139a 100644
--- a/src/uml/qumlwritevariableaction.cpp
+++ b/src/uml/qumlwritevariableaction.cpp
@@ -153,14 +153,14 @@ void QUmlWriteVariableAction::setValue(QUmlInputPin *value)
 
 void QUmlWriteVariableAction::setPropertyData()
 {
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::AggregationRole] = QStringLiteral("composite");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::PropertyClassRole] = QStringLiteral("QUmlWriteVariableAction");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::IsDerivedUnionRole] = false;
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::DocumentationRole] = QStringLiteral("Value to be added or removed from the variable.");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::RedefinedPropertiesRole] = QStringLiteral("");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::SubsettedPropertiesRole] = QStringLiteral("Action-input");
-    QModelingObject::propertyDataHash[QStringLiteral("value")][QtModeling::OppositeEndRole] = QStringLiteral("");
+    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/uml.pro b/src/uml/uml.pro
index fae5feeb..383570d1 100644
--- a/src/uml/uml.pro
+++ b/src/uml/uml.pro
@@ -9,4 +9,4 @@ load(qt_module)
 
 include(uml.pri)
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+\ No newline at end of file
author	Sandro S. Andrade <sandroandrade@kde.org>	2013-10-07 09:36:50 -0300
committer	Sandro S. Andrade <sandroandrade@kde.org>	2013-10-07 14:34:31 +0200
commit	5e4a780b40543fa12d6d9607e3193fb111c5ab84 (patch)
tree	eb747784d9f3319d6ac7954eea269614aaad9277
parent	3031fe1254052bdeffec90ca76e2f3649a971ae7 (diff)