diff --git a/changelog.txt b/changelog.txt
index cffd1f114..159779180 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+3.0.6
+   - Added ability to copy current diagram to clipboard
+
 3.0.5
    - Fix where parsing EF version numbers should be culture-neutral (see https://github.com/msawczyn/EFDesigner/issues/282)
    - Fixed circular logic flaw in identity properties for database views (see https://github.com/msawczyn/EFDesigner/issues/275)
diff --git a/src/Dsl/DslDefinition.dsl b/src/Dsl/DslDefinition.dsl
index b39f34761..130edaa10 100644
--- a/src/Dsl/DslDefinition.dsl
+++ b/src/Dsl/DslDefinition.dsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Dsl xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="9987f227-3d05-49b7-b151-857879f5dfb8" Description="Entity Framework visual editor for EF6, EFCore and beyond." Name="EFModel" DisplayName="Entity Framework Visual Editor" Namespace="Sawczyn.EFDesigner.EFModel" MajorVersion="3" Build="5" Revision="2" ProductName="EFDesigner" CompanyName="Michael Sawczyn" PackageGuid="56bbe1ba-aaee-4883-848f-e3c8656f8db2" PackageNamespace="Sawczyn.EFDesigner.EFModel" xmlns="http://schemas.microsoft.com/VisualStudio/2005/DslTools/DslDefinitionModel">
+<Dsl xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="9987f227-3d05-49b7-b151-857879f5dfb8" Description="Entity Framework visual editor for EF6, EFCore and beyond." Name="EFModel" DisplayName="Entity Framework Visual Editor" Namespace="Sawczyn.EFDesigner.EFModel" MajorVersion="3" Build="6" ProductName="EFDesigner" CompanyName="Michael Sawczyn" PackageGuid="56bbe1ba-aaee-4883-848f-e3c8656f8db2" PackageNamespace="Sawczyn.EFDesigner.EFModel" xmlns="http://schemas.microsoft.com/VisualStudio/2005/DslTools/DslDefinitionModel">
   <Classes>
     <DomainClass Id="95532cb8-3452-4b09-a654-aeb2e2d0b3ad" Description="" Name="ModelRoot" DisplayName="Entity Model" Namespace="Sawczyn.EFDesigner.EFModel">
       <CustomTypeDescriptor>
diff --git a/src/Dsl/DslDefinition.dsl.diagram b/src/Dsl/DslDefinition.dsl.diagram
index 48086e1aa..d475684b1 100644
--- a/src/Dsl/DslDefinition.dsl.diagram
+++ b/src/Dsl/DslDefinition.dsl.diagram
@@ -333,61 +333,61 @@
         </microsoft.VisualStudio.Modeling.DslDesigner.ConnectorShape>
       </nestedChildShapes>
     </microsoft.VisualStudio.Modeling.DslDesigner.DiagramElements>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 8.67169108072917); (7.2 : 8.67169108072917)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 8.67169108072917); (7.2 : 8.67169108072917)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="f2d7a9dd-a135-4e2b-979a-1e2e84bad3fa" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="5e32b3b7-2361-4538-8ec6-4520e69a12d2" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 22.2817333984375); (0.63 : 23.4217333984375); (1.1 : 23.4217333984375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 22.2817333984375); (0.63 : 23.4217333984375); (1.1 : 23.4217333984375)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="1">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="29548062-555a-4ccf-936f-d7de72f22208" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipAsClassShapeMoniker Id="1131f544-689d-4c15-8e02-e6640a9fecdb" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 15.3501236979167); (7.2 : 15.3501236979167)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 15.3501236979167); (7.2 : 15.3501236979167)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="c5692d91-8703-448d-91f2-3b0cef6b1fd7" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="39b61c7b-8ccf-4ead-a5f7-38844455c7ad" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 6.88); (7.2 : 6.88)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 6.88); (7.2 : 6.88)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="f7d66a3c-b06c-47d0-b789-26c4076ee7b1" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="a0a3fcc2-f9b7-4b25-9906-08644f4dd7fe" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 2.05); (0.79 : 2.05); (0.79 : 0.91)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 2.05); (0.79 : 2.05); (0.79 : 0.91)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="1">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="60c3e863-e4fa-43cd-8f70-b42efbca1123" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="20e7d846-b701-4e90-b176-ac438a9cd8d6" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 2.05); (3.85 : 2.05)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 2.05); (3.85 : 2.05)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="60c3e863-e4fa-43cd-8f70-b42efbca1123" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="a737a9b2-52e8-48e3-8f53-e2caee4e731e" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 7.57); (7.2 : 7.57)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 7.57); (7.2 : 7.57)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="75d6362d-2fe1-4dc3-9f3f-0789a5550cac" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="f9dcb1af-cf37-488c-ac41-7206e68950b1" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 22.3117333984375); (0.63 : 22.7317333984375); (1.1 : 22.7317333984375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 22.3117333984375); (0.63 : 22.7317333984375); (1.1 : 22.7317333984375)]" fixedFrom="Caller" fixedTo="NotFixed" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="0">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="29548062-555a-4ccf-936f-d7de72f22208" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipAsClassShapeMoniker Id="6fd01be0-4199-4fcb-b521-79aa385b50dd" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 16.0401236979167); (7.2 : 16.0401236979167)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 16.0401236979167); (7.2 : 16.0401236979167)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="9f2752d9-1841-4d96-a7c1-3993d9e0795e" />
