diff --git a/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/legend/objectReference/objectReference.pure b/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/legend/objectReference/objectReference.pure
index 66d574674ab..de8a9d16f4c 100644
--- a/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/legend/objectReference/objectReference.pure
+++ b/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/legend/objectReference/objectReference.pure
@@ -74,7 +74,7 @@ function meta::alloy::objectReference::parseAlloyObjectReferenceV1(ref : String[
 
    if($type->toLower() == 'relational',
       |parseAlloyRelationalStoreObjectReferenceV1($ref->substring($typeEnd+1), $lengthStringSize, $type),
-      |fail('Not Supported Yet!!'); []->newMap(););
+      |fail('Not Supported Yet!!'); [pair('x',$type)]->newMap(););
 }
 
 function meta::alloy::objectReference::parseAlloyRelationalStoreObjectReferenceV1(ref : String[1], lengthStringSize:Integer[1], type:String[1]):Map<String, Any>[1]
diff --git a/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/testFramework.pure b/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/testFramework.pure
index caba2ea1306..ba8bbd6f14a 100644
--- a/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/testFramework.pure
+++ b/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/testFramework.pure
@@ -333,7 +333,7 @@ function meta::relational::relation::testUtils::processTDS(tds:TDS<Any>[1], stat
 
 
 
-function meta::relational::relation::testUtils::testTDSDatabaseRun(f:Function<{->Any[*]}>[1]):Any[*]
+function meta::relational::relation::testUtils::testTDSDatabaseRun(f:Function<{->Any[1]}>[1]):Any[1]
 {
     // //For debug
     // meta::pure::executionPlan::executionPlan($f->meta::relational::relation::testUtils::reprocess().first, ^meta::pure::runtime::ExecutionContext(), meta::relational::extension::relationalExtensions(), debug());
@@ -698,4 +698,4 @@ function <<test.Test>> meta::relational::relation::testUtils::tests::testClassTo
                 'addresses',
                 'zip'
                ], $res.mapping.classMappings->cast(@RootRelationalInstanceSetImplementation).propertyMappings.property.name);
-}
\ No newline at end of file
+}
diff --git a/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/tests.pure b/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/tests.pure
index 34444b45d46..7fef92583d0 100644
--- a/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/tests.pure
+++ b/legend-engine-xts-relationalStore/legend-engine-xt-relationalStore-generation/legend-engine-xt-relationalStore-pure/src/main/resources/core_relational/relational/relation/tests.pure
@@ -14,10 +14,10 @@
 
 function <<test.Test, test.AlloyOnly>> meta::relational::relation::executeDatabaseTests():Boolean[1]
 {
-    meta::pure::functions::relation::tests::executeTests(meta::relational::relation::testUtils::testTDSDatabaseRun_Function_1__Any_MANY_);
+    meta::pure::functions::relation::tests::executeTests(meta::relational::relation::testUtils::testTDSDatabaseRun_Function_1__Any_1_);
 }
 
 function meta::relational::relation::executeSingleTest():Boolean[1]
 {
-    meta::pure::functions::relation::tests::filter::testSimpleFilterShared(meta::relational::relation::testUtils::testTDSDatabaseRun_Function_1__Any_MANY_);
-}
\ No newline at end of file
+    meta::pure::functions::relation::tests::filter::testSimpleFilterShared(meta::relational::relation::testUtils::testTDSDatabaseRun_Function_1__Any_1_);
+}
diff --git a/legend-engine-xts-relationalai/legend-engine-xt-relationalai-pure/src/main/resources/core_external_query_relationalai/utils/result.pure b/legend-engine-xts-relationalai/legend-engine-xt-relationalai-pure/src/main/resources/core_external_query_relationalai/utils/result.pure
index 56a110ccae9..f1d550faf5d 100644
--- a/legend-engine-xts-relationalai/legend-engine-xt-relationalai-pure/src/main/resources/core_external_query_relationalai/utils/result.pure
+++ b/legend-engine-xts-relationalai/legend-engine-xt-relationalai-pure/src/main/resources/core_external_query_relationalai/utils/result.pure
@@ -107,14 +107,14 @@ function meta::external::store::rel::utils::orDefaultValue<T|m>(result: Result<T
 function meta::external::store::rel::utils::unwrap<T>(result: Result<T|0..1>[1]): T[1] {
   if($result.errors->isEmpty(),
     | $result.values->toOne(),
-    | fail($result->failMessage())
+    | fail($result->failMessage()); $result.values->toOne();
   )
 }
 
 function meta::external::store::rel::utils::unwrapm<T>(result: Result<T|*>[1]): T[*] {
   if($result.errors->isEmpty(),
     | $result.values,
-    | fail($result->failMessage())
+    | fail($result->failMessage()); $result.values;
   )
 }
 
diff --git a/pom.xml b/pom.xml
index b16d7630970..0d66d50d04d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
 
     <properties>
         <!-- Legend -->
-        <legend.pure.version>5.3.0</legend.pure.version>
+        <legend.pure.version>5.4.2</legend.pure.version>
         <legend.shared.version>0.25.4</legend.shared.version>
 
         <!-- SONAR -->