diff --git a/org.lflang.product/.project b/org.lflang.product/.project
index ea005bcd..d1dd73c7 100644
--- a/org.lflang.product/.project
+++ b/org.lflang.product/.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>1694735550775</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/org.lflang.rca/.project b/org.lflang.rca/.project
index 1d227f52..ed7dcf91 100644
--- a/org.lflang.rca/.project
+++ b/org.lflang.rca/.project
@@ -5,7 +5,24 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1694735550777</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/org.lflang.sdk/.project b/org.lflang.sdk/.project
index 9d43eadb..8d9fca03 100644
--- a/org.lflang.sdk/.project
+++ b/org.lflang.sdk/.project
@@ -5,7 +5,24 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1694735550778</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/org.lflang.targetplatform/org.lflang.targetplatform.target b/org.lflang.targetplatform/org.lflang.targetplatform.target
index b09e3cdd..e6d556e4 100644
--- a/org.lflang.targetplatform/org.lflang.targetplatform.target
+++ b/org.lflang.targetplatform/org.lflang.targetplatform.target
@@ -42,6 +42,7 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="jakarta.activation" version="0.0.0"/>
+      <unit id="com.google.gson" version="0.0.0"/>
       <unit id="javax.activation" version="0.0.0"/>
       <unit id="javaewah" version="0.0.0"/>
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
diff --git a/org.lflang.ui/.project b/org.lflang.ui/.project
index bd28c3c8..6d25b0be 100644
--- a/org.lflang.ui/.project
+++ b/org.lflang.ui/.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.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1694735550780</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/org.lflang.updatesite/.project b/org.lflang.updatesite/.project
index 253f28eb..472ecfdc 100644
--- a/org.lflang.updatesite/.project
+++ b/org.lflang.updatesite/.project
@@ -5,7 +5,24 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1694735550781</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/org.lflang/.project b/org.lflang/.project
index 9329fa3b..b769625f 100644
--- a/org.lflang/.project
+++ b/org.lflang/.project
@@ -25,20 +25,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.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1627412675330</id>
+			<id>1694735550773</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index 3063c4bf..7d38b6ac 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -35,7 +35,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.sprotty;bundle-version="0.9.0",
  org.lflang.epoch.mirror.json;bundle-version="1.20230618.0",
  org.lflang.epoch.mirror.kotlin;bundle-version="1.6.21",
- org.lflang.epoch.mirror.jcip;bundle-version="1.0.0"
+ org.lflang.epoch.mirror.jcip;bundle-version="1.0.0",
+ com.google.gson;bundle-version="2.10.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.lflang,
  org.lflang.ast,
diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca
index 5d6d8843..8018f7f2 160000
--- a/org.lflang/lingua-franca
+++ b/org.lflang/lingua-franca
@@ -1 +1 @@
-Subproject commit 5d6d8843b4aadb4826872c4b009805a179450720
+Subproject commit 8018f7f2744f4522878056fc6317548a6ef08b27
diff --git a/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java
index 01ea0313..de2e1e9b 100644
--- a/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java
+++ b/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java
@@ -4,11 +4,11 @@
 import java.util.List;
 
 import org.lflang.Mock;
-import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.TargetTypes;
 import org.lflang.lf.Attribute;
+import org.lflang.target.Target;
 
 public class UclidGenerator extends GeneratorBase {
 
diff --git a/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java b/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java
index 71b8bf49..47bb4786 100644
--- a/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java
+++ b/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java
@@ -2,11 +2,11 @@
 package org.lflang.generator.cpp;
 
 import org.lflang.Mock;
-import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.TargetTypes;
 import org.lflang.scoping.LFGlobalScopeProvider;
+import org.lflang.target.Target;
 
 public class CppGenerator extends GeneratorBase {
 
diff --git a/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java b/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java
index 0e1bf23c..3ef84bf4 100644
--- a/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java
+++ b/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java
@@ -2,11 +2,11 @@
 package org.lflang.generator.rust;
 
 import org.lflang.Mock;
-import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.TargetTypes;
 import org.lflang.scoping.LFGlobalScopeProvider;
+import org.lflang.target.Target;
 
 public class RustGenerator extends GeneratorBase {
 
diff --git a/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java b/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java
index 73201deb..d5892d83 100644
--- a/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java
+++ b/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java
@@ -2,11 +2,11 @@
 package org.lflang.generator.ts;
 
 import org.lflang.Mock;
-import org.lflang.Target;
 import org.lflang.generator.GeneratorBase;
 import org.lflang.generator.LFGeneratorContext;
 import org.lflang.generator.TargetTypes;
 import org.lflang.scoping.LFGlobalScopeProvider;
+import org.lflang.target.Target;
 
 public class TSGenerator extends GeneratorBase {
 
diff --git a/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java b/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java
index 786fbe67..f5e24133 100644
--- a/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java
+++ b/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java
@@ -33,6 +33,7 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.validation.EObjectDiagnosticImpl;
@@ -68,9 +69,9 @@ protected void reportWithoutPosition(DiagnosticSeverity severity, String message
      * {@inheritDoc}
      */
     @Override
-    protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) {
+    protected void reportOnNode(EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) {
         if (node != null) {
-             var diagnostic = new EObjectDiagnosticImpl(convertToXtext(severity), null, message, node, null, -1, null);
+             var diagnostic = new EObjectDiagnosticImpl(convertToXtext(severity), null, message, node, feature, -1, null);
              var range = new Range(
                      Position.fromOneBased(diagnostic.getLine(), diagnostic.getColumn()),
                      Position.fromOneBased(diagnostic.getLineEnd(), diagnostic.getColumnEnd()));