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 cb48a1e..7be09f3 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
@@ -21,18 +21,34 @@
 package org.ntlab.acanthus_server.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.UUID;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "name",
+        "email",
+        "work"
+})
+
+//
 public class Account {
 
-    private Integer uid;
+    @JsonProperty("name")
     private String name;
+    @JsonProperty("email")
     private String email;
-    private ArrayList<Work> workList = new ArrayList<>();
+    @JsonProperty("work")
+    private HashMap<Integer, Work> workHashMap = new HashMap<>();
 
     @JsonIgnore
+    private Integer uid;
+    @JsonIgnore
     private String token;
     @JsonIgnore
     private String password;
@@ -66,7 +82,8 @@
     }
 
     public void addWork(Work work) {
-        this.workList.add(work);
+        var aid = work.getAnimation().getAid();
+        this.workHashMap.put(aid,work);
     }
 
     //-----------------------------------------------------------------
@@ -93,25 +110,32 @@
 
     //-----------------------------------------------------------------
     // 招待されている作品を返す
-    public ArrayList<Work> getInvitedList() {
-        var invitedList = new ArrayList<Work>();
+    public HashMap<Integer,Work> getInvitedMap() {
+        var invitedMap = new HashMap<Integer, Work>();
 
-        for (var work : workList){
-            if (work.isInviting()) invitedList.add(work);
+        for (var work : workHashMap.values()) {
+            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 : workList) {
-            if (work.isWorking()) workingList.add(work);
+        for (var work : workHashMap.values()) {
+            if (work.isWorking()){
+                var aid = work.getAnimation().getAid();
+                workingMap.put(aid, work);
+            }
         }
-         return workingList;
+        return workingMap;
     }
+
     //-----------------------------------------------------------------
     //-----------------------------------------------------------------
     // トークンを更新する 藤井