@@ -400,13 +400,13 @@
         <microsoft.VisualStudio.Modeling.DslDesigner.ConnectorShapeMoniker Id="5195f5a2-0ac2-4709-9a77-be12b632811b" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.MapConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(9.74666667163372 : 3.76); (9.74666667163372 : 4.21); (10.2166666716337 : 4.21)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="b41d9c0b-3525-411b-99eb-89ba3ee22303" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(9.74666667163372 : 3.76); (9.74666667163372 : 4.21); (10.2166666716337 : 4.21)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="b41d9c0b-3525-411b-99eb-89ba3ee22303" treeOrder="0">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="60cfe0a8-70c9-493b-9f23-28f1a82287c7" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ConnectorShapeMoniker Id="d7789ddc-c64f-44b3-ae3d-e7ef25c7adc2" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(9.74666667163372 : 3.79); (9.74666667163372 : 4.9); (10.2166666716337 : 4.9)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="b41d9c0b-3525-411b-99eb-89ba3ee22303" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(9.74666667163372 : 3.79); (9.74666667163372 : 4.9); (10.2166666716337 : 4.9)]" fixedFrom="Caller" fixedTo="NotFixed" TargetRelationshipDomainClassId="b41d9c0b-3525-411b-99eb-89ba3ee22303" treeOrder="1">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="60cfe0a8-70c9-493b-9f23-28f1a82287c7" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ConnectorShapeMoniker Id="b09bfa36-e45e-43ac-809e-1f1978a21e51" />
@@ -430,28 +430,28 @@
         <microsoft.VisualStudio.Modeling.DslDesigner.GeometryShapeShapeMoniker Id="8f9d6a89-c64d-4ed6-8f14-6d527144f1b1" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.MapConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 4.81); (0.79 : 4.81); (0.79 : 0.91)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="2">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 4.81); (0.79 : 4.81); (0.79 : 0.91)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="2">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="94a1404f-18a6-48f6-9544-0ac38d53025e" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="20e7d846-b701-4e90-b176-ac438a9cd8d6" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 4.81); (3.85 : 4.81)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 4.81); (3.85 : 4.81)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="94a1404f-18a6-48f6-9544-0ac38d53025e" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="f37dbf2b-ef0e-4d10-9217-3085f567e389" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 5.5); (7.2 : 5.5)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 5.5); (7.2 : 5.5)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="b9254844-aba3-4e25-964e-f5f28afa0c3f" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="821db125-8b84-4af8-a0b6-e0433abd0045" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 5.5); (4.14 : 5.5); (4.14 : 5.08)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 5.5); (4.14 : 5.5); (4.14 : 5.08)]" fixedFrom="NotFixed" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="b9254844-aba3-4e25-964e-f5f28afa0c3f" />
