diff -u results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/reference/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18.jimple results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/rebuild/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18.jimple
--- results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/reference/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18.jimple	2025-03-13 04:26:13.813779340 +0000
+++ results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/rebuild/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18.jimple	2025-03-13 04:26:18.901699145 +0000
@@ -7,32 +7,42 @@
 specialinvoke v.<org.finos.legend.pure.runtime.java.compiled.generation.processors.support.function.DefaultPureLambdaFunction1: void <init>()>();
 return;
 }
-public org.eclipse.collections.api.RichIterable execute(org.eclipse.collections.api.list.ListIterable, org.finos.legend.pure.m.execution.ExecutionSupport)
+public java.lang.String execute(org.eclipse.collections.api.list.ListIterable, org.finos.legend.pure.m.execution.ExecutionSupport)
 {
 org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18 v;
-org.eclipse.collections.api.RichIterable v;
 org.finos.legend.pure.m.execution.ExecutionSupport v;
 org.eclipse.collections.api.list.ListIterable v;
 java.lang.Object v, v;
+java.lang.String v;
 v := @this: org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18;
 v := @parameter: org.eclipse.collections.api.list.ListIterable;
 v := @parameter: org.finos.legend.pure.m.execution.ExecutionSupport;
 v = interfaceinvoke v.<org.eclipse.collections.api.list.ListIterable: java.lang.Object get(int)>(0);
 v = staticinvoke <org.finos.legend.pure.runtime.java.compiled.generation.processors.support.CompiledSupport: java.lang.Object makeOne(java.lang.Object)>(v);
-v = virtualinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18: org.eclipse.collections.api.RichIterable value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity,org.finos.legend.pure.m.execution.ExecutionSupport)>(v, v);
+v = virtualinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18: java.lang.String value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street,org.finos.legend.pure.m.execution.ExecutionSupport)>(v, v);
 return v;
 }
-public org.eclipse.collections.api.RichIterable value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity, org.finos.legend.pure.m.execution.ExecutionSupport)
+public java.lang.String value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street, org.finos.legend.pure.m.execution.ExecutionSupport)
 {
+java.lang.String[] v;
+org.eclipse.collections.api.factory.list.MutableListFactory v;
+org.eclipse.collections.api.list.MutableList v;
+org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street v;
 org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18 v;
-org.eclipse.collections.api.RichIterable v, v;
+org.eclipse.collections.api.RichIterable v;
 org.finos.legend.pure.m.execution.ExecutionSupport v;
-org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity v;
+java.lang.String v, v;
 v := @this: org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18;
-v := @parameter: org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity;
+v := @parameter: org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street;
 v := @parameter: org.finos.legend.pure.m.execution.ExecutionSupport;
-v = interfaceinvoke v.<org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity: org.eclipse.collections.api.RichIterable _properties()>();
+v = <org.eclipse.collections.impl.factory.Lists: org.eclipse.collections.api.factory.list.MutableListFactory mutable>;
+v = newarray (java.lang.String)[2];
+v = interfaceinvoke v.<org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street: java.lang.String _streetName()>();
+v[0] = v;
+v[1] = "1";
+v = interfaceinvoke v.<org.eclipse.collections.api.factory.list.MutableListFactory: org.eclipse.collections.api.list.MutableList 'with'(java.lang.Object[])>(v);
 v = staticinvoke <org.finos.legend.pure.runtime.java.compiled.generation.processors.support.CompiledSupport: org.eclipse.collections.api.RichIterable toPureCollection(org.eclipse.collections.api.RichIterable)>(v);
+v = staticinvoke <org.finos.legend.pure.generated.platform_pure_grammar_functions_string_plus: java.lang.String Root_meta_pure_functions_string_plus_String_MANY__String_1_(org.eclipse.collections.api.RichIterable,org.finos.legend.pure.m.execution.ExecutionSupport)>(v, v);
 return v;
 }
 }
\ No newline at end of file
diff -u results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/reference/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19.jimple results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/rebuild/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19.jimple
--- results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/reference/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19.jimple	2025-03-13 04:26:13.813779340 +0000
+++ results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/rebuild/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19.jimple	2025-03-13 04:26:18.901699145 +0000
@@ -7,42 +7,32 @@
 specialinvoke v.<org.finos.legend.pure.runtime.java.compiled.generation.processors.support.function.DefaultPureLambdaFunction1: void <init>()>();
 return;
 }
-public java.lang.String execute(org.eclipse.collections.api.list.ListIterable, org.finos.legend.pure.m.execution.ExecutionSupport)
+public org.eclipse.collections.api.RichIterable execute(org.eclipse.collections.api.list.ListIterable, org.finos.legend.pure.m.execution.ExecutionSupport)
 {
+org.eclipse.collections.api.RichIterable v;
 org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19 v;
 org.finos.legend.pure.m.execution.ExecutionSupport v;
 org.eclipse.collections.api.list.ListIterable v;
 java.lang.Object v, v;
-java.lang.String v;
 v := @this: org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19;
 v := @parameter: org.eclipse.collections.api.list.ListIterable;
 v := @parameter: org.finos.legend.pure.m.execution.ExecutionSupport;
 v = interfaceinvoke v.<org.eclipse.collections.api.list.ListIterable: java.lang.Object get(int)>(0);
 v = staticinvoke <org.finos.legend.pure.runtime.java.compiled.generation.processors.support.CompiledSupport: java.lang.Object makeOne(java.lang.Object)>(v);
-v = virtualinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19: java.lang.String value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street,org.finos.legend.pure.m.execution.ExecutionSupport)>(v, v);
+v = virtualinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19: org.eclipse.collections.api.RichIterable value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity,org.finos.legend.pure.m.execution.ExecutionSupport)>(v, v);
 return v;
 }
