diff --git a/Dockerfile-go b/Dockerfile-go
index 5b7d4ad..e71cc65 100644
--- a/Dockerfile-go
+++ b/Dockerfile-go
@@ -6,7 +6,7 @@ INCLUDE+ Dockerfile-base
 FROM openjdk:16-alpine AS jvm
 COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /soft.generator.go/
 WORKDIR /soft.generator.go
-RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.9.2.jar > java.modules \
+RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.10.0.jar > java.modules \
  && jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator
 
 # Build result stage
@@ -14,4 +14,4 @@ FROM alpine
 COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /usr/share/soft.generator.go/
 COPY --from=jvm /java-generator /usr/lib/jvm/java-generator
 
-ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.9.2.jar"]
+ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.10.0.jar"]
diff --git a/Makefile b/Makefile
index 51bfc55..8a57633 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ packages := go ts cpp common
 soft.generators.version := 1.6.0
 soft.generator.common.version := 1.4.1
 soft.generator.cpp.version := 1.2.4
-soft.generator.go.version := 1.9.2
+soft.generator.go.version := 1.10.0
 soft.generator.ts.version := 1.5.4
 
 export DOCKER_BUILDKIT=1
diff --git a/soft.generators/soft.generator.go/META-INF/MANIFEST.MF b/soft.generators/soft.generator.go/META-INF/MANIFEST.MF
index 168dfb3..5ed7687 100644
--- a/soft.generators/soft.generator.go/META-INF/MANIFEST.MF
+++ b/soft.generators/soft.generator.go/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
 Bundle-ManifestVersion: 2
 Bundle-Name: Soft Generator Go
 Bundle-SymbolicName: soft.generator.go
-Bundle-Version: 1.9.2
+Bundle-Version: 1.10.0
 Export-Package: soft.generator.go,soft.generator.go.lib,soft.generator
  .go.lib.factory,soft.generator.go.lib.pack,soft.generator.go.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/soft.generators/soft.generator.go/pom.xml b/soft.generators/soft.generator.go/pom.xml
index 3edddc7..764ef0a 100644
--- a/soft.generators/soft.generator.go/pom.xml
+++ b/soft.generators/soft.generator.go/pom.xml
@@ -8,7 +8,7 @@
       <version>1.6.0</version>
    </parent>
    <artifactId>soft.generator.go</artifactId>
-   <version>1.9.2</version>
+   <version>1.10.0</version>
    <dependencies>
       <dependency>
          <groupId>soft.generators</groupId>
diff --git a/soft.generators/soft.generator.go/src/soft/generator/go/tests/generateMock.mtl b/soft.generators/soft.generator.go/src/soft/generator/go/tests/generateMock.mtl
index 9aad55a..5c0c3db 100644
--- a/soft.generators/soft.generator.go/src/soft/generator/go/tests/generateMock.mtl
+++ b/soft.generators/soft.generator.go/src/soft/generator/go/tests/generateMock.mtl
@@ -26,14 +26,17 @@
 [query public getMockExtends(aClass : EClass ) : Sequence(String) =
     let extendsClass : EClass = aClass.getClassExtendsClass() in
     if ( extendsClass.oclIsUndefined() ) then
+		let aPackage : EPackage = aClass.ePackage in 
 		let ecore : EPackage = getEcorePackage() in
-		if ( aClass.isMapEntry() ) then
-			Sequence{ ecore.getQualifiedInterfaceIdentifier('MockEObjectInternal'), ecore.getQualifiedInterfaceIdentifier('MockEMapEntry')}
-        else if ( aClass.name = 'EObject' ) then
+		if ( aClass.name = 'EObject' ) then
             Sequence{ecore.getQualifiedInterfaceIdentifier('MockENotifier')}
+		else if ( aPackage.hasPackageProperty('rootExtendsMock') ) then
+			aPackage.getPackageProperty('rootExtendsMock')
+		else if ( aClass.isMapEntry() ) then
+			Sequence{ ecore.getQualifiedMockIdentifier('MockEObjectInternal'), ecore.getQualifiedInterfaceIdentifier('MockEMapEntry')}
         else
-            Sequence{ecore.getQualifiedInterfaceIdentifier('MockEObjectInternal')}
-        endif endif
+            Sequence{ecore.getQualifiedMockIdentifier('MockEObjectInternal')}
+        endif endif endif
     else
         Sequence{ extendsClass.getQualifiedMockIdentifier()}
     endif