1 files changed, 11 insertions, 12 deletions

diff --git a/src/crepe/api/GameObject.cpp b/src/crepe/api/GameObject.cpp
index 9ef4682..100e210 100644
--- a/src/crepe/api/GameObject.cpp
+++ b/src/crepe/api/GameObject.cpp
@@ -7,20 +7,19 @@
 using namespace crepe;
 using namespace std;
 
-GameObject::GameObject(ComponentManager & component_manager, game_object_id_t id,
-					   const std::string & name, const std::string & tag,
-					   const vec2 & position, double rotation, double scale)
+GameObject::GameObject(
+	Mediator & mediator, game_object_id_t id, const std::string & name,
+	const std::string & tag, const vec2 & position, double rotation, double scale
+)
 	: id(id),
-	  component_manager(component_manager) {
-
-	// Add Transform and Metadata components
-	ComponentManager & mgr = this->component_manager;
-	mgr.add_component<Transform>(this->id, position, rotation, scale);
-	mgr.add_component<Metadata>(this->id, name, tag);
-}
+	  mediator(mediator),
+	  transform(mediator.component_manager->add_component<Transform>(
+		  this->id, position, rotation, scale
+	  )),
+	  metadata(mediator.component_manager->add_component<Metadata>(this->id, name, tag)) {}
 
 void GameObject::set_parent(const GameObject & parent) {
-	ComponentManager & mgr = this->component_manager;
+	ComponentManager & mgr = this->mediator.component_manager;
 
 	// Set parent on own Metadata component
 	RefVector<Metadata> this_metadata = mgr.get_components_by_id<Metadata>(this->id);
@@ -32,7 +31,7 @@ void GameObject::set_parent(const GameObject & parent) {
 }
 
 void GameObject::set_persistent(bool persistent) {
-	ComponentManager & mgr = this->component_manager;
+	ComponentManager & mgr = this->mediator.component_manager;
 
 	mgr.set_persistent(this->id, persistent);
 }