diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
index 1201294..f59afb1 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
@@ -67,8 +67,8 @@
     }
 
     public void addWork(Work work) {
-        //var aid = work.getAid();
-        //this.workList.push(work);
+        var aid = work.getAnimation().getAid();
+        this.workHashMap.put(aid,work);
     }
 
     //-----------------------------------------------------------------
@@ -95,25 +95,30 @@
 
     //-----------------------------------------------------------------
     // 招待されている作品を返す
-    public ArrayList<Work> getInvitedList() {
-        var invitedList = new ArrayList<Work>();
+    public HashMap<Integer,Work> getInvitedMap() {
+        var invitedMap = new HashMap<Integer, Work>();
 
         for (var work : workHashMap.values()) {
-            if (work.isInviting()) invitedList.add(work);
+            if (work.isInviting()){
+                var aid = work.getAnimation().getAid();
+                invitedMap.put(aid, work);
+            }
         }
-
-        return invitedList;
+        return invitedMap;
     }
 
     //-----------------------------------------------------------------
     // 参加している作品を返す
-    public ArrayList<Work> getWorkingList() {
-        var workingList = new ArrayList<Work>();
+    public HashMap<Integer,Work> getWorkingList() {
+        var workingMap = new HashMap<Integer, Work>();
 
         for (var work : workHashMap.values()) {
-            if (work.isWorking()) workingList.add(work);
+            if (work.isWorking()){
+                var aid = work.getAnimation().getAid();
+                workingMap.put(aid, work);
+            }
         }
-        return workingList;
+        return workingMap;
     }
 
     //-----------------------------------------------------------------