@@ -464,49 +464,49 @@
         <microsoft.VisualStudio.Modeling.DslDesigner.CompartmentShapeShapeMoniker Id="44c8a709-a6cd-4657-b23d-65866691e029" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.MapConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 6.19); (0.79 : 6.19); (0.79 : 0.91)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="3">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 6.19); (0.79 : 6.19); (0.79 : 0.91)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="3">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="e9e62eed-5809-4206-ba63-8aabf2ffd52e" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="20e7d846-b701-4e90-b176-ac438a9cd8d6" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 6.19); (3.85 : 6.19)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 6.19); (3.85 : 6.19)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="e9e62eed-5809-4206-ba63-8aabf2ffd52e" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="240c77ef-29c4-4325-8b44-328c35028e1e" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 8.67169108072917); (4.14 : 8.67169108072917); (4.14 : 6.43)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="2">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 8.67169108072917); (4.14 : 8.67169108072917); (4.14 : 6.43)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="2">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="f2d7a9dd-a135-4e2b-979a-1e2e84bad3fa" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="574f46a0-0f87-4ed8-9c37-f888418c2963" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 15.3501236979167); (4.14 : 15.3501236979167); (4.14 : 6.43)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="3">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 15.3501236979167); (4.14 : 15.3501236979167); (4.14 : 6.43)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="3">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="c5692d91-8703-448d-91f2-3b0cef6b1fd7" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="574f46a0-0f87-4ed8-9c37-f888418c2963" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 6.88); (4.14 : 6.88); (4.14 : 6.43)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 6.88); (4.14 : 6.88); (4.14 : 6.43)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="f7d66a3c-b06c-47d0-b789-26c4076ee7b1" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="574f46a0-0f87-4ed8-9c37-f888418c2963" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 7.57); (4.14 : 7.57); (4.14 : 6.43)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 7.57); (4.14 : 7.57); (4.14 : 6.43)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="1">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="75d6362d-2fe1-4dc3-9f3f-0789a5550cac" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="574f46a0-0f87-4ed8-9c37-f888418c2963" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 16.0401236979167); (4.14 : 16.0401236979167); (4.14 : 6.46)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="4">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 16.0401236979167); (4.14 : 16.0401236979167); (4.14 : 6.46)]" fixedFrom="NotFixed" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="4">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="9f2752d9-1841-4d96-a7c1-3993d9e0795e" />
@@ -519,26 +519,26 @@
         <microsoft.VisualStudio.Modeling.DslDesigner.CompartmentShapeShapeMoniker Id="ccbdd525-72c9-4f3f-99ee-9122e5d57d84" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.MapConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 20.3317333984375); (0.63 : 20.7817333984375); (1.1 : 20.7817333984375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="f66276b2-b10a-464f-9fe9-baaa9c657a4d" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 20.3317333984375); (0.63 : 20.7817333984375); (1.1 : 20.7817333984375)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="f66276b2-b10a-464f-9fe9-baaa9c657a4d" treeOrder="0">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="bbb89797-5a80-4411-ae9e-9c07c0738332" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="07075c06-9c44-44f8-8ebc-1d8b0d66580b" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 20.3617333984375); (0.63 : 21.4717333984375); (1.1 : 21.4717333984375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="f66276b2-b10a-464f-9fe9-baaa9c657a4d" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 20.3617333984375); (0.63 : 21.4717333984375); (1.1 : 21.4717333984375)]" fixedFrom="Caller" fixedTo="NotFixed" TargetRelationshipDomainClassId="f66276b2-b10a-464f-9fe9-baaa9c657a4d" treeOrder="1">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="bbb89797-5a80-4411-ae9e-9c07c0738332" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="d201e49a-0cf6-4403-b392-7c6b4893e029" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 2.74); (4.14 : 2.74); (4.14 : 2.29)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 2.74); (4.14 : 2.74); (4.14 : 2.29)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="69e79e40-ff4d-402d-98c0-df675baabbcd" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="197a037d-b686-4a6a-b35a-f351f8e7a097" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 2.74); (7.2 : 2.74)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 2.74); (7.2 : 2.74)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="69e79e40-ff4d-402d-98c0-df675baabbcd" />
