diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 8431a19..491178b 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -6,7 +6,7 @@
 import cactusServer.utils.RandomStringGenerator;
 import net.arnx.jsonic.JSONHint;
 
-public class Account {
+public class Account extends Entity{
 	private String id, name, token;
 	
 	
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;
 	}
 }