diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java
index 3ee0c863f..76304ecb0 100644
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java
@@ -56,11 +56,11 @@ public class ModelResp extends SchemaItem {
     }
 
     public List<Measure> getMeasures() {
-        return modelDetail.getMeasures();
+        return modelDetail != null ? modelDetail.getMeasures() : Lists.newArrayList();
     }
 
     public List<Identify> getIdentifiers() {
-        return modelDetail.getIdentifiers();
+        return modelDetail != null ? modelDetail.getIdentifiers() : Lists.newArrayList();
     }
 
     public List<Dimension> getTimeDimension() {
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/AbstractAccelerator.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/AbstractAccelerator.java
index be6847ab4..96ad00fdc 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/AbstractAccelerator.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/AbstractAccelerator.java
@@ -3,7 +3,6 @@ package com.tencent.supersonic.headless.core.executor;
 import com.tencent.supersonic.common.calcite.Configuration;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.core.pojo.Materialization;
-import com.tencent.supersonic.headless.core.translator.parser.TimeRange;
 import com.tencent.supersonic.headless.core.translator.parser.calcite.S2CalciteTable;
 import com.tencent.supersonic.headless.core.translator.parser.calcite.S2CalciteTable.Builder;
 import com.tencent.supersonic.headless.core.translator.parser.calcite.SchemaBuilder;
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/TimeRange.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/TimeRange.java
similarity index 68%
rename from headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/TimeRange.java
rename to headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/TimeRange.java
index f000a3a05..ad68bb30d 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/TimeRange.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/TimeRange.java
@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.translator.parser;
+package com.tencent.supersonic.headless.core.executor;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/Materialization.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/Materialization.java
deleted file mode 100644
index 22dba6edd..000000000
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/Materialization.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.parser;
-
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@Builder
-public class Materialization {
-
-    public enum TimePartType {
-        /**
-         * partition time type 1 - FULL, not use partition 2 - PARTITION , use time list 3 - ZIPPER,
-         * use [startDate, endDate] range time
-         */
-        FULL("FULL"), PARTITION("PARTITION"), ZIPPER("ZIPPER"), None("");
-
-        private String name;
-
-        TimePartType(String name) {
-            this.name = name;
-        }
-
-        public static TimePartType of(String name) {
-            for (TimePartType typeEnum : TimePartType.values()) {
-                if (typeEnum.name.equalsIgnoreCase(name)) {
-                    return typeEnum;
-                }
-            }
-            return TimePartType.None;
-        }
-    }
-
-    private TimePartType timePartType;
-    private String destinationTable;
-    private String dateInfo;
-    private String entities;
-    private Long modelId;
-    private Long dataBase;
-    private Long materializationId;
-    private Integer level;
-    private List<MaterializationElement> dimensions = new ArrayList<>();
-    private List<MaterializationElement> metrics = new ArrayList<>();
-}
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MaterializationElement.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MaterializationElement.java
deleted file mode 100644
index 5824a313f..000000000
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/MaterializationElement.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.parser;
-
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@Builder
-public class MaterializationElement {
-    private List<TimeRange> timeRangeList;
-    private String name;
-}