@@ -551,54 +551,54 @@
         <microsoft.VisualStudio.Modeling.DslDesigner.ConnectorShapeMoniker Id="db694885-0ea0-4cff-ae0e-53b1777aa5f1" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.MapConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 3.43); (4.14 : 3.43); (4.14 : 2.29)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 3.43); (4.14 : 3.43); (4.14 : 2.29)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="1">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="c0e5f5c9-7a86-4570-ba35-89fc16065f8a" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="197a037d-b686-4a6a-b35a-f351f8e7a097" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 3.43); (7.2 : 3.43)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 3.43); (7.2 : 3.43)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="c0e5f5c9-7a86-4570-ba35-89fc16065f8a" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="e97c0b7b-b833-4e07-baf1-97371ace02e2" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 24.2317333984375); (0.63 : 24.6817333984375); (1.1 : 24.6817333984375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 24.2317333984375); (0.63 : 24.6817333984375); (1.1 : 24.6817333984375)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="0">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="094a803e-1702-450a-848e-99a607d0d07e" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipAsClassShapeMoniker Id="1184cd19-a5c7-4d2f-8a54-c7d7dca25989" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 4.12); (4.14 : 4.12); (4.14 : 2.32)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="2">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(4.95 : 4.12); (4.14 : 4.12); (4.14 : 2.32)]" fixedFrom="NotFixed" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="2">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="ee9dc4bf-b2fe-44ee-90a6-aaec0fb2faf4" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="197a037d-b686-4a6a-b35a-f351f8e7a097" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 4.12); (7.2 : 4.12)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(6.3 : 4.12); (7.2 : 4.12)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="ee9dc4bf-b2fe-44ee-90a6-aaec0fb2faf4" />
         <microsoft.VisualStudio.Modeling.DslDesigner.ClassShapeMoniker Id="678755c9-3614-49ee-becf-2e3fc9e5893c" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 24.2617333984375); (0.63 : 25.3717333984375); (1.1 : 25.3717333984375)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="1">
+    <microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector edgePoints="[(0.63 : 24.2617333984375); (0.63 : 25.3717333984375); (1.1 : 25.3717333984375)]" fixedFrom="Caller" fixedTo="NotFixed" TargetRelationshipDomainClassId="43d6d35f-65cb-48ec-897e-d05e5aec6d4d" treeOrder="1">
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.InheritancePortMoniker Id="094a803e-1702-450a-848e-99a607d0d07e" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipAsClassShapeMoniker Id="09541514-b7d6-4ea3-a52b-ac025df31984" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.InheritanceConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 1.36); (0.79 : 1.36); (0.79 : 0.94)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(1.6 : 1.36); (0.79 : 1.36); (0.79 : 0.94)]" fixedFrom="NotFixed" fixedTo="Caller" TargetRelationshipDomainClassId="e206851f-31ea-4d49-a443-b8115b3e726e" multiplicitySymbol="0..*" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="f2898a58-65e2-4bad-be04-b2e6a3c6f2fb" />
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipPortMoniker Id="20e7d846-b701-4e90-b176-ac438a9cd8d6" />
       </nodes>
     </microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector>
-    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 1.36); (3.85 : 1.36)]" fixedFrom="Caller" fixedTo="Caller" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
+    <microsoft.VisualStudio.Modeling.DslDesigner.RoleConnector edgePoints="[(2.95 : 1.36); (3.85 : 1.36)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="e37b3710-5105-4dea-b3dc-08d96f12af2d" multiplicitySymbol="1..1" treeOrder="0">
       <relativeChildShapes />
       <nodes>
         <microsoft.VisualStudio.Modeling.DslDesigner.RelationshipShapeMoniker Id="f2898a58-65e2-4bad-be04-b2e6a3c6f2fb" />
diff --git a/src/Dsl/GeneratedCode/DomainClasses.cs b/src/Dsl/GeneratedCode/DomainClasses.cs
index c00d306f0..06d9cb4c4 100644
--- a/src/Dsl/GeneratedCode/DomainClasses.cs
+++ b/src/Dsl/GeneratedCode/DomainClasses.cs
@@ -13526,6 +13526,6 @@ namespace Sawczyn.EFDesigner.EFModel
    /// </summary>
 	partial class ModelRoot
 	{
-		public const string DSLVersion = "3.0.5.2";
+		public const string DSLVersion = "3.0.6.0";
 	}
 }
diff --git a/src/Dsl/GeneratedCode/SerializationHelper.cs b/src/Dsl/GeneratedCode/SerializationHelper.cs
index b23838afc..e2f4521ef 100644
--- a/src/Dsl/GeneratedCode/SerializationHelper.cs
+++ b/src/Dsl/GeneratedCode/SerializationHelper.cs
@@ -1168,7 +1168,7 @@ public virtual void WriteRootElement(DslModeling::SerializationContext serializa
 				// Only model has schema, diagram has no schema.
 				rootElementSettings.SchemaTargetNamespace = "http://schemas.microsoft.com/dsltools/EFModel";
 			}
-			rootElementSettings.Version = new global::System.Version("3.0.5.2");
+			rootElementSettings.Version = new global::System.Version("3.0.6.0");
 	
 			// Carry out the normal serialization.
 			rootSerializer.Write(serializationContext, rootElement, writer, rootElementSettings);
