diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 475e41b1..bc00ea6d 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -72,13 +72,14 @@ import resources.server_info.Log;
 import resources.server_info.ObjectDatabase;
 import resources.server_info.ObjectDatabase.Traverser;
 import services.map.MapManager;
+import services.map.MapManager.MapType;
 import services.player.PlayerManager;
 import services.spawn.SpawnerService;
 import services.spawn.StaticService;
 
 public class ObjectManager extends Manager {
 	
-	private final MapManager mapService;
+	private final MapManager mapManager;
 	private final StaticService staticService;
 	private final SpawnerService spawnerService;
 	private final RadialService radialService;
@@ -89,7 +90,7 @@ public class ObjectManager extends Manager {
 	private long maxObjectId;
 	
 	public ObjectManager() {
-		mapService = new MapManager();
+		mapManager = new MapManager();
 		staticService = new StaticService(this);
 		spawnerService = new SpawnerService(this);
 		radialService = new RadialService();
@@ -98,7 +99,7 @@ public class ObjectManager extends Manager {
 		objectMap = new Hashtable<>(16*1024);
 		maxObjectId = 1;
 
-		addChildService(mapService);
+		addChildService(mapManager);
 		addChildService(staticService);
 		addChildService(radialService);
 		addChildService(spawnerService);
@@ -174,6 +175,8 @@ public class ObjectManager extends Manager {
 				maxObjectId = obj.getObjectId() + 1;
 			}
 		}
+		staticService.createSupportingObjects(obj);
+		mapManager.addMapLocation(obj, MapType.STATIC);
 	}
 	
 	private void loadObject(SWGObject obj) {
diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java
index 478a14d9..c007189d 100644
--- a/src/services/spawn/StaticService.java
+++ b/src/services/spawn/StaticService.java
@@ -79,7 +79,7 @@ public class StaticService extends Service {
 		}
 	}
 	
-	private void createSupportingObjects(SWGObject object) {
+	public void createSupportingObjects(SWGObject object) {
 		synchronized (databaseMutex) {
 			try {
 				getSupportingStatement.setString(1, object.getTemplate());