diff --git a/.classpath b/.classpath
index 0630208..acfeeee 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">
 		<attributes>
diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index de5d81c..491178b 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -6,10 +6,10 @@
 import cactusServer.utils.RandomStringGenerator;
 import net.arnx.jsonic.JSONHint;
 
-public class Account {
+public class Account extends Entity{
 	private String id, name, token;
 	
-	@JSONHint(ignore=true)
+	
 	private String pass;
 	
 	@JSONHint(ignore=true)
@@ -41,16 +41,16 @@
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	public String getpass() {
+	@JSONHint(ignore=true)
+	public String getPass() {
 		return pass;
 	}
 
 	public void setPass(String pass) {
 		this.pass = pass;
 	}
-	
-	public boolean islogin() {
+	@JSONHint(ignore=true)
+	public boolean isLogin() {
 		return login;
 	}
 
@@ -66,8 +66,8 @@
 		token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
 		return token;
 	}
-	
-	public String getuniqueID() {
+	@JSONHint(ignore=true)
+	public String getUniqueID() {
 		return uniqueID;
 	}
 
diff --git a/src/main/java/cactusServer/entities/Session.java b/src/main/java/cactusServer/entities/Session.java
index b6d9fa1..cabea47 100644
--- a/src/main/java/cactusServer/entities/Session.java
+++ b/src/main/java/cactusServer/entities/Session.java
@@ -4,28 +4,24 @@
 
 import cactusServer.entities.Account;
 
-public class Session {
-	private Account account;
-	private URI accountURI;
-
+public class Session extends URIAddressedEntity{
 	public Session(Account account, URI accountURI) {
-		this.account = account;
-		this.accountURI = accountURI;
+		super(accountURI, account);
 	}
 
 	public Account getAccount() {
-		return account;
+		return (Account)getBody();
 	}
 
 	public void setAccount(Account account) {
-		this.account = account;
+		setBody(account);
 	}
 
 	public URI getAccountURI() {
-		return accountURI;
+		return getUri();
 	}
 
 	public void setAccountURI(URI accountURI) {
-		this.accountURI = accountURI;
+		setUri(accountURI);
 	}
 }
diff --git a/src/main/java/cactusServer/entities/URIAddressedEntity.java b/src/main/java/cactusServer/entities/URIAddressedEntity.java
index 53b6e99..bd5e264 100644
--- a/src/main/java/cactusServer/entities/URIAddressedEntity.java
+++ b/src/main/java/cactusServer/entities/URIAddressedEntity.java
@@ -1,22 +1,29 @@
 package cactusServer.entities;
 
+import java.net.URI;
+
 public class URIAddressedEntity extends AddressedEntity{
-	private String uri;
+	private URI uri;
 	
 	private URIAddressedEntity() {
 		// JSONDecode���̌Ăяo���p
 	}
 	
-	public URIAddressedEntity(String uri, Entity body) {
+	public URIAddressedEntity(URI uri, Entity body) {
 		super(body);
 		setUri(uri);
 	}
 	
-	public String getUri() {
+	public URIAddressedEntity(String str, Entity body) {
+		super(body);
+		setUri(URI.create(str));
+	}
+	
+	public URI getUri() {
 		return uri;
 	}
 
-	public void setUri(String uri) {
+	public void setUri(URI uri) {
 		this.uri = uri;
 	}
 }
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 034a015..cf8a9d3 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -77,7 +77,7 @@
 		Account editAccount;
 		for (int i = 0; i < accounts.size(); i++) {
 			editAccount = accounts.get(i);
-			if (editAccount.getuniqueID().equals(uniqueID)) {
+			if (editAccount.getUniqueID().equals(uniqueID)) {
 				return editAccount;
 			}
 		}
@@ -85,11 +85,11 @@
 	}
 
 	public Session loginAccount(String userID, String userPass) {
-		if (getAccountByID(userID).getpass().equals(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()));
+					"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID()));
 			return session;
 		} else {
 			return null;
@@ -104,7 +104,7 @@
 	public Account deleteAccount(String token) {
 		Account edit = Accounts.getInstance().getAccountToken(token);
 		userIDSet.remove(edit.getId());
-		uniqueIDSet.remove(edit.getuniqueID());
+		uniqueIDSet.remove(edit.getUniqueID());
 		accounts.remove(edit);
 		return edit;
 	}