@@ -1190,7 +1190,7 @@ protected virtual void CheckVersion(DslModeling::SerializationContext serializat
 				throw new global::System.ArgumentNullException("reader");
 			#endregion
 	
-			global::System.Version expectedVersion = new global::System.Version("3.0.5.2");
+			global::System.Version expectedVersion = new global::System.Version("3.0.6.0");
 			string dslVersionStr = reader.GetAttribute("dslVersion");
 			if (dslVersionStr != null)
 			{
diff --git a/src/DslPackage/Commands.vsct b/src/DslPackage/Commands.vsct
index 2c7324e60..bc6944f7e 100644
--- a/src/DslPackage/Commands.vsct
+++ b/src/DslPackage/Commands.vsct
@@ -41,22 +41,24 @@
       </Menus>
 
       <Groups>
+
          <Group guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram" priority="0x0100">
             <!-- These symbols are defined in GeneratedVSCT.vsct -->
             <Parent guid="guidCmdSet" id="menuidContext" />
          </Group>
 
-         <Group guid="guidEFDiagramMenuCmdSet" id="grpidSelect" priority="0x0000">
+         <Group guid="guidEFDiagramMenuCmdSet" id="grpidSelect" priority="0x11A">
             <Parent guid="guidEFDiagramMenuCmdSet" id="menuidSelect"/>
          </Group>
 
-         <Group guid="guidEFDiagramMenuCmdSet" id="grpidAlign" priority="0x0000">
+         <Group guid="guidEFDiagramMenuCmdSet" id="grpidAlign" priority="0x011B">
             <Parent guid="guidEFDiagramMenuCmdSet" id="menuidAlign"/>
          </Group>
 
-         <Group guid="guidEFDiagramMenuCmdSet" id="grpidResize" priority="0x0000">
+         <Group guid="guidEFDiagramMenuCmdSet" id="grpidResize" priority="0x011C">
             <Parent guid="guidEFDiagramMenuCmdSet" id="menuidAlign"/>
          </Group>
+
       </Groups>
 
       <Buttons>
@@ -70,7 +72,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidLayoutDiagram" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidLayoutDiagram" priority="0x0101" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -79,16 +81,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSaveAsImage" priority="0x0100" type="Button">
-            <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
-            <CommandFlag>DynamicVisibility</CommandFlag>
-            <Strings>
-               <ButtonText>Save as Image</ButtonText>
-               <CommandName>SaveAsImage</CommandName>
-            </Strings>
-         </Button>
-
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidHideShape" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidHideShape" priority="0x0102" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -97,7 +90,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidShowShape" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidShowShape" priority="0x0103" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -106,61 +99,52 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidRemoveShape" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidGenerateCode" priority="0x0104" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Remove from Diagram</ButtonText>
-               <CommandName>RemoveFromDiagram</CommandName>
+               <ButtonText>Generate Code</ButtonText>
+               <CommandName>GenerateCode</CommandName>
             </Strings>
          </Button>
-
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidMergeAssociations" priority="0x0100" type="Button">
+         
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeProperties" priority="0x0105" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Merge Unidirectional Associations</ButtonText>
-               <CommandName>MergeAssociations</CommandName>
+               <ButtonText>Add Properties Via Code</ButtonText>
+               <CommandName>AddPropertiesViaCode</CommandName>
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSplitAssociation" priority="0x0100" type="Button">
-            <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
-            <CommandFlag>DynamicVisibility</CommandFlag>
-            <Strings>
-               <ButtonText>Split Bidirectional Association</ButtonText>
-               <CommandName>SplitAssociation</CommandName>
-            </Strings>
-         </Button>
-         
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSplitAssociation" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSaveAsImage" priority="0x0106" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Split Bidirectional Association</ButtonText>
-               <CommandName>SplitAssociation</CommandName>
+               <ButtonText>Save as Image</ButtonText>
+               <CommandName>SaveAsImage</CommandName>
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAddForeignKeys" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidImageToClipboard" priority="0x0107" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Add Foreign Key Properties</ButtonText>
-               <CommandName>AddForeignKeys</CommandName>
+               <ButtonText>Copy Image to Clipboard</ButtonText>
+               <CommandName>ImageToClipboard</CommandName>
             </Strings>
          </Button>
-         
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidDelForeignKeys" priority="0x0100" type="Button">
+
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeValues" priority="0x0108" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Remove Foreign Key Properties</ButtonText>
-               <CommandName>RemoveForeignKeys</CommandName>
+               <ButtonText>Add Values Via Code</ButtonText>
+               <CommandName>AddValuesViaCode</CommandName>
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidExpandSelected" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidExpandSelected" priority="0x0109" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -169,43 +153,52 @@
             </Strings>
          </Button>
          
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidGenerateCode" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidMergeAssociations" priority="0x010A" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Generate Code</ButtonText>
-               <CommandName>GenerateCode</CommandName>
+               <ButtonText>Merge Unidirectional Associations</ButtonText>
+               <CommandName>MergeAssociations</CommandName>
             </Strings>
          </Button>
-         
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidLoadNuGet" priority="0x0100" type="Button">
+
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSplitAssociation" priority="0x010B" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Load NuGet Packages</ButtonText>
-               <CommandName>LoadNuGetPkgs</CommandName>
+               <ButtonText>Split Bidirectional Association</ButtonText>
+               <CommandName>SplitAssociation</CommandName>
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeProperties" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidRemoveShape" priority="0x010C" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Add Properties Via Code</ButtonText>
-               <CommandName>AddPropertiesViaCode</CommandName>
+               <ButtonText>Remove from Diagram</ButtonText>
+               <CommandName>RemoveFromDiagram</CommandName>
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeValues" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAddForeignKeys" priority="0x010D" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
-               <ButtonText>Add Values Via Code</ButtonText>
-               <CommandName>AddValuesViaCode</CommandName>
+               <ButtonText>Add Foreign Key Properties</ButtonText>
+               <CommandName>AddForeignKeys</CommandName>
+            </Strings>
+         </Button>
+         
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidDelForeignKeys" priority="0x010E" type="Button">
+            <Parent guid="guidEFDiagramMenuCmdSet" id="grpidEFDiagram"/>
+            <CommandFlag>DynamicVisibility</CommandFlag>
+            <Strings>
+               <ButtonText>Remove Foreign Key Properties</ButtonText>
+               <CommandName>RemoveForeignKeys</CommandName>
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectClasses" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectClasses" priority="0x010F" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidSelect"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -214,7 +207,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectEnums" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectEnums" priority="0x0110" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidSelect"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -223,7 +216,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectAssocs" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectAssocs" priority="0x0111" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidSelect"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -232,7 +225,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectUnidir" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectUnidir" priority="0x0112" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidSelect"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -241,7 +234,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectBidir" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidSelectBidir" priority="0x0113" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidSelect"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -250,7 +243,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignLeft" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignLeft" priority="0x0114" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidAlign"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -259,7 +252,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignRight" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignRight" priority="0x0115" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidAlign"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -268,7 +261,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignTop" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignTop" priority="0x0116" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidAlign"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -277,7 +270,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignBottom" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignBottom" priority="0x0117" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidAlign"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -286,7 +279,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignHCenter" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignHCenter" priority="0x0118" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidAlign"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -295,7 +288,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignVCenter" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidAlignVCenter" priority="0x0119" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidAlign"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -304,7 +297,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidResizeWidest" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidResizeWidest" priority="0x011D" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidResize"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -313,7 +306,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidResizeNarrowest" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidResizeNarrowest" priority="0x011E" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidResize"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -322,7 +315,7 @@
             </Strings>
          </Button>
          
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceHoriz" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceHoriz" priority="0x011F" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidResize"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -331,7 +324,7 @@
             </Strings>
          </Button>
 
-         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceVert" priority="0x0100" type="Button">
+         <Button guid="guidEFDiagramMenuCmdSet" id="cmdidEqualSpaceVert" priority="0x0120" type="Button">
             <Parent guid="guidEFDiagramMenuCmdSet" id="grpidResize"/>
             <CommandFlag>DynamicVisibility</CommandFlag>
             <Strings>
@@ -382,6 +375,7 @@
       <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidLoadNuGet"           editor="guidEditor" key1="N"         mod1="CONTROL ALT" />
       <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeProperties"   editor="guidEditor" key1="C"         mod1="CONTROL ALT" />
       <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidSaveAsImage"         editor="guidEditor" key1="I"         mod1="CONTROL" />
+      <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidImageToClipboard"    editor="guidEditor" key1="I"         mod1="CONTROL SHIFT" />
       <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidAlignLeft"           editor="guidEditor" key1="VK_LEFT"   mod1="CONTROL SHIFT" />
       <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidAlignRight"          editor="guidEditor" key1="VK_RIGHT"  mod1="CONTROL SHIFT" />
       <KeyBinding guid="guidEFDiagramMenuCmdSet" id="cmdidAlignTop"            editor="guidEditor" key1="VK_UP"     mod1="CONTROL SHIFT" />
@@ -400,6 +394,7 @@
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidGenerateCode"      context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeProperties" context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidSaveAsImage"       context="guidEditor"/>
+      <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidImageToClipboard"  context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidLoadNuGet"         context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidAddCodeValues"     context="guidEditor"/>
       <VisibilityItem guid="guidEFDiagramMenuCmdSet" id="cmdidExpandSelected"    context="guidEditor"/>
@@ -455,6 +450,7 @@
          <IDSymbol name="cmdidRemoveShape"               value="0x0001E"/>
          <IDSymbol name="cmdidAddForeignKeys"            value="0x0001F"/>
          <IDSymbol name="cmdidDelForeignKeys"            value="0x00020"/>
+         <IDSymbol name="cmdidImageToClipboard"          value="0x00021"/>
 
          <IDSymbol name="menuidSelect"                   value="0x01100"/>
          <IDSymbol name="grpidSelect"                    value="0x01150"/>
diff --git a/src/DslPackage/CustomCode/CommandSet.cs b/src/DslPackage/CustomCode/CommandSet.cs
index 57c7b5dd1..bbb6609bf 100644
--- a/src/DslPackage/CustomCode/CommandSet.cs
+++ b/src/DslPackage/CustomCode/CommandSet.cs
@@ -47,6 +47,7 @@ internal partial class EFModelCommandSet
       private const int cmdidRemoveShape = 0x001E;
       private const int cmdidAddForeignKeys = 0x001F;
       private const int cmdidDelForeignKeys = 0x0020;
+      private const int cmdidImageToClipboard = 0x0021;
 
       private const int cmdidSelectClasses = 0x0101;
       private const int cmdidSelectEnums = 0x0102;
@@ -178,6 +179,15 @@ protected override IList<MenuCommand> GetMenuCommands()
 
          #endregion
 
+         #region imageToClipboard
+
+         DynamicStatusMenuCommand imageToClipboard =
+            new DynamicStatusMenuCommand(OnStatusImageToClipboard, OnMenuImageToClipboard, new CommandID(guidEFDiagramMenuCmdSet, cmdidImageToClipboard));
+
+         commands.Add(imageToClipboard);
+
+         #endregion
+
          #region loadNuGetCommand
 
 #pragma warning disable 612
@@ -1018,6 +1028,31 @@ private ImageFormat GetFormat(string fileName)
 
       #endregion
 
+      #region Image to Clipboard
+
+      private void OnStatusImageToClipboard(object sender, EventArgs e)
+      {
+         if (sender is MenuCommand command)
+         {
+            command.Visible = true;
+            command.Enabled = IsDiagramSelected() && !IsCurrentDiagramEmpty();
+         }
+      }
+
+      private void OnMenuImageToClipboard(object sender, EventArgs e)
+      {
+         Diagram currentDiagram = CurrentDocView?.CurrentDiagram;
+
+         if (currentDiagram == null)
+            return;
+
+         Bitmap bitmap = currentDiagram.CreateBitmap(currentDiagram.NestedChildShapes,
+                                                     Diagram.CreateBitmapPreference.FavorClarityOverSmallSize);
+         Clipboard.SetImage(bitmap);
+      }
+
+      #endregion
+
       #region Load NuGet
 
       [Obsolete]
diff --git a/src/DslPackage/GeneratedCode/Constants.cs b/src/DslPackage/GeneratedCode/Constants.cs
index d5ce65d25..a1ae2c844 100644
--- a/src/DslPackage/GeneratedCode/Constants.cs
+++ b/src/DslPackage/GeneratedCode/Constants.cs
@@ -18,7 +18,7 @@ internal static partial class Constants
       [global::System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
       public const string CompanyName = @"Michael Sawczyn";
       [global::System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-      public const string ProductVersion = "3.0.5.2";
+      public const string ProductVersion = "3.0.6.0";
 
       // Menu definitions
       public static readonly global::System.ComponentModel.Design.CommandID EFModelDiagramMenu = new global::System.ComponentModel.Design.CommandID(new global::System.Guid(EFModelCommandSetId), 0x10000);
diff --git a/src/DslPackage/GeneratedCode/Package.cs b/src/DslPackage/GeneratedCode/Package.cs
index 6f7183653..ee4c3a699 100644
--- a/src/DslPackage/GeneratedCode/Package.cs
+++ b/src/DslPackage/GeneratedCode/Package.cs
@@ -182,7 +182,7 @@ namespace Sawczyn.EFDesigner.EFModel
    /// <summary>
    /// Double-derived class to allow easier code customization.
    /// </summary>
-   [VSShell::ProvideMenuResource("1000.ctmenu", version: 40)]
+   [VSShell::ProvideMenuResource("1000.ctmenu", version: 43)]
    [VSShell::ProvideToolboxItems(1)]
    [global::Microsoft.VisualStudio.TextTemplating.VSHost.ProvideDirectiveProcessor(typeof(global::Sawczyn.EFDesigner.EFModel.EFModelDirectiveProcessor), global::Sawczyn.EFDesigner.EFModel.EFModelDirectiveProcessor.EFModelDirectiveProcessorName, "A directive processor that provides access to EFModel files")]
    [global::System.Runtime.InteropServices.Guid(Constants.EFModelPackageId)]
diff --git a/src/DslPackage/GeneratedCode/Package.tt b/src/DslPackage/GeneratedCode/Package.tt
index 6ff9564ab..c6c29bcb7 100644
--- a/src/DslPackage/GeneratedCode/Package.tt
+++ b/src/DslPackage/GeneratedCode/Package.tt
@@ -22,7 +22,7 @@ namespace <#= CodeGenerationUtilities.GetPackageNamespace(this.Dsl) #>
    /// <summary>
    /// Double-derived class to allow easier code customization.
    /// </summary>
-   [VSShell::ProvideMenuResource("1000.ctmenu", version: 40)]
+   [VSShell::ProvideMenuResource("1000.ctmenu", version: 43)]
    [VSShell::ProvideToolboxItems(1)]
    [global::Microsoft.VisualStudio.TextTemplating.VSHost.ProvideDirectiveProcessor(typeof(global::<#= this.Dsl.Namespace #>.<#= directiveName #>DirectiveProcessor), global::<#= this.Dsl.Namespace #>.<#= directiveName #>DirectiveProcessor.<#= directiveName #>DirectiveProcessorName, "A directive processor that provides access to <#= directiveName #> files")]
    [global::System.Runtime.InteropServices.Guid(Constants.<#= dslName #>PackageId)]
diff --git a/src/DslPackage/Parsers/EF6Parser.exe b/src/DslPackage/Parsers/EF6Parser.exe
index 643262aa6..66391254c 100644
Binary files a/src/DslPackage/Parsers/EF6Parser.exe and b/src/DslPackage/Parsers/EF6Parser.exe differ
diff --git a/src/DslPackage/Parsers/EFCore2Parser.exe b/src/DslPackage/Parsers/EFCore2Parser.exe
index 5fc210b14..85150ea2c 100644
Binary files a/src/DslPackage/Parsers/EFCore2Parser.exe and b/src/DslPackage/Parsers/EFCore2Parser.exe differ
diff --git a/src/DslPackage/Parsers/EFCore3Parser.exe b/src/DslPackage/Parsers/EFCore3Parser.exe
index 35736f422..ddd0cd729 100644
Binary files a/src/DslPackage/Parsers/EFCore3Parser.exe and b/src/DslPackage/Parsers/EFCore3Parser.exe differ
diff --git a/src/DslPackage/Parsers/EFCore5Parser.exe b/src/DslPackage/Parsers/EFCore5Parser.exe
index d469004fa..232fb85b4 100644
Binary files a/src/DslPackage/Parsers/EFCore5Parser.exe and b/src/DslPackage/Parsers/EFCore5Parser.exe differ
diff --git a/src/DslPackage/source.extension.vsixmanifest b/src/DslPackage/source.extension.vsixmanifest
index dd6a66cb5..8878f66fd 100644
--- a/src/DslPackage/source.extension.vsixmanifest
+++ b/src/DslPackage/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="56bbe1ba-aaee-4883-848f-e3c8656f8db2" Version="3.0.5.2" Language="en-US" Publisher="Michael Sawczyn" />
+    <Identity Id="56bbe1ba-aaee-4883-848f-e3c8656f8db2" Version="3.0.6.0" Language="en-US" Publisher="Michael Sawczyn" />
     <DisplayName>Entity Framework Visual Editor</DisplayName>
     <Description>Entity Framework visual editor for EF6, EFCore and beyond.</Description>
     <Icon>Logo.ico</Icon>