diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java
index 80c69ec..0c19c5c 100644
--- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java
+++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/LayersRest.java
@@ -28,7 +28,7 @@
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public Integer getLayers(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid) {
-        var pages = gallery.getAnimationByAid(aid).getPageMap();
+        var pages = gallery.getAnimationByAid(aid).getPages();
         return pages.get(pid).getLayers().size();
     }
 
@@ -42,8 +42,9 @@
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     public Integer addLayer(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid) {
-        var pages = gallery.getAnimationByAid(aid).getPageMap();
-
+        var pages = gallery.getAnimationByAid(aid).getPages();
+        var layerSize = 4;
+        Page page = null;
 
         for (var p : pages) {
             if (!p.getPid().equals(pid)) continue;
@@ -65,7 +66,7 @@
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public Integer getStrokeNo(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @PathParam("layerNo") Integer layerNo) {
-        var pages = gallery.getAnimationByAid(aid).getPageMap();
+        var pages = gallery.getAnimationByAid(aid).getPages();
         var strokes = pages.get(pid).getLayers().get(layerNo).getStrokes();
 
         if (strokes == null) return null;