diff --git a/.project b/.project
index 8ff6750..1de2c92 100644
--- a/.project
+++ b/.project
@@ -33,5 +33,14 @@
 				<arguments>1.0-name-matches-false-false-build</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1722586997184</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>
diff --git a/build/com.opcoach.genmodeladdon.feature/.project b/build/com.opcoach.genmodeladdon.feature/.project
index f89d0b4..12afc0c 100644
--- a/build/com.opcoach.genmodeladdon.feature/.project
+++ b/build/com.opcoach.genmodeladdon.feature/.project
@@ -10,8 +10,25 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997183</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/build/com.opcoach.genmodeladdon.repository/.project b/build/com.opcoach.genmodeladdon.repository/.project
index 7f5e4c3..72ebf6a 100644
--- a/build/com.opcoach.genmodeladdon.repository/.project
+++ b/build/com.opcoach.genmodeladdon.repository/.project
@@ -10,8 +10,25 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.UpdateSiteNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997185</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/build/com.opcoach.genmodeladdon.tp/.project b/build/com.opcoach.genmodeladdon.tp/.project
index d789e29..8cfea91 100644
--- a/build/com.opcoach.genmodeladdon.tp/.project
+++ b/build/com.opcoach.genmodeladdon.tp/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997187</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target b/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target
index 94426f5..a92bb87 100644
--- a/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target
+++ b/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="GMA SimRel0324" sequenceNumber="1710846668">
+<target name="GMA SimRel01224" sequenceNumber="1735291302">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.34.0.v20240227-0940"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.34.0.v20240227-0940"/>
-      <unit id="org.eclipse.xtext.xbase.feature.group" version="2.34.0.v20240227-0940"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.37.0.v20241119-0857"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.37.0.v20241119-0857"/>
+      <unit id="org.eclipse.xtext.xbase.feature.group" version="2.37.0.v20241119-0857"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.37.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rcp.feature.group" version="4.31.0.v20240229-0520"/>
-      <unit id="org.eclipse.ant.core" version="3.7.300.v20231214-1526"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.34.0.v20241120-1800"/>
+      <unit id="org.eclipse.ant.core" version="3.7.500.v20241028-1712"/>
       <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.15.300.v20240229-0520"/>
-      <unit id="org.eclipse.emf.ant" version="2.12.0.v20230211-1150"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.37.0.v20240203-1010"/>
-      <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.37.0.v20240203-1010"/>
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.17.0.v20240224-1400"/>
-      <unit id="org.eclipse.emf.importer.ecore" version="2.11.0.v20230211-1150"/>
-      <unit id="org.eclipse.emf.importer" version="2.13.0.v20230211-1150"/>
-      <unit id="org.eclipse.ant.launching" version="1.4.300.v20240110-1213"/>
-      <unit id="org.eclipse.core.runtime" version="3.31.0.v20240215-1631"/>
-      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
-      <unit id="org.eclipse.jdt.junit.runtime" version="3.7.400.v20231214-1952"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.31.0.v20240229-1022"/>
-      <unit id="com.google.guava" version="33.0.0.jre"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.16.100.v20241120-1800"/>
+      <unit id="org.eclipse.emf.ant" version="2.13.0.v20240604-0832"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.40.0.v20241018-1213"/>
+      <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.40.0.v20240911-1442"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.20.0.v20241116-0534"/>
+      <unit id="org.eclipse.emf.importer.ecore" version="2.12.0.v20240604-0832"/>
+      <unit id="org.eclipse.emf.importer" version="2.14.0.v20240604-0832"/>
+      <unit id="org.eclipse.ant.launching" version="1.4.600.v20241028-1712"/>
+      <unit id="org.eclipse.core.runtime" version="3.32.0.v20241003-0436"/>
+      <unit id="org.junit" version="4.13.2.v20240929-1000"/>
+      <unit id="org.eclipse.jdt.junit.runtime" version="3.7.500.v20240702-1918"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.34.0.v20241120-1800"/>
+      <unit id="com.google.guava" version="33.3.1.jre"/>
       <unit id="jakarta.annotation-api" version="2.1.1"/>
       <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
-      <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
-      <unit id="org.apache.commons.commons-io" version="2.15.1"/>
-      <repository location="https://download.eclipse.org/releases/2024-03"/>
+      <unit id="org.apache.log4j" version="1.2.25"/>
+      <unit id="org.apache.commons.commons-io" version="2.17.0"/>
+      <repository location="https://download.eclipse.org/releases/2024-12"/>
     </location>
   </locations>
 </target>
diff --git a/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd b/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd
index 1492a24..92a1712 100644
--- a/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd
+++ b/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd
@@ -1,16 +1,16 @@
-target "GMA SimRel0324"
+target "GMA SimRel01224"
 
 with source requirements 
 
 
-location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/" {
+location "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.37.0/" {
   org.eclipse.xtext.sdk.feature.group
   org.eclipse.xtend.sdk.feature.group 
   org.eclipse.xtext.xbase.feature.group
 }
 
 