-public java.lang.String value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street, org.finos.legend.pure.m.execution.ExecutionSupport)
+public org.eclipse.collections.api.RichIterable value(org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity, org.finos.legend.pure.m.execution.ExecutionSupport)
 {
-java.lang.String[] v;
-org.eclipse.collections.api.factory.list.MutableListFactory v;
-org.eclipse.collections.api.list.MutableList v;
-org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street v;
-org.eclipse.collections.api.RichIterable v;
+org.eclipse.collections.api.RichIterable v, v;
 org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19 v;
 org.finos.legend.pure.m.execution.ExecutionSupport v;
-java.lang.String v, v;
+org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity v;
 v := @this: org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19;
-v := @parameter: org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street;
+v := @parameter: org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity;
 v := @parameter: org.finos.legend.pure.m.execution.ExecutionSupport;
-v = <org.eclipse.collections.impl.factory.Lists: org.eclipse.collections.api.factory.list.MutableListFactory mutable>;
-v = newarray (java.lang.String)[2];
-v = interfaceinvoke v.<org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_test_Street: java.lang.String _streetName()>();
-v[0] = v;
-v[1] = "1";
-v = interfaceinvoke v.<org.eclipse.collections.api.factory.list.MutableListFactory: org.eclipse.collections.api.list.MutableList 'with'(java.lang.Object[])>(v);
+v = interfaceinvoke v.<org.finos.legend.pure.generated.Root_meta_analytics_mapping_modelCoverage_MappedEntity: org.eclipse.collections.api.RichIterable _properties()>();
 v = staticinvoke <org.finos.legend.pure.runtime.java.compiled.generation.processors.support.CompiledSupport: org.eclipse.collections.api.RichIterable toPureCollection(org.eclipse.collections.api.RichIterable)>(v);
-v = staticinvoke <org.finos.legend.pure.generated.platform_pure_grammar_functions_string_plus: java.lang.String Root_meta_pure_functions_string_plus_String_MANY__String_1_(org.eclipse.collections.api.RichIterable,org.finos.legend.pure.m.execution.ExecutionSupport)>(v, v);
 return v;
 }
 }
\ No newline at end of file
diff -u results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/reference/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest.jimple results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/rebuild/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest.jimple
--- results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/reference/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest.jimple	2025-03-13 04:26:13.809779403 +0000
+++ results/org.finos.legend.engine/legend-engine/4.7.0/jnorm/rebuild/legend-engine-xt-analytics-mapping-pure-4.7.0.jar:legend-engine-xt-analytics-mapping-pure-4.7.0.jar/org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest.jimple	2025-03-13 04:26:18.897699209 +0000
@@ -475,11 +475,11 @@
 v = <org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest: org.eclipse.collections.api.map.MutableMap __functions>;
 v = new org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18;
 specialinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$18: void <init>()>();
-interfaceinvoke v.<org.eclipse.collections.api.map.MutableMap: java.lang.Object put(java.lang.Object,java.lang.Object)>("meta$analytics$mapping$modelCoverage$test$testSimpleUnionM2MMappingCoverage$6$system$imports$import__core_analytics_mapping_modelCoverage_analyticsTest_pure_1$4", v);
+interfaceinvoke v.<org.eclipse.collections.api.map.MutableMap: java.lang.Object put(java.lang.Object,java.lang.Object)>("meta_analytics_mapping_modelCoverage_test_sampleModelToModelMapping_meta_analytics_mapping_modelCoverage_test__Street_s1$1", v);
 v = <org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest: org.eclipse.collections.api.map.MutableMap __functions>;
 v = new org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19;
 specialinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$19: void <init>()>();
-interfaceinvoke v.<org.eclipse.collections.api.map.MutableMap: java.lang.Object put(java.lang.Object,java.lang.Object)>("meta_analytics_mapping_modelCoverage_test_sampleModelToModelMapping_meta_analytics_mapping_modelCoverage_test__Street_s1$1", v);
+interfaceinvoke v.<org.eclipse.collections.api.map.MutableMap: java.lang.Object put(java.lang.Object,java.lang.Object)>("meta$analytics$mapping$modelCoverage$test$testSimpleUnionM2MMappingCoverage$6$system$imports$import__core_analytics_mapping_modelCoverage_analyticsTest_pure_1$4", v);
 v = <org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest: org.eclipse.collections.api.map.MutableMap __functions>;
 v = new org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$20;
 specialinvoke v.<org.finos.legend.pure.generated.core_analytics_mapping_modelCoverage_analyticsTest$20: void <init>()>();