diff --git a/EtsiServerGen/patches/applyPatches.sh b/EtsiServerGen/patches/applyPatches.sh
index f806052ae3e6dafe973abf5f9bfa33f96355b7cd..ae585fe39da391dc582653548dcda32eda46cd21 100755
--- a/EtsiServerGen/patches/applyPatches.sh
+++ b/EtsiServerGen/patches/applyPatches.sh
@@ -2,8 +2,8 @@
 patch -u ../api/DefaultApi.h -i fixHeaderModelIssue.patch
 patch -u ../api/DefaultApi.cpp -i fixCppModelIssue.patch
 patch -u ../api/RelocalizationInformationApi.cpp -i fixCppRelocalizationInformation.patch
-patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch
-patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch
-patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch
-patch -u ../model/WorldLink.cpp -i fixCppWorldLinksModel.patch
+#patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch
+#patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch
+#patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch
+#patch -u ../model/WorldLink.cpp -i fixCppWorldLinksModel.patch
 
diff --git a/EtsiServerGen/patches/fixCppRelocalizationInformation.patch b/EtsiServerGen/patches/fixCppRelocalizationInformation.patch
index f1f79fc1ff43e3ba7f3628d76ae5793a610718bd..2ad31dfd1561a7a597088412d7ccc360d5c6767e 100644
--- a/EtsiServerGen/patches/fixCppRelocalizationInformation.patch
+++ b/EtsiServerGen/patches/fixCppRelocalizationInformation.patch
@@ -1,11 +1,11 @@
---- RelocalizationInformationApi.cpp	2024-08-30 10:10:07.846664769 +0200
-+++ RelocalizationInformationApi_corrected.cpp	2024-08-30 10:05:55.896662600 +0200
+--- RelocalizationInformationApi.cpp	2024-09-17 15:53:04.949160050 +0200
++++ RelocalizationInformationApi_corrected.cpp	2024-09-17 15:44:29.639017895 +0200
 @@ -161,12 +161,12 @@
-     std::vector<GetRelocalizationInformation_uuids_parameter_inner> uuids;
+     std::vector<UuidAndMode> uuids;
      std::vector<std::string> uuids_temp;
      boost::split(uuids_temp, uuids_raw, boost::is_any_of(","));
--    std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ GetRelocalizationInformation_uuids_parameter_inner ret; ret.fromString(i); return ret;});
-+    std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ GetRelocalizationInformation_uuids_parameter_inner ret; ret.setUuid(i); return ret;});
+-    std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromString(i); return ret;});
++    std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromJsonString(i); return ret;});
      std::string capabilities_raw = request->get_query_parameter("capabilities");
      std::vector<Capability> capabilities;
      std::vector<std::string> capabilities_temp;
diff --git a/arf005 b/arf005
index 8be02781f334915d2fa0efabc0f924d97f10922c..5734880080c52572af65fe6d2703228ed6ee5653 160000
--- a/arf005
+++ b/arf005
@@ -1 +1 @@
-Subproject commit 8be02781f334915d2fa0efabc0f924d97f10922c
+Subproject commit 5734880080c52572af65fe6d2703228ed6ee5653
diff --git a/package.json b/package.json
index afa36200d2d77d2c810a93040262136cc024597b..7c300ba8d228a36052b15de4c7bcf8e69d2d9be0 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "description": "ISG ARF World Storage Cpp Server",
   "main": "index.js",
   "scripts": {
-    "generate": "cd EtsiServerGen && java -jar /usr/local/lib/node_modules/@openapitools/openapi-generator-cli/versions/7.5.0.jar generate -i ../arf005/API/worldstorage/worldstorageopenapi.yaml --skip-validate-spec --type-mappings=set=std::vector -g cpp-restbed-server -o . && cd patches && ./applyPatches.sh",
+    "generate": "cd EtsiServerGen && java -jar /usr/local/lib/node_modules/@openapitools/openapi-generator-cli/versions/7.5.0.jar generate -i ../arf005/API/worldstorage/worldstorageopenapi.yaml --type-mappings=set=std::vector -g cpp-restbed-server -o . && cd patches && ./applyPatches.sh",
     "build": "cd EtsiServerGen && conan install . --build=missing && cd build && cmake .. --preset conan-release && cd Release && cmake --build . && sudo make install"    
   },
   "devDependencies": {