diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java
index 428842c..76b37de 100644
--- a/src/main/java/cactusServer/entities/Character.java
+++ b/src/main/java/cactusServer/entities/Character.java
@@ -23,13 +23,13 @@
 	@JSONHint(ignore = true) HashMap<String, Item> itemMap = new HashMap<>();
 	@JSONHint(ignore = true) private static final int UNIQUE_ID_LENGTH = 12;
 
-//	public Character(URI accountURI, String name, Position3D position, String areaId, boolean isActive) {
-//		this.accountURI = accountURI;
-//		this.name = name;
-//		this.position = position;
-//		this.areaID = areaId;
-//		this.isActive = isActive;
-//	}
+	public Character(URI accountURI, String name, Position3D position, String areaId, boolean isActive) {
+		this.accountURI = accountURI;
+		this.name = name;
+		this.position = position;
+		this.areaID = areaId;
+		this.isActive = isActive;
+	}
 
 	public URI getAccountURI() {
 		return accountURI;
@@ -63,10 +63,6 @@
 		return itemList;
 	}
 
-	public void setAccountURI(URI accountURI) {
-		this.accountURI = accountURI;
-	}
-
 	public void setName(String name) {
 		this.name = name;
 	}
diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java
index 7e2a6ed..0b9b671 100644
--- a/src/main/java/cactusServer/entities/Instance.java
+++ b/src/main/java/cactusServer/entities/Instance.java
@@ -3,18 +3,14 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import cactusServer.entities.Area.Allowed;
 import cactusServer.entities.Object;
 import cactusServer.utils.RandomStringGenerator;
 import cactusServer.entities.Character;
 import framework.model3D.Position3D;
-import framework.physics.AngularVelocity3D;
-import framework.physics.Velocity3D;
 import net.arnx.jsonic.JSONHint;
 
 /**
@@ -100,33 +96,22 @@
 		this.state = state;
 	}
 
-	public Map<String, Area> createArea(String areaId, String name, Plain[] regions, HashSet<Allowed> permissions) {
+	public Map<String, Area> createArea(Area area) {
 		String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, areaMap.keySet());
-		Area area = new Area(name, regions, permissions);
 		areaMap.put(id, area);
 		return new HashMap<String, Area>() {
 			{put(id, area);}
 		};
 	}
-	
-	public Map<String, Object> createObject(String objId, Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Object.Attribute attribute) {
+
+	public Map<String, Object> createObject(Object object) {
 		String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, objMap.keySet());
-		Object object = new Object(position, velocity, angularVelocity, attribute);
 		objMap.put(id, object);
 		return new HashMap<String, Object>() {
 			{put(id, object);}
 		};
 	}
 	
-//	public Map<String, Character> createCharacter(URI accountURI, String name, Position3D position, String areaId, boolean isActive) {
-//		String id = new RandomStringGenerator().createUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet());
-//		Character character = new Character(accountURI, name, position, areaId, isActive);
-//		characterMap.put(id, character);
-//		return new HashMap<String, Character>() {
-//			{put(id, character);}
-//		};
-//	}
-	
 	public Map<String, Character> createCharacter(Character character) {
 		String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet());
 		characterMap.put(id, character);