-location "https://download.eclipse.org/releases/2024-03" {
+location "https://download.eclipse.org/releases/2024-12" {
 	
 	org.eclipse.rcp.feature.group
 	org.eclipse.ant.core
diff --git a/build/com.opcoach.genmodeladdon.tp/pom.xml b/build/com.opcoach.genmodeladdon.tp/pom.xml
index 7eca805..e18078f 100644
--- a/build/com.opcoach.genmodeladdon.tp/pom.xml
+++ b/build/com.opcoach.genmodeladdon.tp/pom.xml
@@ -12,6 +12,6 @@
 
 	<artifactId>com.opcoach.genmodeladdon.tp</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<version>4.31.0</version>
+	<version>4.34.0</version>
 	
 </project>
diff --git a/com.opcoach.genmodeladdon.core.test/.project b/com.opcoach.genmodeladdon.core.test/.project
index 9733b10..3c9540f 100644
--- a/com.opcoach.genmodeladdon.core.test/.project
+++ b/com.opcoach.genmodeladdon.core.test/.project
@@ -20,9 +20,26 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997181</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.opcoach.genmodeladdon.core.test/.settings/org.eclipse.core.resources.prefs b/com.opcoach.genmodeladdon.core.test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b80..0000000
--- a/com.opcoach.genmodeladdon.core.test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/com.opcoach.genmodeladdon.core.test/.settings/org.eclipse.m2e.core.prefs b/com.opcoach.genmodeladdon.core.test/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/com.opcoach.genmodeladdon.core.test/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/com.opcoach.genmodeladdon.core/.project b/com.opcoach.genmodeladdon.core/.project
index ea0cebe..e675006 100644
--- a/com.opcoach.genmodeladdon.core/.project
+++ b/com.opcoach.genmodeladdon.core/.project
@@ -25,10 +25,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997180</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.opcoach.genmodeladdon.core/.settings/org.eclipse.core.resources.prefs b/com.opcoach.genmodeladdon.core/.settings/org.eclipse.core.resources.prefs
index 010fb0e..611fb61 100644
--- a/com.opcoach.genmodeladdon.core/.settings/org.eclipse.core.resources.prefs
+++ b/com.opcoach.genmodeladdon.core/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/com/opcoach/genmodeladdon/core=ISO-8859-1
 encoding//src/com/opcoach/genmodeladdon/core/GenerateAntFileForCodeGeneration.xtend=ISO-8859-1
-encoding/<project>=UTF-8
diff --git a/com.opcoach.genmodeladdon.core/.settings/org.eclipse.m2e.core.prefs b/com.opcoach.genmodeladdon.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/com.opcoach.genmodeladdon.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/com.opcoach.genmodeladdon.sample/.classpath b/com.opcoach.genmodeladdon.sample/.classpath
index c578d8e..bc3587d 100644
--- a/com.opcoach.genmodeladdon.sample/.classpath
+++ b/com.opcoach.genmodeladdon.sample/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen/"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.opcoach.genmodeladdon.sample/.project b/com.opcoach.genmodeladdon.sample/.project
index 5859106..6b859cc 100644
--- a/com.opcoach.genmodeladdon.sample/.project
+++ b/com.opcoach.genmodeladdon.sample/.project
@@ -20,10 +20,27 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.sirius.nature.modelingproject</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997186</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.opcoach.genmodeladdon.sample/.settings/org.eclipse.core.resources.prefs b/com.opcoach.genmodeladdon.sample/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b80..0000000
--- a/com.opcoach.genmodeladdon.sample/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/com.opcoach.genmodeladdon.sample/.settings/org.eclipse.m2e.core.prefs b/com.opcoach.genmodeladdon.sample/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/com.opcoach.genmodeladdon.sample/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/com.opcoach.genmodeladdon.sample/build.properties b/com.opcoach.genmodeladdon.sample/build.properties
index 3b8960a..67aac73 100644
--- a/com.opcoach.genmodeladdon.sample/build.properties
+++ b/com.opcoach.genmodeladdon.sample/build.properties
@@ -7,5 +7,4 @@ bin.includes = .,\
                plugin.properties,\
                sampleProject.zip
 jars.compile.order = .
-source.. = src-gen/
 output.. = bin/
diff --git a/com.opcoach.genmodeladdon.ui/.project b/com.opcoach.genmodeladdon.ui/.project
index 014ff65..4fee9b8 100644
--- a/com.opcoach.genmodeladdon.ui/.project
+++ b/com.opcoach.genmodeladdon.ui/.project
@@ -20,9 +20,26 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1722586997188</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/com.opcoach.genmodeladdon.ui/.settings/org.eclipse.core.resources.prefs b/com.opcoach.genmodeladdon.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b80..0000000
--- a/com.opcoach.genmodeladdon.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/com.opcoach.genmodeladdon.ui/.settings/org.eclipse.m2e.core.prefs b/com.opcoach.genmodeladdon.ui/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/com.opcoach.genmodeladdon.ui/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/pom.xml b/pom.xml
index be4ef87..0f18403 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho-version>4.0.6</tycho-version>
+		<tycho-version>4.0.10</tycho-version>
 	</properties>
 
 
@@ -39,7 +39,7 @@
 						<artifact>
 							<groupId>com.opcoach.genmodeladdon</groupId>
 							<artifactId>com.opcoach.genmodeladdon.tp</artifactId>
-							<version>4.31.0</version>
+							<version>4.34.0</version>
 						</artifact>
 					</target>
 					<environments>