diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java
index d2dd33f..57de93e 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -4,9 +4,29 @@
 import java.util.Set;
 
 public class User {
+    /**
+    * USER用のクラス
+    *
+    * @param uId string //LONGに変更
+    * @param uri String
+    * @param name String
+    * @param iconUri String iconの保存先
+    * @param login Boolean トークンが存在するか否か
+    * @param groups Set<Group> 所属するグループ
+    * @param tokens String userが持トークン一覧
+    * 
+    * TODO: Tokenのデータベース接続
+    * TODO: tokenの持ち方要検討
+    */
+
     public String uId, uri, name, iconUri;
     public boolean login = true;
     public Set<Group> groups = new HashSet<>();//HashSetでいいのかな？
+    //仕様ではStringを返すため
+    //public Set<Token> tokens = new HashSet<>();
+    //public Set<String> tokens = new HashSet<>();
+    public String token;
+    private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca";
 
     public User() {
 
@@ -16,6 +36,8 @@
         setUri(uri);
         setName(name);
         setIconUri(iconUri);
+        setToken(this.dummyToken);
+        //addToken(this.dummyToken);
         this.login = true;
     }
 
@@ -59,6 +81,27 @@
         this.login = login;
     }
 
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    /* 
+    * //仕様ではStringで返すため
+    * public Set<String> getTokens(){
+    *     return tokens;
+    * }
+    * public void setTokens(Set<String> tokens){
+    *     this.tokens=tokens;        
+    * }
+    * public void addToken (String token){
+    *     tokens.add(token);
+    * }
+    */
+    
     public Set<Group> getGroups() {
         return groups;
     }
diff --git a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
index 6f15cb9..2b2a534 100644
--- a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
+++ b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
@@ -5,6 +5,7 @@
 import com.example.cosmos_serversb.entities.Request;
 import com.example.cosmos_serversb.entities.User;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -12,15 +13,15 @@
 public class GroupJson {
     private String gId;
     private String uri, name;
-    private Map<String, String> members = new HashMap<>();
-    private Map<String, String> requests = new HashMap<>();
+    private ArrayList<UidUriJson> members = new ArrayList<>();
+    private ArrayList<RidUriJson> requests = new ArrayList<>();
 
     public GroupJson(Group group){
         setgId(group.getgId());
         setUri(group.getUri());
         setName(group.getName());
-        changeMembersMap(group.getMembers());
-        changeRequestsMap(group.getRequests());
+        createUidUri(group.getMembers());
+        createRidUri(group.getRequests());
     }
 
     public String getgId() {
@@ -55,32 +56,33 @@
         return name;
     }
 
-    public Map<String, String> getMembers() {
+    public ArrayList<UidUriJson> getMembers() {
         return members;
     }
 
-    public void setMembers(Map<String, String> members) {
+    public void setMembers(ArrayList<UidUriJson> members) {
         this.members = members;
     }
 
-    public Map<String, String> getRequests() {
+    public ArrayList<RidUriJson> getRequest() {
         return requests;
     }
 
-    public void setRequests(Map<String, String> requests) {
+    public void setRequests(ArrayList<RidUriJson> requests) {
         this.requests = requests;
     }
 
-    private void changeMembersMap(Set set){
+    private void createUidUri(Set set){
         for ( User user : (Set<User>) set ) {
-            members.put(user.getuId(), getUri());
+            members.add( new UidUriJson(user) );
         }
     }
 
-    private void changeRequestsMap(Set set){
+    private void createRidUri(Set set){
         for ( Request request : (Set<Request>) set ) {
-            requests.put(request.getrId(), getUri());
+            requests.add( new RidUriJson(request) );
         }
     }
+
 }
 
diff --git a/src/main/java/com/example/cosmos_serversb/jsons/RidUriJson.java b/src/main/java/com/example/cosmos_serversb/jsons/RidUriJson.java
new file mode 100644
index 0000000..fc873cb
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/jsons/RidUriJson.java
@@ -0,0 +1,35 @@
+package com.example.cosmos_serversb.jsons;
+
+import com.example.cosmos_serversb.entities.Request;
+import com.example.cosmos_serversb.entities.User;
+
+public class RidUriJson {
+    private String rId;
+    private String uri;
+
+    public RidUriJson(){
+
+    }
+
+    public RidUriJson(Request request){
+        setuId(request.getrId());
+        setUri(request.getUri());
+    }
+
+    private void setuId(String uId) {
+        this.rId = rId;
+    }
+
+    public String getuId() {
+        return rId;
+    }
+
+    private void setUri(String uri){
+        this.uri = uri;
+    }
+
+    public String getUri(){
+        return uri;
+    }
+
+}
diff --git a/src/main/java/com/example/cosmos_serversb/jsons/UidUriJson.java b/src/main/java/com/example/cosmos_serversb/jsons/UidUriJson.java
new file mode 100644
index 0000000..318c6bd
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/jsons/UidUriJson.java
@@ -0,0 +1,34 @@
+package com.example.cosmos_serversb.jsons;
+
+import com.example.cosmos_serversb.entities.User;
+
+public class UidUriJson {
+    private String uId;
+    private String uri;
+
+    public UidUriJson(){
+
+    }
+
+    public UidUriJson(User user){
+        setuId(user.getuId());
+        setUri(user.getUri());
+    }
+
+    private void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getuId() {
+        return uId;
+    }
+
+    private void setUri(String uri){
+        this.uri = uri;
+    }
+
+    public String getUri(){
+        return uri;
+    }
+
+}
diff --git a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
index b398f67..7c92b29 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
@@ -18,7 +18,7 @@
 @Path("/groups")
 public class GroupsRest {
     @GET
-    public String getGroupsListByUid(@QueryParam("uId") String uId) throws JsonProcessingException{
+    public String getGroupsListByUid(@QueryParam("uId") String uId, @QueryParam("token") String token) throws JsonProcessingException{
         SessionManager.getInstance().getSession();
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(Groups.getInstance().getGroupsListByUid(uId));