diff --git a/org.framed.iorm.ui/core/baseRules.editpolicy b/org.framed.iorm.ui/core/baseRules.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..d1615af47ca77f65f3fe02713fec0b29608c7cfe
--- /dev/null
+++ b/org.framed.iorm.ui/core/baseRules.editpolicy
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+  <policies actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+  <policies action="Add" actionType="NaturalType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Add" actionType="Group">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="NaturalType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="Group">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="RelationshipExclusion">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="RelationshipImplication">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Execute" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/core/fulfillment/Fulfillment.editpolicy b/org.framed.iorm.ui/core/fulfillment/Fulfillment.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..25b8fe586a1b12a719812f7f838e305e87790112
--- /dev/null
+++ b/org.framed.iorm.ui/core/fulfillment/Fulfillment.editpolicy
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Naturals"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:IsSourceType" type="NaturalType"/>
+      <rules xsi:type="editpolicymodel:IsTargetType" type="CompartmentType"/>
+    </constraintRule>
+  </policies>
+  <policies action="Start" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Naturals"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="NaturalType"/>
+  </policies>
+  <policies action="Add" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+      <rules xsi:type="editpolicymodel:IsTargetType" type="CompartmentType"/>
+    </constraintRule>
+  </policies>
+  <policies action="Start" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+  </policies>
+  <policies action="Add" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartments"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:AndConstraintRule">
+        <rules xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
+        <rules xsi:type="editpolicymodel:IsTargetType" type="CompartmentType"/>
+      </rules>
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
+      </rules>
+    </constraintRule>
+  </policies>
+  <policies action="Start" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartments"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
+  </policies>
+  <policies action="Add" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
+  </policies>
+  <policies action="Start" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/core/standardPolicies.editpolicy b/org.framed.iorm.ui/core/standardPolicies.editpolicy
deleted file mode 100644
index 5c73ccce1fea166fc79fb3d8dc7dfa73cd9e544d..0000000000000000000000000000000000000000
--- a/org.framed.iorm.ui/core/standardPolicies.editpolicy
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
-  <policies action="Start" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Playable_by_Defining_Compartment"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
-  </policies>
-  <policies action="Add" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Playable_by_Defining_Compartment"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
-      <rules xsi:type="editpolicymodel:SourceEqualsTarget"/>
-    </constraintRule>
-  </policies>
-  <policies action="Add" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Contains_Compartments"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Contains_Compartments"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies action="Create_Property" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Properties"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Create_Attribute" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Properties"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Create_Operation" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Behavior"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add_Property" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Create_Property" actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Properties"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Create_Attribute" actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Properties"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Create_Operation" actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Behavior"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add_Property" actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Start" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Relationships"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Relationships"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Start" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-  </policies>
-  <policies action="Add" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:IsTargetType" type="RoleType"/>
-      <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-    </constraintRule>
-  </policies>
-  <policies action="Add" actionType="RelationshipExclusion">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Start" actionType="RelationshipExclusion">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add" actionType="RelationshipImplication">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Start" actionType="RelationshipImplication">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Naturals"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:IsSourceType" type="NaturalType"/>
-      <rules xsi:type="editpolicymodel:IsTargetType" type="CompartmentType"/>
-    </constraintRule>
-  </policies>
-  <policies action="Start" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Naturals"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="NaturalType"/>
-  </policies>
-  <policies action="Add" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-      <rules xsi:type="editpolicymodel:IsTargetType" type="CompartmentType"/>
-    </constraintRule>
-  </policies>
-  <policies action="Start" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-  </policies>
-  <policies action="Add" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartments"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:AndConstraintRule">
-        <rules xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
-        <rules xsi:type="editpolicymodel:IsTargetType" type="CompartmentType"/>
-      </rules>
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
-      </rules>
-    </constraintRule>
-  </policies>
-  <policies action="Start" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartments"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
-  </policies>
-  <policies action="Add" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
-  </policies>
-  <policies action="Start" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Dates"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
-  </policies>
-  <policies action="Start" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-  </policies>
-  <policies action="Add" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:AndConstraintRule">
-        <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
-        <rules xsi:type="editpolicymodel:NotConstraintRule">
-          <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
-        </rules>
-      </rules>
-      <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
-    </constraintRule>
-  </policies>
-  <policies action="Start" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Type_Inheritance"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
-  </policies>
-  <policies action="Add" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Type_Inheritance"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:AndConstraintRule">
-        <rules xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
-        <rules xsi:type="editpolicymodel:NotConstraintRule">
-          <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
-        </rules>
-      </rules>
-      <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
-    </constraintRule>
-  </policies>
-  <policies action="Start" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Inheritance"/>
-    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
-  </policies>
-  <policies action="Add" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Inheritance"/>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:AndConstraintRule">
-        <rules xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
-        <rules xsi:type="editpolicymodel:NotConstraintRule">
-          <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
-        </rules>
-      </rules>
-      <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
-    </constraintRule>
-  </policies>
-  <policies action="Add" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
-      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
-    </featureRule>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:InCompartment"/>
-      </rules>
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
-      </rules>
-    </constraintRule>
-  </policies>
-  <policies actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
-      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
-    </featureRule>
-    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:InCompartment"/>
-      </rules>
-      <rules xsi:type="editpolicymodel:NotConstraintRule">
-        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
-      </rules>
-    </constraintRule>
-  </policies>
-  <policies action="Add" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
-    <constraintRule xsi:type="editpolicymodel:NotConstraintRule">
-      <rule xsi:type="editpolicymodel:InCompartment"/>
-    </constraintRule>
-  </policies>
-  <policies actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
-    <constraintRule xsi:type="editpolicymodel:NotConstraintRule">
-      <rule xsi:type="editpolicymodel:InCompartment"/>
-    </constraintRule>
-  </policies>
-  <policies action="Add" actionType="DataType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="DataType">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add" actionType="RoleGroup">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Group_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies actionType="RoleGroup">
-    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Group_Constraints"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies action="Add" actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies actionType="RoleType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
-  </policies>
-  <policies action="Add" actionType="NaturalType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Add" actionType="Group">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="NaturalType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="Group">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="RelationshipExclusion">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="RelationshipImplication">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Execute" actionType="CompartmentType">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Execute" actionType="Relationship">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Execute" actionType="Fulfillment">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-  <policies action="Execute" actionType="Inheritance">
-    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
-    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
-  </policies>
-</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/compartment/CompartmentTypes.editpolicy b/org.framed.iorm.ui/modules/compartment/CompartmentTypes.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..e0cca489274d707b6752fdbd8d7c7d4cd25ffb8d
--- /dev/null
+++ b/org.framed.iorm.ui/modules/compartment/CompartmentTypes.editpolicy
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
+      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
+    </featureRule>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:InCompartment"/>
+      </rules>
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
+      </rules>
+    </constraintRule>
+  </policies>
+  <policies actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:NotFeatureRule">
+      <rule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
+    </featureRule>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:InCompartment"/>
+      </rules>
+      <rules xsi:type="editpolicymodel:NotConstraintRule">
+        <rule xsi:type="editpolicymodel:ContainsCompartment"/>
+      </rules>
+    </constraintRule>
+  </policies>
+  <policies action="Add" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
+    <constraintRule xsi:type="editpolicymodel:NotConstraintRule">
+      <rule xsi:type="editpolicymodel:InCompartment"/>
+    </constraintRule>
+  </policies>
+  <policies actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Types"/>
+    <constraintRule xsi:type="editpolicymodel:NotConstraintRule">
+      <rule xsi:type="editpolicymodel:InCompartment"/>
+    </constraintRule>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/compartment/containts_compartments/ContainsCompartments.editpolicy b/org.framed.iorm.ui/modules/compartment/containts_compartments/ContainsCompartments.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..cf4764fa5bad6b13c7f61b19b0624bec5da91f10
--- /dev/null
+++ b/org.framed.iorm.ui/modules/compartment/containts_compartments/ContainsCompartments.editpolicy
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Contains_Compartments"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+  <policies actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Contains_Compartments"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/compartment/inheritance/CompartmentInheritance.editpolicy b/org.framed.iorm.ui/modules/compartment/inheritance/CompartmentInheritance.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..ec8c7943887e46edf9d672cd7caefeff9f7a18f4
--- /dev/null
+++ b/org.framed.iorm.ui/modules/compartment/inheritance/CompartmentInheritance.editpolicy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Start" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Inheritance"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
+  </policies>
+  <policies action="Add" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Inheritance"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:AndConstraintRule">
+        <rules xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
+        <rules xsi:type="editpolicymodel:NotConstraintRule">
+          <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
+        </rules>
+      </rules>
+      <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
+    </constraintRule>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/compartment/playing_own_roles/PlayingOwnRoles.editpolicy b/org.framed.iorm.ui/modules/compartment/playing_own_roles/PlayingOwnRoles.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..a780f41882fedb6b2b6028e3406c8b05bf262698
--- /dev/null
+++ b/org.framed.iorm.ui/modules/compartment/playing_own_roles/PlayingOwnRoles.editpolicy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Start" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Playable_by_Defining_Compartment"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
+  </policies>
+  <policies action="Add" actionType="Fulfillment">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Playable_by_Defining_Compartment"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:IsSourceType" type="CompartmentType"/>
+      <rules xsi:type="editpolicymodel:SourceEqualsTarget"/>
+    </constraintRule>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/compartment/properties/CompartmentTypeAttsAndOps.editpolicy b/org.framed.iorm.ui/modules/compartment/properties/CompartmentTypeAttsAndOps.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..f67eb5c6e444c98abd621e62c20f80d696386617
--- /dev/null
+++ b/org.framed.iorm.ui/modules/compartment/properties/CompartmentTypeAttsAndOps.editpolicy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Create_Property" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Properties"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Create_Attribute" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Properties"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Create_Operation" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Compartment_Behavior"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Add_Property" actionType="CompartmentType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/datatype/DataTypes.editpolicy b/org.framed.iorm.ui/modules/datatype/DataTypes.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..3a492f058902edaf1e766b330f94a8311ee46447
--- /dev/null
+++ b/org.framed.iorm.ui/modules/datatype/DataTypes.editpolicy
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="DataType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies actionType="DataType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Types"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/datatype/inheritance/DataTypeInheritance.editpolicy b/org.framed.iorm.ui/modules/datatype/inheritance/DataTypeInheritance.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..8813a4785c24273dbab9ae5238f83afce0e438d9
--- /dev/null
+++ b/org.framed.iorm.ui/modules/datatype/inheritance/DataTypeInheritance.editpolicy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Start" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Type_Inheritance"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
+  </policies>
+  <policies action="Add" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Data_Type_Inheritance"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:AndConstraintRule">
+        <rules xsi:type="editpolicymodel:IsSourceType" type="DataType"/>
+        <rules xsi:type="editpolicymodel:NotConstraintRule">
+          <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
+        </rules>
+      </rules>
+      <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
+    </constraintRule>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/relationship/Relationship.editpolicy b/org.framed.iorm.ui/modules/relationship/Relationship.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..46fa4fd4500dedf31230133779214588458f7376
--- /dev/null
+++ b/org.framed.iorm.ui/modules/relationship/Relationship.editpolicy
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Start" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Relationships"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Add" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Relationships"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Start" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+  </policies>
+  <policies action="Add" actionType="Relationship">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:IsTargetType" type="RoleType"/>
+      <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+    </constraintRule>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/relationship/inter_relationship_constraints/InterRelationship.editpolicy b/org.framed.iorm.ui/modules/relationship/inter_relationship_constraints/InterRelationship.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..11bccd06e640c600bf61c753428ab2595e14ce3f
--- /dev/null
+++ b/org.framed.iorm.ui/modules/relationship/inter_relationship_constraints/InterRelationship.editpolicy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="RelationshipExclusion">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Start" actionType="RelationshipExclusion">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Add" actionType="RelationshipImplication">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Start" actionType="RelationshipImplication">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Inter_Relationship_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/roletype/inheritance/RoleInheritance.editpolicy b/org.framed.iorm.ui/modules/roletype/inheritance/RoleInheritance.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..bbb8896275a530ab9686490992972dc194806c2a
--- /dev/null
+++ b/org.framed.iorm.ui/modules/roletype/inheritance/RoleInheritance.editpolicy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Start" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
+    <constraintRule xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+  </policies>
+  <policies action="Add" actionType="Inheritance">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Inheritance"/>
+    <constraintRule xsi:type="editpolicymodel:AndConstraintRule">
+      <rules xsi:type="editpolicymodel:AndConstraintRule">
+        <rules xsi:type="editpolicymodel:IsSourceType" type="RoleType"/>
+        <rules xsi:type="editpolicymodel:NotConstraintRule">
+          <rule xsi:type="editpolicymodel:SourceEqualsTarget"/>
+        </rules>
+      </rules>
+      <rules xsi:type="editpolicymodel:SourceEqualsTargetType"/>
+    </constraintRule>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/roletype/properties/RoleTypeAttsAndOps.editpolicy b/org.framed.iorm.ui/modules/roletype/properties/RoleTypeAttsAndOps.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..d38c44c46e061bf1c5c538eeff7499125cf62b61
--- /dev/null
+++ b/org.framed.iorm.ui/modules/roletype/properties/RoleTypeAttsAndOps.editpolicy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Create_Property" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Properties"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Create_Attribute" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Properties"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Create_Operation" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Role_Behavior"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+  <policies action="Add_Property" actionType="RoleType">
+    <featureRule xsi:type="editpolicymodel:TrueFeatureRule"/>
+    <constraintRule xsi:type="editpolicymodel:TrueConstraintRule"/>
+  </policies>
+</editpolicymodel:Model>
diff --git a/org.framed.iorm.ui/modules/roletype/role_constraints/RoleConstraints.editpolicy b/org.framed.iorm.ui/modules/roletype/role_constraints/RoleConstraints.editpolicy
new file mode 100644
index 0000000000000000000000000000000000000000..4c7187c49f5a6367bb0e22fea5da11f16292c0b6
--- /dev/null
+++ b/org.framed.iorm.ui/modules/roletype/role_constraints/RoleConstraints.editpolicy
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ASCII"?>
+<editpolicymodel:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editpolicymodel="http://framed/editpolicymodel">
+  <policies action="Add" actionType="RoleGroup">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Group_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+  <policies actionType="RoleGroup">
+    <featureRule xsi:type="editpolicymodel:IsFeature" featureName="Group_Constraints"/>
+    <constraintRule xsi:type="editpolicymodel:InCompartment"/>
+  </policies>
+</editpolicymodel:Model>