diff --git a/core/src/objects/datamodel.cpp b/core/src/objects/datamodel.cpp
index 3ebba1a..899e071 100644
--- a/core/src/objects/datamodel.cpp
+++ b/core/src/objects/datamodel.cpp
@@ -21,12 +21,8 @@ DataModel::DataModel()
 }
 
 void DataModel::Init(bool runMode) {
-    // Create the workspace if it doesn't exist
-    if (this->services.count("Workspace") == 0) {
-        this->services["Workspace"] = std::make_shared<Workspace>();
-        AddChild(this->services["Workspace"]);
-    }
-
+    // Create default services
+    GetService<Workspace>();
     GetService<ServerScriptService>();
     
     // Init all services