diff --git a/MantleAPI/include/MantleAPI/Execution/i_environment.h b/MantleAPI/include/MantleAPI/Execution/i_environment.h
index 7c031c84bb08cdc637b9cb6b4e1bc1eb3cbe265c..4c11436449214a2a2b71f75d27dda54b4dd50244 100644
--- a/MantleAPI/include/MantleAPI/Execution/i_environment.h
+++ b/MantleAPI/include/MantleAPI/Execution/i_environment.h
@@ -36,7 +36,7 @@ public:
   ///
   /// @param file_path map file path from the scenario file. If this path is not resolved by the engine, the
   ///                  environment must do so.
-  virtual void CreateMap(const std::string& map_file_path, const mantle_api::MapDetails* map_details) = 0;
+  virtual void CreateMap(const std::string& map_file_path, const mantle_api::MapDetails& map_details) = 0;
 
   /// Creates a controller from the given config. A created controller can be assigned to multiple entities
   ///
diff --git a/MantleAPI/include/MantleAPI/Traffic/i_entity.h b/MantleAPI/include/MantleAPI/Traffic/i_entity.h
index fa864109ed4f27192d235d4081887ce942e40b7e..864225c191387fcf2312aef3c1c37fcc0f10b6cf 100644
--- a/MantleAPI/include/MantleAPI/Traffic/i_entity.h
+++ b/MantleAPI/include/MantleAPI/Traffic/i_entity.h
@@ -26,7 +26,6 @@
 
 namespace mantle_api
 {
-
 struct EntityVisibilityConfig
 {
   /// The "graphics" flag determines, if the entity shall be shown in visualizations of the simulated environment
diff --git a/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h b/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
index 86df0f586ffd07b3e31e7a2a112b16df370c390f..e80ba01b430dcbf509feea00829eac6d548cd17b 100644
--- a/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
+++ b/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
@@ -33,8 +33,8 @@ public:
   virtual IVehicle& Create(UniqueId id, const std::string& name, const VehicleProperties& properties) = 0;
   virtual IPedestrian& Create(const std::string& name, const PedestrianProperties& properties) = 0;
   virtual IPedestrian& Create(UniqueId id, const std::string& name, const PedestrianProperties& properties) = 0;
-  virtual IStaticObject& Create(const std::string& name, std::unique_ptr<mantle_api::StaticObjectProperties> properties) = 0;
-  virtual IStaticObject& Create(UniqueId id, const std::string& name, std::unique_ptr<StaticObjectProperties> properties) = 0;
+  virtual IStaticObject& Create(const std::string& name, const mantle_api::StaticObjectProperties& properties) = 0;
+  virtual IStaticObject& Create(UniqueId id, const std::string& name, const StaticObjectProperties& properties) = 0;
 
   virtual IVehicle& GetHost() = 0;
   virtual std::optional<std::reference_wrapper<IEntity>> Get(const std::string& name) = 0;
diff --git a/MantleAPI/test/MantleAPI/Test/test_utils.h b/MantleAPI/test/MantleAPI/Test/test_utils.h
index c11fe9d4bb741a1eb4cf3264e4a9eb13dfa5b691..ac24546623716ccfbc424a160d03784b85cca5f5 100644
--- a/MantleAPI/test/MantleAPI/Test/test_utils.h
+++ b/MantleAPI/test/MantleAPI/Test/test_utils.h
@@ -252,7 +252,7 @@ public:
 
   mantle_api::IStaticObject& Create(mantle_api::UniqueId id,
                                     const std::string& name,
-                                    std::unique_ptr<mantle_api::StaticObjectProperties> properties) override
+                                    const mantle_api::StaticObjectProperties& properties) override
   {
     std::ignore = id;
     std::ignore = name;
@@ -260,15 +260,10 @@ public:
     return test_static_object_;
   }
 
-  mantle_api::IStaticObject& Create(const std::string& name,
-                                    std::unique_ptr<mantle_api::StaticObjectProperties> properties) override
-  {
-    return CreateStaticObjectProxy(name, *properties);
-  }
-
   MOCK_METHOD(mantle_api::IStaticObject&,
-              CreateStaticObjectProxy,
-              (const std::string& name, const mantle_api::StaticObjectProperties& properties), ());
+              Create,
+              (const std::string& name, const mantle_api::StaticObjectProperties& properties),
+              ());
 
   std::optional<std::reference_wrapper<IEntity>> Get(const std::string& name) override
   {
@@ -310,7 +305,7 @@ class MockEnvironment : public mantle_api::IEnvironment
 public:
   MOCK_METHOD(void,
               CreateMap,
-              (const std::string& file_path, const mantle_api::MapDetails* map_details),
+              (const std::string& file_path, const mantle_api::MapDetails& map_details),
               (override)
 
   );