diff --git a/src/main/java/cactusServer/entities/Session.java b/src/main/java/cactusServer/entities/Session.java
deleted file mode 100644
index 4dc6274..0000000
--- a/src/main/java/cactusServer/entities/Session.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cactusServer.entities;
-
-import java.net.URI;
-
-import cactusServer.entities.Account;
-import net.arnx.jsonic.JSONHint;
-
-public class Session extends URIAddressedEntity{
-	public Session(Account account, URI accountURI) {
-		super(accountURI, account);
-	}
-	@JSONHint(ignore=true)
-	public Account getAccount() {
-		return (Account)getBody();
-	}
-
-	public void setAccount(Account account) {
-		setBody(account);
-	}
-	@JSONHint(ignore=true)
-	public URI getAccountURI() {
-		return getUri();
-	}
-
-	public void setAccountURI(URI accountURI) {
-		setUri(accountURI);
-	}
-}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index ee05a49..e06fbce 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -5,7 +5,6 @@
 import cactusServer.entities.*;
 import cactusServer.utils.RandomStringGenerator;
 
-import java.net.URI;
 import java.util.*;
 
 @Singleton
@@ -14,7 +13,7 @@
 	private ArrayList<Account> accounts = new ArrayList<>(10000);
 	private HashSet<String> userIDSet = new HashSet<>(10000);
 	private HashSet<String> uniqueIDSet = new HashSet<>(10000);
-	private Session session;
+	private URIAddressedEntity session;
 
 	private Accounts() {
 
@@ -27,7 +26,7 @@
 		return theInstance;
 	}
 
-	public Session createAcount(String userID, String userName, String userPass) {
+	public URIAddressedEntity createAcount(String userID, String userName, String userPass) {
 		if (!userIDSet.add(userID))
 			return null;
 		String uniqueID = RandomStringGenerator.generateUniqueString(12, RandomStringGenerator.ALPHA_NUMERIC,
@@ -35,7 +34,7 @@
 		uniqueIDSet.add(uniqueID);
 		Account newAccount = new Account(userID, userName, userPass, uniqueID);
 		accounts.add(newAccount);
-		session = new Session(newAccount, URI.create("/CactusServer/rest/accounts/" + uniqueID));
+		session = new URIAddressedEntity("/CactusServer/rest/accounts/" + uniqueID, newAccount);
 
 		return session;
 	}
@@ -84,12 +83,13 @@
 		return null;
 	}
 
-	public Session loginAccount(String userID, String userPass) {
+	public URIAddressedEntity loginAccount(String userID, String userPass) {
 		if (getAccountByID(userID).getPass().equals(userPass)) {
 			Accounts.getInstance().getAccountByID(userID).setLogin(true);
 			Accounts.getInstance().getAccountByID(userID).formToken();
-			session = new Session(Accounts.getInstance().getAccountByID(userID), URI.create(
-					"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID()));
+			session = new URIAddressedEntity(
+					"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID(),
+					Accounts.getInstance().getAccountByID(userID));
 			return session;
 		} else {
 			return null;