diff --git a/build.sh b/build.sh
index 3cbc2d4a0..7b1b3c308 100755
--- a/build.sh
+++ b/build.sh
@@ -6,4 +6,5 @@ if [[ -n ${tag} ]]; then
   versionTag="-t flowci/core:$tag"
 fi
 
-docker buildx build -f ./core/Dockerfile --platform linux/arm64,linux/amd64 --push -t flowci/core:latest $versionTag ./core
\ No newline at end of file
+#docker buildx build -f ./core/Dockerfile --platform linux/arm64,linux/amd64 --push -t flowci/core:latest $versionTag ./core
+docker build -f ./core/Dockerfile -t flowci/core:latest $versionTag ./core
\ No newline at end of file
diff --git a/core/Dockerfile b/core/Dockerfile
index 0703cd5f3..006418ecc 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM amazoncorretto:11-alpine3.15
 
 ENV WORKER=/flow.ci
 ENV JAR=flow-ci-core.jar
diff --git a/core/src/main/java/com/flowci/core/flow/controller/YmlController.java b/core/src/main/java/com/flowci/core/flow/controller/YmlController.java
index dfd533125..ba72ebdc4 100644
--- a/core/src/main/java/com/flowci/core/flow/controller/YmlController.java
+++ b/core/src/main/java/com/flowci/core/flow/controller/YmlController.java
@@ -17,15 +17,14 @@
 package com.flowci.core.flow.controller;
 
 import com.flowci.core.auth.annotation.Action;
-import com.flowci.core.common.domain.http.RequestMessage;
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.FlowAction;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.SimpleYml;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.flow.service.YmlService;
 import com.flowci.tree.FlowNode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -35,40 +34,29 @@
  */
 @RestController
 @RequestMapping("/flows")
+@AllArgsConstructor
 public class YmlController {
 
-    @Autowired
     private FlowService flowService;
 
-    @Autowired
-    private YmlService ymlService;
+    private final YmlService ymlService;
 
     @GetMapping("/{flowName}/yml")
-    public List<Yml> list(@PathVariable String flowName) {
+    public FlowYml get(@PathVariable String flowName) {
         Flow flow = flowService.get(flowName);
-        return ymlService.list(flow.getId());
+        return ymlService.get(flow.getId());
     }
 
-    @GetMapping("/{flowName}/yml/{ymlName}/obj")
-    public FlowNode listSteps(@PathVariable String flowName, @PathVariable String ymlName) {
+    @GetMapping("/{flowName}/yml/steps")
+    public FlowNode steps(@PathVariable String flowName) {
         Flow flow = flowService.get(flowName);
-        return ymlService.getTree(flow.getId(), ymlName).getRoot();
+        return ymlService.getTree(flow.getId()).getRoot();
     }
 
-    @PostMapping("/{flowName}/yml/{ymlName}")
+    @PostMapping("/{flowName}/yml")
     @Action(FlowAction.SET_YML)
-    public void saveYml(@PathVariable String flowName,
-                        @PathVariable String ymlName,
-                        @RequestBody RequestMessage<String> body) {
+    public void saveYml(@PathVariable String flowName, @RequestBody List<SimpleYml> body) {
         Flow flow = flowService.get(flowName);
-        String yamlInB64 = body.getData();
-        ymlService.saveYmlFromB64(flow, ymlName, yamlInB64);
-    }
-
-    @GetMapping(value = "/{flowName}/yml/{ymlName}", produces = MediaType.APPLICATION_JSON_VALUE)
-    @Action(FlowAction.GET_YML)
-    public String getYml(@PathVariable String flowName, @PathVariable String ymlName) {
-        Flow flow = flowService.get(flowName);
-        return ymlService.getYmlString(flow.getId(), ymlName);
+        ymlService.saveYml(flow, body);
     }
 }
diff --git a/core/src/main/java/com/flowci/core/flow/dao/YmlDao.java b/core/src/main/java/com/flowci/core/flow/dao/FlowYmlDao.java
similarity index 73%
rename from core/src/main/java/com/flowci/core/flow/dao/YmlDao.java
rename to core/src/main/java/com/flowci/core/flow/dao/FlowYmlDao.java
index 7b1dc4f4f..2e5386952 100644
--- a/core/src/main/java/com/flowci/core/flow/dao/YmlDao.java
+++ b/core/src/main/java/com/flowci/core/flow/dao/FlowYmlDao.java
@@ -16,7 +16,7 @@
 
 package com.flowci.core.flow.dao;
 
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.FlowYml;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
@@ -26,11 +26,9 @@
  * @author yang
  */
 @Repository
-public interface YmlDao extends YmlCustomDao, MongoRepository<Yml, String> {
+public interface FlowYmlDao extends MongoRepository<FlowYml, String> {
 
-    Optional<Yml> findByFlowIdAndName(String flowId, String name);
+    Optional<FlowYml> findByFlowId(String flowId);
 
-    void deleteAllByFlowId(String flowId);
-
-    void deleteByFlowIdAndName(String flowId, String name);
+    void deleteByFlowId(String flowId);
 }
diff --git a/core/src/main/java/com/flowci/core/flow/dao/YmlCustomDao.java b/core/src/main/java/com/flowci/core/flow/dao/YmlCustomDao.java
deleted file mode 100644
index ac4bfc7ce..000000000
--- a/core/src/main/java/com/flowci/core/flow/dao/YmlCustomDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.flowci.core.flow.dao;
-
-import com.flowci.core.flow.domain.Yml;
-
-import java.util.List;
-
-public interface YmlCustomDao {
-
-    /**
-     * List all Yml instance without raw yaml string
-     */
-    List<Yml> findAllWithoutRawByFlowId(String flowId);
-
-}
diff --git a/core/src/main/java/com/flowci/core/flow/dao/YmlCustomDaoImpl.java b/core/src/main/java/com/flowci/core/flow/dao/YmlCustomDaoImpl.java
deleted file mode 100644
index 5d6ec1881..000000000
--- a/core/src/main/java/com/flowci/core/flow/dao/YmlCustomDaoImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.flowci.core.flow.dao;
-
-import com.flowci.core.flow.domain.Yml;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-
-import java.util.List;
-
-import static com.flowci.core.common.domain.Mongoable.SortByCreatedAtASC;
-
-public class YmlCustomDaoImpl implements YmlCustomDao {
-
-    @Autowired
-    private MongoOperations operations;
-
-    @Override
-    public List<Yml> findAllWithoutRawByFlowId(String flowId) {
-        Query query = Query.query(Criteria.where("flowId").is(flowId)).with(SortByCreatedAtASC);
-        query.fields()
-                .include("id")
-                .include("name")
-                .include("flowId")
-                .include("conditionInB64")
-                .include("createdBy")
-                .include("createdAt")
-                .include("updatedAt")
-                .include("updatedBy");
-
-        return operations.find(query, Yml.class);
-    }
-}
diff --git a/core/src/main/java/com/flowci/core/flow/domain/CreateOption.java b/core/src/main/java/com/flowci/core/flow/domain/CreateOption.java
index 20de7826d..e736e6ebd 100644
--- a/core/src/main/java/com/flowci/core/flow/domain/CreateOption.java
+++ b/core/src/main/java/com/flowci/core/flow/domain/CreateOption.java
@@ -22,6 +22,8 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Objects;
+
 /**
  * @author yang
  */
@@ -29,6 +31,8 @@
 @Accessors(chain = true)
 public class CreateOption {
 
+    private static final String TEMPLATE_BLANK = "_blank_";
+
     private String groupName;
 
     @JsonProperty("title")
@@ -40,6 +44,10 @@ public class CreateOption {
     @JsonProperty("yml")
     private String rawYaml;
 
+    public boolean isBlank() {
+        return Objects.equals(templateTitle, TEMPLATE_BLANK);
+    }
+
     public boolean hasGroupName() {
         return StringHelper.hasValue(groupName);
     }
diff --git a/core/src/main/java/com/flowci/core/flow/domain/Yml.java b/core/src/main/java/com/flowci/core/flow/domain/FlowYml.java
similarity index 61%
rename from core/src/main/java/com/flowci/core/flow/domain/Yml.java
rename to core/src/main/java/com/flowci/core/flow/domain/FlowYml.java
index 0563a27ae..d78da9e27 100644
--- a/core/src/main/java/com/flowci/core/flow/domain/Yml.java
+++ b/core/src/main/java/com/flowci/core/flow/domain/FlowYml.java
@@ -18,15 +18,21 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.flowci.core.common.domain.Mongoable;
+import com.flowci.util.ObjectsHelper;
 import com.flowci.util.StringHelper;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.validator.internal.util.CollectionHelper;
 import org.springframework.data.mongodb.core.index.CompoundIndex;
 import org.springframework.data.mongodb.core.index.CompoundIndexes;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @author yang
  */
@@ -34,33 +40,34 @@
 @Setter
 @Document(collection = "flow_yml")
 @NoArgsConstructor
+@AllArgsConstructor
 @CompoundIndexes(
         @CompoundIndex(
-                name = "index_flow_id_and_yaml_name",
-                def = "{'flowId': 1, 'name': 1}",
+                name = "index_flow_id_and_yml_name",
+                def = "{'flowId': 1, 'list.name': 1}",
                 sparse = true,
                 unique = true
         )
 )
-public class Yml extends Mongoable {
+public class FlowYml extends Mongoable {
 
-    public final static String DEFAULT_NAME = "default";
+    public final static String DEFAULT_NAME = ".flowci.yml";
 
-    @Indexed(name = "index_flow_id")
+    @Indexed(name = "index_yml_flow_id", unique = true)
     private String flowId;
 
-    private String name;
-
-    private String rawInB64;
+    private List<SimpleYml> list;
 
-    public Yml(String flowId, String name, String rawInB64) {
-        this.flowId = flowId;
-        this.name = name;
-        this.rawInB64 = rawInB64;
+    public boolean hasYml() {
+        return ObjectsHelper.hasCollection(list);
     }
 
-    @JsonIgnore
-    public String getRaw() {
-        return StringHelper.fromBase64(rawInB64);
+    public static String[] toRawArray(List<SimpleYml> list) {
+        var array = new String[list.size()];
+        int i = 0;
+        for (var item : list) {
+            array[0] = StringHelper.fromBase64(item.getRawInB64());
+        }
+        return array;
     }
 }
diff --git a/core/src/main/java/com/flowci/core/flow/domain/SimpleYml.java b/core/src/main/java/com/flowci/core/flow/domain/SimpleYml.java
new file mode 100644
index 000000000..614ce89d1
--- /dev/null
+++ b/core/src/main/java/com/flowci/core/flow/domain/SimpleYml.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flowci.core.flow.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimpleYml {
+
+    private String name;
+
+    private String rawInB64;
+}
diff --git a/core/src/main/java/com/flowci/core/flow/service/CronServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/CronServiceImpl.java
index 198767d72..97ecc9c63 100644
--- a/core/src/main/java/com/flowci/core/flow/service/CronServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/CronServiceImpl.java
@@ -22,13 +22,11 @@
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.common.manager.SpringTaskManager;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
 import com.flowci.core.flow.event.FlowInitEvent;
 import com.flowci.core.job.domain.Job.Trigger;
 import com.flowci.core.job.event.CreateNewJobEvent;
 import com.flowci.exception.NotFoundException;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.support.CronTrigger;
@@ -50,17 +48,20 @@ public class CronServiceImpl implements CronService {
 
     private final Map<String, ScheduledFuture<?>> scheduled = new ConcurrentHashMap<>();
 
-    @Autowired
-    private TaskScheduler cronScheduler;
+    private final TaskScheduler cronScheduler;
 
-    @Autowired
-    private SpringEventManager eventManager;
+    private final SpringEventManager eventManager;
 
-    @Autowired
-    private SpringTaskManager taskManager;
+    private final SpringTaskManager taskManager;
 
-    @Autowired
-    private YmlService ymlService;
+    private final YmlService ymlService;
+
+    public CronServiceImpl(TaskScheduler cronScheduler, SpringEventManager eventManager, SpringTaskManager taskManager, YmlService ymlService) {
+        this.cronScheduler = cronScheduler;
+        this.eventManager = eventManager;
+        this.taskManager = taskManager;
+        this.ymlService = ymlService;
+    }
 
     //====================================================================
     //        %% Internal events
@@ -121,10 +122,9 @@ public void run() {
 
             taskManager.run(taskName, false, () -> {
                 try {
-                    Yml yml = ymlService.getYml(flow.getId(), Yml.DEFAULT_NAME);
                     log.info("Start flow '{}' from cron task", flow.getName());
-
-                    eventManager.publish(new CreateNewJobEvent(this, flow, yml.getRaw(), Trigger.SCHEDULER, null));
+                    var event = new CreateNewJobEvent(this, flow, ymlService.get(flow.getId()), Trigger.SCHEDULER, null);
+                    eventManager.publish(event);
                 } catch (NotFoundException ignore) {
                     // ignore
                 }
diff --git a/core/src/main/java/com/flowci/core/flow/service/FlowGroupServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/FlowGroupServiceImpl.java
index 98371398e..da26abf86 100644
--- a/core/src/main/java/com/flowci/core/flow/service/FlowGroupServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/FlowGroupServiceImpl.java
@@ -11,6 +11,7 @@
 import com.flowci.exception.DuplicateException;
 import com.flowci.exception.NotFoundException;
 import com.google.common.collect.Sets;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
@@ -19,6 +20,7 @@
 import java.util.Optional;
 
 @Service
+@AllArgsConstructor
 public class FlowGroupServiceImpl implements FlowGroupService {
 
     private final FlowDao flowDao;
@@ -29,17 +31,6 @@ public class FlowGroupServiceImpl implements FlowGroupService {
 
     private final SessionManager sessionManager;
 
-    @Autowired
-    public FlowGroupServiceImpl(FlowDao flowDao,
-                                FlowGroupDao flowGroupDao,
-                                FlowUserDao flowUserDao,
-                                SessionManager sessionManager) {
-        this.flowDao = flowDao;
-        this.flowGroupDao = flowGroupDao;
-        this.flowUserDao = flowUserDao;
-        this.sessionManager = sessionManager;
-    }
-
     @Override
     public FlowGroup get(String name) {
         Optional<FlowGroup> optional = flowGroupDao.findByName(name);
diff --git a/core/src/main/java/com/flowci/core/flow/service/FlowItemServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/FlowItemServiceImpl.java
index c431fec74..b72506fcf 100644
--- a/core/src/main/java/com/flowci/core/flow/service/FlowItemServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/FlowItemServiceImpl.java
@@ -5,11 +5,13 @@
 import com.flowci.core.flow.dao.FlowUserDao;
 import com.flowci.core.flow.domain.FlowItem;
 import com.google.common.collect.ImmutableList;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
 
 @Service
+@AllArgsConstructor
 public class FlowItemServiceImpl implements FlowItemService {
 
     private final FlowItemDao flowItemDao;
@@ -18,12 +20,6 @@ public class FlowItemServiceImpl implements FlowItemService {
 
     private final SessionManager sessionManager;
 
-    public FlowItemServiceImpl(FlowItemDao flowItemDao, FlowUserDao flowUserDao, SessionManager sessionManager) {
-        this.flowItemDao = flowItemDao;
-        this.flowUserDao = flowUserDao;
-        this.sessionManager = sessionManager;
-    }
-
     @Override
     public List<FlowItem> list() {
         var email = sessionManager.getUserEmail();
diff --git a/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
index f8f864e7a..b20a7a6d3 100644
--- a/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java
@@ -34,22 +34,20 @@
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.event.CreateNewJobEvent;
 import com.flowci.core.secret.domain.Secret;
-import com.flowci.core.secret.event.CreateAuthEvent;
-import com.flowci.core.secret.event.CreateRsaEvent;
 import com.flowci.core.secret.event.GetSecretEvent;
 import com.flowci.core.user.event.UserDeletedEvent;
-import com.flowci.domain.*;
+import com.flowci.domain.StringVars;
+import com.flowci.domain.VarType;
+import com.flowci.domain.VarValue;
 import com.flowci.exception.ArgumentException;
 import com.flowci.exception.DuplicateException;
 import com.flowci.exception.NotFoundException;
 import com.flowci.exception.StatusException;
 import com.flowci.store.FileManager;
-import com.flowci.util.ObjectsHelper;
 import com.flowci.util.StringHelper;
 import com.google.common.collect.Sets;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.dao.DuplicateKeyException;
@@ -63,41 +61,30 @@
  */
 @Log4j2
 @Service
+@AllArgsConstructor
 public class FlowServiceImpl implements FlowService {
 
-    @Autowired
-    private FlowDao flowDao;
+    private final FlowDao flowDao;
 
-    @Autowired
-    private FlowGroupDao flowGroupDao;
+    private final FlowGroupDao flowGroupDao;
 
-    @Autowired
-    private FlowUserDao flowUserDao;
+    private final FlowUserDao flowUserDao;
 
-    @Autowired
-    private SessionManager sessionManager;
+    private final SessionManager sessionManager;
 
-    @Autowired
-    private SpringEventManager eventManager;
+    private final SpringEventManager eventManager;
 
-    @Qualifier("fileManager")
-    @Autowired
-    private FileManager fileManager;
+    private final FileManager fileManager;
 
-    @Autowired
-    private HttpRequestManager httpRequestManager;
+    private final HttpRequestManager httpRequestManager;
 
-    @Autowired
-    private YmlService ymlService;
+    private final YmlService ymlService;
 
-    @Autowired
-    private CronService cronService;
+    private final CronService cronService;
 
-    @Autowired
-    private List<Template> templates;
+    private final List<Template> templates;
 
-    @Autowired
-    private AppProperties appProperties;
+    private final AppProperties appProperties;
 
     @EventListener(ContextRefreshedEvent.class)
     public void initFlows() {
@@ -132,8 +119,9 @@ public List<Flow> listByCredential(String secretName) {
 
     @Override
     public Flow create(String name, CreateOption option) {
+        Objects.requireNonNull(option, "CreateOption is missing");
         Flow.validateName(name);
-        var yamlContent = getYmlContent(option);
+
         var flow = new Flow(name);
         flow.getVars().put(Variables.Flow.Name, VarValue.of(flow.getName(), VarType.STRING, false));
 
@@ -148,7 +136,11 @@ public Flow create(String name, CreateOption option) {
         try {
             flowDao.save(flow);
             fileManager.create(flow);
-            ymlService.saveYml(flow, Yml.DEFAULT_NAME, yamlContent);
+
+            if (!option.isBlank()) {
+                var b64Content = getBase64Content(option);
+                ymlService.saveYml(flow, List.of(new SimpleYml(FlowYml.DEFAULT_NAME, b64Content)));
+            }
 
             flowUserDao.create(flow.getId());
             addUsers(flow, flow.getUpdatedBy());
@@ -267,26 +259,26 @@ public void onGitHookEvent(GitHookEvent event) {
         StringVars gitInput = trigger.toVariableMap();
         Job.Trigger jobTrigger = trigger.toJobTrigger();
 
-        Yml yml = ymlService.getYml(flow.getId(), Yml.DEFAULT_NAME);
-        eventManager.publish(new CreateNewJobEvent(this, flow, yml.getRaw(), jobTrigger, gitInput));
+        var outEvent = new CreateNewJobEvent(this, flow, ymlService.get(flow.getId()), jobTrigger, gitInput);
+        eventManager.publish(outEvent);
     }
 
-
     // ====================================================================
     // %% Utils
     // ====================================================================
 
-    private String getYmlContent(CreateOption option) {
+    private String getBase64Content(CreateOption option) {
         if (option.hasTemplateTitle()) {
             try {
-                return loadYmlFromTemplate(option.getTemplateTitle());
+                String content = loadYmlFromTemplate(option.getTemplateTitle());
+                return StringHelper.toBase64(content);
             } catch (IOException e) {
                 throw new NotFoundException("Unable to load template {0} content", option.getTemplateTitle());
             }
         }
 
         if (option.hasRawYaml()) {
-            return StringHelper.fromBase64(option.getRawYaml());
+            return option.getRawYaml();
         }
 
         throw new NotFoundException("Yaml content or template name not found");
diff --git a/core/src/main/java/com/flowci/core/flow/service/FlowSettingServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/FlowSettingServiceImpl.java
index 0bdfc4228..9388a8b07 100644
--- a/core/src/main/java/com/flowci/core/flow/service/FlowSettingServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/FlowSettingServiceImpl.java
@@ -24,6 +24,7 @@
 import com.flowci.domain.VarValue;
 import com.flowci.exception.ArgumentException;
 import com.flowci.util.StringHelper;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,17 +38,15 @@
 
 @Log4j2
 @Service
+@AllArgsConstructor
 public class FlowSettingServiceImpl implements FlowSettingService {
 
-    @Autowired
-    private FlowDao flowDao;
+    private final FlowDao flowDao;
 
-    @Autowired
-    private VarManager varManager;
-
-    @Autowired
-    private CronService cronService;
+    private final VarManager varManager;
 
+    private final CronService cronService;
+    
     @Override
     public void set(Flow flow, Settings settings) {
         if (settings.hasCron()) {
diff --git a/core/src/main/java/com/flowci/core/flow/service/GitConnServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/GitConnServiceImpl.java
index 9250bf546..65d9e5616 100644
--- a/core/src/main/java/com/flowci/core/flow/service/GitConnServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/GitConnServiceImpl.java
@@ -32,6 +32,7 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.task.TaskExecutor;
@@ -46,22 +47,18 @@
  */
 @Log4j2
 @Service("gitConnService")
+@AllArgsConstructor
 public class GitConnServiceImpl implements GitConnService {
 
-    @Autowired
-    private TaskExecutor appTaskExecutor;
+    private final TaskExecutor appTaskExecutor;
 
-    @Autowired
-    private Path tmpDir;
+    private final Path tmpDir;
 
-    @Autowired
-    private Cache<String, List<String>> gitBranchCache;
+    private final Cache<String, List<String>> gitBranchCache;
 
-    @Autowired
-    private SpringEventManager eventManager;
+    private final SpringEventManager eventManager;
 
-    @Autowired
-    private SecretService credentialService;
+    private final SecretService credentialService;
 
     @Override
     public void testConn(Flow flow, String url, String secret) {
diff --git a/core/src/main/java/com/flowci/core/flow/service/MatrixServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/MatrixServiceImpl.java
index a94bb47ed..96303cb73 100644
--- a/core/src/main/java/com/flowci/core/flow/service/MatrixServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/MatrixServiceImpl.java
@@ -20,7 +20,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.helper.DateHelper;
 import com.flowci.core.flow.dao.MatrixItemDao;
-import com.flowci.core.flow.domain.*;
+import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.MatrixCounter;
+import com.flowci.core.flow.domain.MatrixItem;
+import com.flowci.core.flow.domain.MatrixType;
 import com.flowci.core.flow.event.FlowDeletedEvent;
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.event.JobStatusChangeEvent;
@@ -30,7 +33,6 @@
 import com.flowci.tree.NodeTree;
 import com.flowci.util.StringHelper;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.io.Resource;
@@ -48,27 +50,30 @@
 @Service
 public class MatrixServiceImpl implements MatrixService {
 
-    private static final TypeReference<List<MatrixType>> StatsTypeRef = new TypeReference<List<MatrixType>>() {
+    private static final TypeReference<List<MatrixType>> StatsTypeRef = new TypeReference<>() {
     };
 
+    private final Object statsSync = new Object();
+
+    private final Map<String, MatrixType> defaultTypes = new HashMap<>(5);
+
     @Value("classpath:default_statistic_type.json")
     private Resource defaultTypeJsonFile;
 
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Autowired
-    private MatrixItemDao matrixItemDao;
+    private final ObjectMapper objectMapper;
 
-    @Autowired
-    private YmlService ymlService;
+    private final MatrixItemDao matrixItemDao;
 
-    @Autowired
-    private PluginService pluginService;
+    private final YmlService ymlService;
 
-    private final Object statsSync = new Object();
+    private final PluginService pluginService;
 
-    private final Map<String, MatrixType> defaultTypes = new HashMap<>(5);
+    public MatrixServiceImpl(ObjectMapper objectMapper, MatrixItemDao matrixItemDao, YmlService ymlService, PluginService pluginService) {
+        this.objectMapper = objectMapper;
+        this.matrixItemDao = matrixItemDao;
+        this.ymlService = ymlService;
+        this.pluginService = pluginService;
+    }
 
     @PostConstruct
     public void loadDefaultTypes() {
@@ -113,21 +118,14 @@ public Map<String, MatrixType> defaultTypes() {
     @Override
     public List<MatrixType> getStatsType(Flow flow) {
         List<MatrixType> list = new LinkedList<>(defaultTypes.values());
+        NodeTree tree = ymlService.getTree(flow.getId());
 
-        List<Yml> yamlList = ymlService.list(flow.getId());
-        if (yamlList.isEmpty()) {
-            return list;
-        }
-
-        for (Yml item : yamlList) {
-            NodeTree tree = ymlService.getTree(flow.getId(), item.getName());
-            for (String pluginName : tree.getPlugins()) {
-                try {
-                    Plugin plugin = pluginService.get(pluginName);
-                    list.addAll(plugin.getMeta().getMatrixTypes());
-                } catch (NotFoundException ignore) {
+        for (String pluginName : tree.getPlugins()) {
+            try {
+                Plugin plugin = pluginService.get(pluginName);
+                list.addAll(plugin.getMeta().getMatrixTypes());
+            } catch (NotFoundException ignore) {
 
-                }
             }
         }
 
diff --git a/core/src/main/java/com/flowci/core/flow/service/YmlService.java b/core/src/main/java/com/flowci/core/flow/service/YmlService.java
index fc3cf1db2..5c2c3b0ef 100644
--- a/core/src/main/java/com/flowci/core/flow/service/YmlService.java
+++ b/core/src/main/java/com/flowci/core/flow/service/YmlService.java
@@ -17,10 +17,10 @@
 package com.flowci.core.flow.service;
 
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.SimpleYml;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.tree.NodeTree;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
 /**
@@ -29,46 +29,26 @@
 public interface YmlService {
 
     /**
-     * List Yml instance without raw field
-     */
-    List<Yml> list(String flowId);
-
-    /**
-     * Get NodeTree from yaml
+     * Get yml list by flow id
      *
      * @throws com.flowci.exception.NotFoundException if YML not found
      */
-    NodeTree getTree(String flowId, String name);
+    FlowYml get(String flowId);
 
     /**
-     * Get yml by flow id and yaml name
+     * Get NodeTree from yaml
      *
      * @throws com.flowci.exception.NotFoundException if YML not found
      */
-    Yml getYml(String flowId, String name);
-
-    /**
-     * Get b64 yml string only by flow id and yaml name
-     */
-    @Nullable
-    String getYmlString(String flowId, String name);
+    NodeTree getTree(String flowId);
 
     /**
      * Create or update yml for flow
-     *
-     * @throws com.flowci.exception.ArgumentException if yml string is empty or null
      */
-    Yml saveYml(Flow flow, String name, String yml);
-
-    Yml saveYmlFromB64(Flow flow, String name, String ymlInB64);
+    FlowYml saveYml(Flow flow, List<SimpleYml> list);
 
     /**
      * Delete all yaml of flow
      */
     void delete(String flowId);
-
-    /**
-     * Delete a yaml in flow
-     */
-    void delete(String flowId, String name);
 }
diff --git a/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java b/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java
index 60f0563ea..6955d1f0f 100644
--- a/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/flow/service/YmlServiceImpl.java
@@ -20,13 +20,13 @@
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.config.event.GetConfigEvent;
 import com.flowci.core.flow.dao.FlowDao;
-import com.flowci.core.flow.dao.YmlDao;
+import com.flowci.core.flow.dao.FlowYmlDao;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.SimpleYml;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.plugin.event.GetPluginEvent;
 import com.flowci.core.secret.event.GetSecretEvent;
 import com.flowci.domain.Vars;
-import com.flowci.exception.ArgumentException;
 import com.flowci.exception.DuplicateException;
 import com.flowci.exception.NotFoundException;
 import com.flowci.tree.FlowNode;
@@ -35,10 +35,10 @@
 import com.flowci.util.StringHelper;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.google.common.collect.ImmutableList;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -50,66 +50,65 @@
 @Service
 public class YmlServiceImpl implements YmlService {
 
-    private final List<NodeElementChecker> elementCheckers = ImmutableList.of(
-            new ConditionChecker(),
-            new ConfigChecker(),
-            new PluginChecker(),
-            new SecretChecker()
-    );
+    private final List<NodeElementChecker> elementCheckers = ImmutableList.of(new ConditionChecker(), new ConfigChecker(), new PluginChecker(), new SecretChecker());
 
-    @Autowired
-    private Cache<String, NodeTree> flowTreeCache;
+    private final Cache<String, NodeTree> flowTreeCache;
 
-    @Autowired
-    private YmlDao ymlDao;
+    private final FlowYmlDao flowYmlDao;
 
-    @Autowired
-    private FlowDao flowDao;
+    private final FlowDao flowDao;
 
-    @Autowired
-    private SpringEventManager eventManager;
+    private final SpringEventManager eventManager;
 
-    @Autowired
-    private ConditionManager conditionManager;
+    private final ConditionManager conditionManager;
+
+    public YmlServiceImpl(Cache<String, NodeTree> flowTreeCache,
+                          FlowYmlDao flowYmlDao,
+                          FlowDao flowDao,
+                          SpringEventManager eventManager,
+                          ConditionManager conditionManager) {
+        this.flowTreeCache = flowTreeCache;
+        this.flowYmlDao = flowYmlDao;
+        this.flowDao = flowDao;
+        this.eventManager = eventManager;
+        this.conditionManager = conditionManager;
+    }
 
     //====================================================================
     //        %% Public function
     //====================================================================
 
     @Override
-    public List<Yml> list(String flowId) {
-        return ymlDao.findAllWithoutRawByFlowId(flowId);
-    }
-
-    @Override
-    public NodeTree getTree(String flowId, String name) {
-        Yml yml = getYml(flowId, name);
-        FlowNode root = YmlParser.load(yml.getRaw());
-        return flowTreeCache.get(yamlCacheKey(flowId, name), key -> NodeTree.create(root));
-    }
-
-    @Override
-    public Yml getYml(String flowId, String name) {
-        Optional<Yml> optional = ymlDao.findByFlowIdAndName(flowId, name);
-        if (optional.isPresent()) {
-            return optional.get();
+    public FlowYml get(String flowId) {
+        var yml = flowYmlDao.findByFlowId(flowId);
+        if (yml.isPresent() && yml.get().hasYml()) {
+            return yml.get();
         }
         throw new NotFoundException("YAML not found");
     }
 
     @Override
-    public String getYmlString(String flowId, String name) {
-        Yml yml = getYml(flowId, name);
-        return yml.getRawInB64();
+    public NodeTree getTree(String flowId) {
+        return flowTreeCache.get(yamlCacheKey(flowId), key -> {
+            var list = get(flowId).getList();
+            var ymlContentList = new String[list.size()];
+            for (int i = 0; i < list.size(); i++) {
+                ymlContentList[i] = StringHelper.fromBase64(list.get(i).getRawInB64());
+            }
+
+            FlowNode root = YmlParser.load(ymlContentList);
+            return NodeTree.create(root);
+        });
     }
 
     @Override
-    public Yml saveYml(Flow flow, String name, String yaml) {
-        if (!StringHelper.hasValue(yaml)) {
-            throw new ArgumentException("YAML content cannot be null or empty");
+    public FlowYml saveYml(Flow flow, List<SimpleYml> list) {
+        var ymlContentList = new String[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+            ymlContentList[i] = StringHelper.fromBase64(list.get(i).getRawInB64());
         }
 
-        FlowNode root = YmlParser.load(yaml);
+        FlowNode root = YmlParser.load(ymlContentList);
         NodeTree tree = NodeTree.create(root);
 
         for (NodeElementChecker checker : elementCheckers) {
@@ -119,12 +118,7 @@ public Yml saveYml(Flow flow, String name, String yaml) {
             }
         }
 
-        Yml ymlObj = getOrCreate(flow.getId(), name, StringHelper.toBase64(yaml));
-        try {
-            ymlDao.save(ymlObj);
-        } catch (DuplicateKeyException e) {
-            throw new DuplicateException("Yaml name or condition already existed");
-        }
+        var ymlEntity = save(flow, list);
 
         // sync flow envs from yml root envs
         Vars<String> vars = flow.getReadOnlyVars();
@@ -133,38 +127,32 @@ public Yml saveYml(Flow flow, String name, String yaml) {
         flowDao.save(flow);
 
         // put tree into cache
-        flowTreeCache.put(yamlCacheKey(flow.getId(), name), tree);
-        return ymlObj;
-    }
-
-    @Override
-    public Yml saveYmlFromB64(Flow flow, String name, String ymlInB64) {
-        String yaml = StringHelper.fromBase64(ymlInB64);
-        return saveYml(flow, name, yaml);
+        flowTreeCache.put(yamlCacheKey(flow.getId()), tree);
+        return ymlEntity;
     }
 
     @Override
     public void delete(String flowId) {
-        ymlDao.deleteAllByFlowId(flowId);
+        flowYmlDao.deleteByFlowId(flowId);
     }
 
-    @Override
-    public void delete(String flowId, String name) {
-        ymlDao.deleteByFlowIdAndName(flowId, name);
-    }
+    private FlowYml save(Flow flow, List<SimpleYml> list) {
+        try {
+            var optional = flowYmlDao.findByFlowId(flow.getId());
+            if (optional.isPresent()) {
+                var entity = optional.get();
+                entity.setList(list);
+                return flowYmlDao.save(entity);
+            }
 
-    private String yamlCacheKey(String flowId, String name) {
-        return flowId + "-" + name;
+            return flowYmlDao.save(new FlowYml(flow.getId(), list));
+        } catch (DuplicateKeyException e) {
+            throw new DuplicateException("Yaml name or condition already existed");
+        }
     }
 
-    private Yml getOrCreate(String flowId, String name, String ymlInB64) {
-        Optional<Yml> optional = ymlDao.findByFlowIdAndName(flowId, name);
-        if (optional.isPresent()) {
-            Yml yml = optional.get();
-            yml.setRawInB64(ymlInB64);
-            return yml;
-        }
-        return new Yml(flowId, name, ymlInB64);
+    private static String yamlCacheKey(String flowId) {
+        return flowId;
     }
 
     private interface NodeElementChecker extends Function<NodeTree, Optional<RuntimeException>> {
diff --git a/core/src/main/java/com/flowci/core/job/controller/ArtifactController.java b/core/src/main/java/com/flowci/core/job/controller/ArtifactController.java
index 6718354d1..c212507af 100644
--- a/core/src/main/java/com/flowci/core/job/controller/ArtifactController.java
+++ b/core/src/main/java/com/flowci/core/job/controller/ArtifactController.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.controller;
 
 import com.flowci.core.auth.annotation.Action;
diff --git a/core/src/main/java/com/flowci/core/job/controller/BaseController.java b/core/src/main/java/com/flowci/core/job/controller/BaseController.java
index 08ddd81b8..ac57e98a3 100644
--- a/core/src/main/java/com/flowci/core/job/controller/BaseController.java
+++ b/core/src/main/java/com/flowci/core/job/controller/BaseController.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.controller;
 
 import com.flowci.core.flow.domain.Flow;
diff --git a/core/src/main/java/com/flowci/core/job/controller/JobController.java b/core/src/main/java/com/flowci/core/job/controller/JobController.java
index d6eac4fbb..b23546ec8 100644
--- a/core/src/main/java/com/flowci/core/job/controller/JobController.java
+++ b/core/src/main/java/com/flowci/core/job/controller/JobController.java
@@ -19,22 +19,16 @@
 import com.flowci.core.auth.annotation.Action;
 import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
 import com.flowci.core.flow.service.YmlService;
 import com.flowci.core.job.domain.*;
 import com.flowci.core.job.domain.Job.Trigger;
 import com.flowci.core.job.service.ReportService;
-import com.flowci.core.user.domain.User;
-import com.flowci.exception.NotFoundException;
-import com.flowci.util.StringHelper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -46,17 +40,23 @@
 @RequestMapping("/jobs")
 public class JobController extends BaseController {
 
-    @Autowired
-    private SessionManager sessionManager;
+    private final SessionManager sessionManager;
 
-    @Autowired
-    private YmlService ymlService;
+    private final YmlService ymlService;
 
-    @Autowired
-    private ReportService reportService;
+    private final ReportService reportService;
 
-    @Autowired
-    private TaskExecutor appTaskExecutor;
+    private final TaskExecutor appTaskExecutor;
+
+    public JobController(SessionManager sessionManager,
+                         YmlService ymlService,
+                         ReportService reportService,
+                         TaskExecutor appTaskExecutor) {
+        this.sessionManager = sessionManager;
+        this.ymlService = ymlService;
+        this.reportService = reportService;
+        this.appTaskExecutor = appTaskExecutor;
+    }
 
     @PostMapping("/batch/latest")
     @Action(JobAction.LIST)
@@ -91,24 +91,21 @@ public JobDesc getDesc(@PathVariable String jobId) {
 
     @GetMapping(value = "/{flow}/{buildNumber}/yml", produces = MediaType.APPLICATION_JSON_VALUE)
     @Action(JobAction.GET_YML)
-    public String getYml(@PathVariable String flow, @PathVariable String buildNumber) {
+    public JobYml getYml(@PathVariable String flow, @PathVariable String buildNumber) {
         Job job = get(flow, buildNumber);
-        JobYml yml = jobService.getYml(job);
-        return Base64.getEncoder().encodeToString(yml.getRaw().getBytes());
+        return jobService.getYml(job);
     }
 
     @GetMapping("/{flow}/{buildNumberOrLatest}/steps")
     @Action(JobAction.LIST_STEPS)
-    public List<Step> listSteps(@PathVariable String flow,
-                                @PathVariable String buildNumberOrLatest) {
+    public List<Step> steps(@PathVariable String flow, @PathVariable String buildNumberOrLatest) {
         Job job = get(flow, buildNumberOrLatest);
         return stepService.list(job);
     }
 
     @GetMapping("/{flow}/{buildNumberOrLatest}/related")
     @Action(JobAction.LIST)
-    public List<JobDesc> listRelated(@PathVariable String flow,
-                                     @PathVariable String buildNumberOrLatest) {
+    public List<JobDesc> relatedJobs(@PathVariable String flow, @PathVariable String buildNumberOrLatest) {
         Job job = get(flow, buildNumberOrLatest);
         return jobService.listRelated(job);
     }
@@ -116,27 +113,22 @@ public List<JobDesc> listRelated(@PathVariable String flow,
     @PostMapping
     @Action(JobAction.CREATE)
     public Job create(@Validated @RequestBody CreateJob data) {
-        Flow flow = flowService.get(data.getFlow());
-        String b64Yaml = ymlService.getYmlString(flow.getId(), Yml.DEFAULT_NAME);
-        return jobService.create(flow, StringHelper.fromBase64(b64Yaml), Trigger.API, data.getInputs());
+        var flow = flowService.get(data.getFlow());
+        var ymlEntity = ymlService.get(flow.getId());
+        return jobService.create(flow, ymlEntity.getList(), Trigger.API, data.getInputs());
     }
 
     @PostMapping("/run")
     @Action(JobAction.RUN)
     public void createAndStart(@Validated @RequestBody CreateJob body) {
-        User current = sessionManager.get();
-        Flow flow = flowService.get(body.getFlow());
-        String b64Yml = ymlService.getYmlString(flow.getId(), Yml.DEFAULT_NAME);
-        if (!StringHelper.hasValue(b64Yml)) {
-            throw new NotFoundException("YAML not found");
-        }
-
-        String ymlStr = StringHelper.fromBase64(b64Yml);
+        var current = sessionManager.get();
+        var flow = flowService.get(body.getFlow());
+        var ymlEntity = ymlService.get(flow.getId());
 
         // start from thread since could be loading yaml from git repo
         appTaskExecutor.execute(() -> {
             sessionManager.set(current);
-            Job job = jobService.create(flow, ymlStr, Trigger.API, body.getInputs());
+            Job job = jobService.create(flow, ymlEntity.getList(), Trigger.API, body.getInputs());
             jobService.start(job);
         });
     }
diff --git a/core/src/main/java/com/flowci/core/job/controller/LoggingController.java b/core/src/main/java/com/flowci/core/job/controller/LoggingController.java
index 5fa26f68d..00c564ea3 100644
--- a/core/src/main/java/com/flowci/core/job/controller/LoggingController.java
+++ b/core/src/main/java/com/flowci/core/job/controller/LoggingController.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.controller;
 
 import com.flowci.core.auth.annotation.Action;
diff --git a/core/src/main/java/com/flowci/core/job/controller/TtyController.java b/core/src/main/java/com/flowci/core/job/controller/TtyController.java
index 03cf1cba4..b1e38e7e4 100644
--- a/core/src/main/java/com/flowci/core/job/controller/TtyController.java
+++ b/core/src/main/java/com/flowci/core/job/controller/TtyController.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.controller;
 
 import com.flowci.core.agent.domain.TtyCmd;
@@ -21,14 +37,17 @@
 @Controller
 public class TtyController {
 
-    @Autowired
-    private WebAuth webAuth;
+    private final WebAuth webAuth;
+
+    private final SpringEventManager eventManager;
 
-    @Autowired
-    private SpringEventManager eventManager;
+    private final TtyService ttyService;
 
-    @Autowired
-    private TtyService ttyService;
+    public TtyController(WebAuth webAuth, SpringEventManager eventManager, TtyService ttyService) {
+        this.webAuth = webAuth;
+        this.eventManager = eventManager;
+        this.ttyService = ttyService;
+    }
 
     @MessageExceptionHandler(AuthenticationException.class)
     public void onAuthException(AuthenticationException e) {
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDao.java b/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDao.java
index cb81eac5e..43dcc9a08 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 public interface CustomJobAgentDao {
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDaoImpl.java b/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDaoImpl.java
index fa238af1e..1aee5f3c8 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDaoImpl.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomJobAgentDaoImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobAgent;
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomJobDao.java b/core/src/main/java/com/flowci/core/job/dao/CustomJobDao.java
index 8dcc294b0..7cb8b8506 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomJobDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomJobDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.Job;
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomJobDaoImpl.java b/core/src/main/java/com/flowci/core/job/dao/CustomJobDaoImpl.java
index 1fc00d766..3f512b74d 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomJobDaoImpl.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomJobDaoImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.Job;
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDao.java b/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDao.java
index f25c5818b..8f55ed808 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobKey;
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDaoImpl.java b/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDaoImpl.java
index 70bccb446..a4517b7a5 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDaoImpl.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomJobPriorityDaoImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobKey;
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDao.java b/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDao.java
index 92f3c5812..52418f6d4 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobDesc;
diff --git a/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDaoImpl.java b/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDaoImpl.java
index d60e19725..7a440d6d1 100644
--- a/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDaoImpl.java
+++ b/core/src/main/java/com/flowci/core/job/dao/CustomizedRelatedJobsDaoImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.RelatedJobs;
diff --git a/core/src/main/java/com/flowci/core/job/dao/JobAgentDao.java b/core/src/main/java/com/flowci/core/job/dao/JobAgentDao.java
index 9143e106d..188c09fa6 100644
--- a/core/src/main/java/com/flowci/core/job/dao/JobAgentDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/JobAgentDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobAgent;
diff --git a/core/src/main/java/com/flowci/core/job/dao/JobCacheDao.java b/core/src/main/java/com/flowci/core/job/dao/JobCacheDao.java
index cd14ac4b2..09780b558 100644
--- a/core/src/main/java/com/flowci/core/job/dao/JobCacheDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/JobCacheDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobCache;
diff --git a/core/src/main/java/com/flowci/core/job/dao/JobDescDao.java b/core/src/main/java/com/flowci/core/job/dao/JobDescDao.java
index d542616db..abd556c40 100644
--- a/core/src/main/java/com/flowci/core/job/dao/JobDescDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/JobDescDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobDesc;
diff --git a/core/src/main/java/com/flowci/core/job/dao/JobPriorityDao.java b/core/src/main/java/com/flowci/core/job/dao/JobPriorityDao.java
index 7765b2be1..e9f92814a 100644
--- a/core/src/main/java/com/flowci/core/job/dao/JobPriorityDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/JobPriorityDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.JobPriority;
diff --git a/core/src/main/java/com/flowci/core/job/dao/RelatedJobsDao.java b/core/src/main/java/com/flowci/core/job/dao/RelatedJobsDao.java
index 55eb5d42e..601ea1da0 100644
--- a/core/src/main/java/com/flowci/core/job/dao/RelatedJobsDao.java
+++ b/core/src/main/java/com/flowci/core/job/dao/RelatedJobsDao.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.dao;
 
 import com.flowci.core.job.domain.RelatedJobs;
diff --git a/core/src/main/java/com/flowci/core/job/domain/Executed.java b/core/src/main/java/com/flowci/core/job/domain/Executed.java
index e1f917dd9..7c41bc11e 100644
--- a/core/src/main/java/com/flowci/core/job/domain/Executed.java
+++ b/core/src/main/java/com/flowci/core/job/domain/Executed.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import com.google.common.collect.ImmutableSet;
diff --git a/core/src/main/java/com/flowci/core/job/domain/Job.java b/core/src/main/java/com/flowci/core/job/domain/Job.java
index d27eb521f..9e01e0173 100644
--- a/core/src/main/java/com/flowci/core/job/domain/Job.java
+++ b/core/src/main/java/com/flowci/core/job/domain/Job.java
@@ -205,7 +205,7 @@ public static Pathable path(Long buildNumber) {
     @Indexed(name = "index_job_key", unique = true)
     private String key;
 
-    @Indexed(name = "index_flow_id", partialFilter = "{ flowId: {$exists: true} }")
+    @Indexed(name = "index_job_flow_id", partialFilter = "{ flowId: {$exists: true} }")
     private String flowId;
 
     private String flowName;
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobAgent.java b/core/src/main/java/com/flowci/core/job/domain/JobAgent.java
index 0752e104e..51ad68b6a 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobAgent.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobAgent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import com.flowci.tree.FlowNode;
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobCache.java b/core/src/main/java/com/flowci/core/job/domain/JobCache.java
index 252302557..e25b8fe6c 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobCache.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobCache.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobDesc.java b/core/src/main/java/com/flowci/core/job/domain/JobDesc.java
index 3563c6bc8..c49cfc0fa 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobDesc.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobDesc.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import lombok.Getter;
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobKey.java b/core/src/main/java/com/flowci/core/job/domain/JobKey.java
index 8020ddbad..efdf99f16 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobKey.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobKey.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import lombok.AllArgsConstructor;
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobPriority.java b/core/src/main/java/com/flowci/core/job/domain/JobPriority.java
index c3286866d..2855dec24 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobPriority.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobPriority.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import com.flowci.core.common.domain.Mongoable;
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobSmContext.java b/core/src/main/java/com/flowci/core/job/domain/JobSmContext.java
index 8e807b44d..4a3233af9 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobSmContext.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobSmContext.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import com.flowci.sm.Context;
@@ -15,7 +31,7 @@ public class JobSmContext extends Context {
 
     private Job job;
 
-    private String yml;
+    private JobYml yml;
 
     private Step step;
 
diff --git a/core/src/main/java/com/flowci/core/job/domain/JobYml.java b/core/src/main/java/com/flowci/core/job/domain/JobYml.java
index 9f2fc82a6..8cf2fb2b0 100644
--- a/core/src/main/java/com/flowci/core/job/domain/JobYml.java
+++ b/core/src/main/java/com/flowci/core/job/domain/JobYml.java
@@ -17,13 +17,16 @@
 package com.flowci.core.job.domain;
 
 import com.flowci.core.common.domain.Mongoable;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import com.flowci.util.StringHelper;
+import lombok.*;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.LinkedList;
+import java.util.List;
+
 /**
+ * JobYml represent set of yml for job
+ *
  * @author yang
  */
 @Document(collection = "job_yml")
@@ -33,13 +36,33 @@
 @EqualsAndHashCode(callSuper = true)
 public class JobYml extends Mongoable {
 
-    /**
-     * Yml raw
-     */
-    private String raw;
+    @Setter
+    @Getter
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Body {
+
+        private String name;
+
+        private String rawInB64;
+    }
+
+    private List<Body> list = new LinkedList<>();
 
-    public JobYml(String jobId, String name, String raw) {
+    public JobYml(String jobId) {
         this.id = jobId;
-        this.raw = raw;
+    }
+
+    public void add(String name, String rawInB64) {
+        list.add(new Body(name, rawInB64));
+    }
+
+    public String[] getRawArray() {
+        var array = new String[list.size()];
+        int i = 0;
+        for (var body : list) {
+            array[i++] = StringHelper.fromBase64(body.getRawInB64());
+        }
+        return array;
     }
 }
diff --git a/core/src/main/java/com/flowci/core/job/domain/RelatedJobs.java b/core/src/main/java/com/flowci/core/job/domain/RelatedJobs.java
index 477a1e244..4a56369f5 100644
--- a/core/src/main/java/com/flowci/core/job/domain/RelatedJobs.java
+++ b/core/src/main/java/com/flowci/core/job/domain/RelatedJobs.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import lombok.Getter;
diff --git a/core/src/main/java/com/flowci/core/job/domain/SessionCmd.java b/core/src/main/java/com/flowci/core/job/domain/SessionCmd.java
index 6a05139ff..0c035c6a5 100644
--- a/core/src/main/java/com/flowci/core/job/domain/SessionCmd.java
+++ b/core/src/main/java/com/flowci/core/job/domain/SessionCmd.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import lombok.Getter;
diff --git a/core/src/main/java/com/flowci/core/job/domain/StepLogItem.java b/core/src/main/java/com/flowci/core/job/domain/StepLogItem.java
index f163c24b0..21f0424f2 100644
--- a/core/src/main/java/com/flowci/core/job/domain/StepLogItem.java
+++ b/core/src/main/java/com/flowci/core/job/domain/StepLogItem.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.domain;
 
 import lombok.AllArgsConstructor;
diff --git a/core/src/main/java/com/flowci/core/job/event/CacheShellLogEvent.java b/core/src/main/java/com/flowci/core/job/event/CacheShellLogEvent.java
index 5cbe5e883..00798d3b3 100644
--- a/core/src/main/java/com/flowci/core/job/event/CacheShellLogEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/CacheShellLogEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.event;
 
 import com.flowci.core.common.event.BroadcastEvent;
diff --git a/core/src/main/java/com/flowci/core/job/event/CreateNewJobEvent.java b/core/src/main/java/com/flowci/core/job/event/CreateNewJobEvent.java
index 805ed57ab..343bdb102 100644
--- a/core/src/main/java/com/flowci/core/job/event/CreateNewJobEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/CreateNewJobEvent.java
@@ -17,11 +17,14 @@
 package com.flowci.core.job.event;
 
 import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.job.domain.Job.Trigger;
 import com.flowci.domain.StringVars;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 
+import java.util.List;
+
 /**
  * Start job from jobRunExecutor
  *
@@ -32,16 +35,16 @@ public class CreateNewJobEvent extends ApplicationEvent {
 
     private final Flow flow;
 
-    private final String yml;
+    private final FlowYml ymlEntity;
 
     private final Trigger trigger;
 
     private final StringVars input;
 
-    public CreateNewJobEvent(Object source, Flow flow, String yml, Trigger trigger, StringVars input) {
+    public CreateNewJobEvent(Object source, Flow flow, FlowYml ymlEntity, Trigger trigger, StringVars input) {
         super(source);
         this.flow = flow;
-        this.yml = yml;
+        this.ymlEntity = ymlEntity;
         this.trigger = trigger;
         this.input = input;
     }
diff --git a/core/src/main/java/com/flowci/core/job/event/ExecutedEvent.java b/core/src/main/java/com/flowci/core/job/event/ExecutedEvent.java
index bf75c9ada..9c94f82ec 100644
--- a/core/src/main/java/com/flowci/core/job/event/ExecutedEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/ExecutedEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.event;
 
 import com.flowci.core.job.domain.Executed;
diff --git a/core/src/main/java/com/flowci/core/job/event/JobActionEvent.java b/core/src/main/java/com/flowci/core/job/event/JobActionEvent.java
index 27b834e4f..166f9f118 100644
--- a/core/src/main/java/com/flowci/core/job/event/JobActionEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/JobActionEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.event;
 
 import lombok.Getter;
diff --git a/core/src/main/java/com/flowci/core/job/event/JobFinishedEvent.java b/core/src/main/java/com/flowci/core/job/event/JobFinishedEvent.java
index c63edde43..733f3226a 100644
--- a/core/src/main/java/com/flowci/core/job/event/JobFinishedEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/JobFinishedEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.event;
 
 import com.flowci.core.job.domain.Job;
diff --git a/core/src/main/java/com/flowci/core/job/event/StepUpdateEvent.java b/core/src/main/java/com/flowci/core/job/event/StepUpdateEvent.java
index d6aea9406..4963d774a 100644
--- a/core/src/main/java/com/flowci/core/job/event/StepUpdateEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/StepUpdateEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.event;
 
 import com.flowci.core.job.domain.Step;
diff --git a/core/src/main/java/com/flowci/core/job/event/TtyStatusUpdateEvent.java b/core/src/main/java/com/flowci/core/job/event/TtyStatusUpdateEvent.java
index c568624a9..90d038827 100644
--- a/core/src/main/java/com/flowci/core/job/event/TtyStatusUpdateEvent.java
+++ b/core/src/main/java/com/flowci/core/job/event/TtyStatusUpdateEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.event;
 
 import com.flowci.core.agent.domain.TtyCmd;
diff --git a/core/src/main/java/com/flowci/core/job/manager/LockManager.java b/core/src/main/java/com/flowci/core/job/manager/LockManager.java
index eef714e39..ad426ae08 100644
--- a/core/src/main/java/com/flowci/core/job/manager/LockManager.java
+++ b/core/src/main/java/com/flowci/core/job/manager/LockManager.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.manager;
 
 import com.flowci.zookeeper.InterLock;
diff --git a/core/src/main/java/com/flowci/core/job/manager/LockManagerImpl.java b/core/src/main/java/com/flowci/core/job/manager/LockManagerImpl.java
index 6ef38da48..1c2d68b4b 100644
--- a/core/src/main/java/com/flowci/core/job/manager/LockManagerImpl.java
+++ b/core/src/main/java/com/flowci/core/job/manager/LockManagerImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.manager;
 
 import com.flowci.zookeeper.InterLock;
diff --git a/core/src/main/java/com/flowci/core/job/manager/YmlManager.java b/core/src/main/java/com/flowci/core/job/manager/YmlManager.java
index 01c83306f..26b81d970 100644
--- a/core/src/main/java/com/flowci/core/job/manager/YmlManager.java
+++ b/core/src/main/java/com/flowci/core/job/manager/YmlManager.java
@@ -26,7 +26,9 @@
  */
 public interface YmlManager {
 
-    FlowNode parse(String yml);
+    FlowNode parse(JobYml jobYml);
+
+    FlowNode parse(String ...raw);
 
 
     JobYml get(Job job);
@@ -34,7 +36,7 @@ public interface YmlManager {
     /**
      * Create job yaml from flow yaml
      */
-    JobYml create(Job job, String yml);
+    JobYml create(JobYml jobYml);
 
     /**
      * Get node tree from job
diff --git a/core/src/main/java/com/flowci/core/job/manager/YmlManagerImpl.java b/core/src/main/java/com/flowci/core/job/manager/YmlManagerImpl.java
index ada0bf359..c93a07690 100644
--- a/core/src/main/java/com/flowci/core/job/manager/YmlManagerImpl.java
+++ b/core/src/main/java/com/flowci/core/job/manager/YmlManagerImpl.java
@@ -24,8 +24,8 @@
 import com.flowci.tree.NodeTree;
 import com.flowci.tree.YmlParser;
 import com.github.benmanes.caffeine.cache.Cache;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;
@@ -35,17 +35,21 @@
  */
 @Log4j2
 @Component
+@AllArgsConstructor
 public class YmlManagerImpl implements YmlManager {
 
-    @Autowired
-    private Cache<String, NodeTree> jobTreeCache;
+    private final Cache<String, NodeTree> jobTreeCache;
 
-    @Autowired
-    private JobYmlDao jobYmlDao;
+    private final JobYmlDao jobYmlDao;
 
     @Override
-    public FlowNode parse(String yml) {
-        return YmlParser.load(yml);
+    public FlowNode parse(JobYml jobYml) {
+        return YmlParser.load(jobYml.getRawArray());
+    }
+
+    @Override
+    public FlowNode parse(String... raw) {
+        return YmlParser.load(raw);
     }
 
     @Override
@@ -60,9 +64,8 @@ public JobYml get(Job job) {
     }
 
     @Override
-    public JobYml create(Job job, String yml) {
-        JobYml jobYml = new JobYml(job.getId(), job.getFlowName(), yml);
-        return jobYmlDao.insert(jobYml);
+    public JobYml create(JobYml jobYml) {
+        return jobYmlDao.save(jobYml);
     }
 
     @Override
@@ -75,7 +78,7 @@ public NodeTree getTree(String jobId) {
         return jobTreeCache.get(jobId, s -> {
             log.debug("Cache tree for job: {}", jobId);
             JobYml yml = jobYmlDao.findById(jobId).get();
-            FlowNode root = YmlParser.load(yml.getRaw());
+            FlowNode root = YmlParser.load(yml.getRawArray());
             return NodeTree.create(root);
         });
     }
diff --git a/core/src/main/java/com/flowci/core/job/service/CacheService.java b/core/src/main/java/com/flowci/core/job/service/CacheService.java
index 74993b173..84f1ec11d 100644
--- a/core/src/main/java/com/flowci/core/job/service/CacheService.java
+++ b/core/src/main/java/com/flowci/core/job/service/CacheService.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.service;
 
 import com.flowci.core.job.domain.JobCache;
diff --git a/core/src/main/java/com/flowci/core/job/service/CacheServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/CacheServiceImpl.java
index cf9da846a..2052432e4 100644
--- a/core/src/main/java/com/flowci/core/job/service/CacheServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/CacheServiceImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.service;
 
 import com.flowci.core.job.dao.JobCacheDao;
diff --git a/core/src/main/java/com/flowci/core/job/service/JobActionService.java b/core/src/main/java/com/flowci/core/job/service/JobActionService.java
index 8574ff484..3f5904202 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobActionService.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobActionService.java
@@ -1,13 +1,30 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.service;
 
 import com.flowci.core.agent.domain.ShellOut;
+import com.flowci.core.job.domain.JobYml;
 import com.flowci.exception.CIException;
 
 public interface JobActionService {
 
     void toLoading(String jobId);
 
-    void toCreated(String jobId, String yml);
+    void toCreated(JobYml yml);
 
     void toStart(String jobId);
 
diff --git a/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java
index 94de54398..22fb6d980 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobActionServiceImpl.java
@@ -25,6 +25,7 @@
 import com.flowci.core.common.manager.ConditionManager;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.common.rabbit.RabbitOperations;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.job.dao.JobAgentDao;
 import com.flowci.core.job.dao.JobDao;
 import com.flowci.core.job.dao.JobPriorityDao;
@@ -229,10 +230,8 @@ public void toLoading(String jobId) {
     }
 
     @Override
-    public void toCreated(String jobId, String yml) {
-        onTransition(jobId, Created, context -> {
-            context.setYml(yml);
-        });
+    public void toCreated(JobYml jobYml) {
+        onTransition(jobYml.getId(), Created, context -> context.setYml(jobYml));
     }
 
     @Override
@@ -339,7 +338,7 @@ public void accept(JobSmContext context) {
 
     private void doFromXToCreated(JobSmContext context) {
         Job job = context.getJob();
-        String yml = context.getYml();
+        JobYml yml = context.getYml();
 
         setupJobYamlAndSteps(job, yml);
         setJobStatusAndSave(job, Job.Status.CREATED, StringHelper.EMPTY);
@@ -783,8 +782,8 @@ private void toFailureStatus(Job job, CIException e) {
         sm.execute(context);
     }
 
-    private void setupJobYamlAndSteps(Job job, String yml) {
-        ymlManager.create(job, yml);
+    private void setupJobYamlAndSteps(Job job, JobYml yml) {
+        ymlManager.create(yml);
         stepService.init(job);
 
         FlowNode root = ymlManager.parse(yml);
@@ -843,7 +842,7 @@ private void onTransition(String jobId, Status to, Consumer<JobSmContext> onCont
         sm.execute(context);
     }
 
-    private String fetchYamlFromGit(Job job) {
+    private JobYml fetchYamlFromGit(Job job) {
         final String gitUrl = JobContextHelper.getGitUrl(job);
 
         if (!StringHelper.hasValue(gitUrl)) {
@@ -869,7 +868,11 @@ private String fetchYamlFromGit(Job job) {
 
         try {
             byte[] ymlInBytes = Files.readAllBytes(Paths.get(dir.toString(), files[0]));
-            return new String(ymlInBytes);
+
+            var jobYml = new JobYml(job.getId());
+            jobYml.add(FlowYml.DEFAULT_NAME, StringHelper.toBase64(new String(ymlInBytes)));
+
+            return jobYml;
         } catch (IOException e) {
             throw new NotAvailableException("Unable to read yaml file in repo").setExtra(job);
         }
diff --git a/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java
index df6270258..13631ee60 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobEventServiceImpl.java
@@ -25,6 +25,7 @@
 import com.flowci.core.agent.event.OnCmdOutEvent;
 import com.flowci.core.common.manager.ConditionManager;
 import com.flowci.core.common.manager.SpringEventManager;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.flow.event.FlowCreatedEvent;
 import com.flowci.core.flow.event.FlowDeletedEvent;
 import com.flowci.core.flow.event.FlowInitEvent;
@@ -35,42 +36,36 @@
 import com.flowci.core.job.manager.YmlManager;
 import com.flowci.core.job.util.Errors;
 import com.flowci.tree.FlowNode;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 
 @Log4j2
 @Service
+@AllArgsConstructor
 public class JobEventServiceImpl implements JobEventService {
 
-    @Autowired
-    private ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
 
-    @Autowired
-    private SpringEventManager eventManager;
+    private final SpringEventManager eventManager;
 
-    @Autowired
-    private JobActionService jobActionService;
+    private final JobActionService jobActionService;
 
-    @Autowired
-    private ConditionManager conditionManager;
+    private final ConditionManager conditionManager;
 
-    @Autowired
-    private YmlManager ymlManager;
+    private final YmlManager ymlManager;
 
-    @Autowired
-    private TaskExecutor appTaskExecutor;
+    private final TaskExecutor appTaskExecutor;
 
-    @Autowired
-    private JobService jobService;
+    private final JobService jobService;
 
-    @Autowired
-    private StepService stepService;
+    private final StepService stepService;
 
     @EventListener
     public void onFlowInitiated(FlowInitEvent event) {
@@ -105,7 +100,9 @@ public void onJobAction(JobActionEvent event) {
     public void startNewJob(CreateNewJobEvent event) {
         appTaskExecutor.execute(() -> {
             try {
-                FlowNode root = ymlManager.parse(event.getYml());
+                FlowYml ymlEntity = event.getYmlEntity();
+                String[] array = FlowYml.toRawArray(ymlEntity.getList());
+                FlowNode root = ymlManager.parse(array);
                 boolean canCreateJob = true;
 
                 if (root.hasCondition()) {
@@ -118,7 +115,7 @@ public void startNewJob(CreateNewJobEvent event) {
                     return;
                 }
 
-                Job job = jobService.create(event.getFlow(), event.getYml(), event.getTrigger(), event.getInput());
+                Job job = jobService.create(event.getFlow(), ymlEntity.getList(), event.getTrigger(), event.getInput());
                 jobService.start(job);
 
             } catch (Throwable e) {
diff --git a/core/src/main/java/com/flowci/core/job/service/JobService.java b/core/src/main/java/com/flowci/core/job/service/JobService.java
index f81c01aef..685c1ca8c 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobService.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobService.java
@@ -17,6 +17,8 @@
 package com.flowci.core.job.service;
 
 import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.FlowYml;
+import com.flowci.core.flow.domain.SimpleYml;
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.domain.Job.Trigger;
 import com.flowci.core.job.domain.JobDesc;
@@ -86,7 +88,7 @@ public interface JobService {
      *
      * @throws com.flowci.exception.NotAvailableException with job object in extra field
      */
-    Job create(Flow flow, @Nullable String yml, Trigger trigger, StringVars input);
+    Job create(Flow flow, List<SimpleYml> yml, Trigger trigger, StringVars input);
 
     /**
      * Run job, dispatch to queue, status will be CREATED -> RUNNING
diff --git a/core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java
index c7a5995ed..094033f45 100644
--- a/core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java
@@ -24,6 +24,8 @@
 import com.flowci.core.common.rabbit.RabbitOperations;
 import com.flowci.core.common.service.SettingService;
 import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.FlowYml;
+import com.flowci.core.flow.domain.SimpleYml;
 import com.flowci.core.job.dao.*;
 import com.flowci.core.job.domain.*;
 import com.flowci.core.job.domain.Job.Trigger;
@@ -227,7 +229,7 @@ public List<JobDesc> listRelated(Job job) {
     }
 
     @Override
-    public Job create(Flow flow, String yml, Trigger trigger, StringVars input) {
+    public Job create(Flow flow, List<SimpleYml> ymlList, Trigger trigger, StringVars input) {
         Job job = createJob(flow, trigger, input);
         eventManager.publish(new JobCreatedEvent(this, job));
 
@@ -236,11 +238,12 @@ public Job create(Flow flow, String yml, Trigger trigger, StringVars input) {
             return job;
         }
 
-        if (!StringHelper.hasValue(yml)) {
-            throw new ArgumentException("YAML config is required to start a job");
+        var jobYml = new JobYml(job.getId());
+        for (var fy : ymlList) {
+            jobYml.add(fy.getName(), fy.getRawInB64());
         }
 
-        jobActionService.toCreated(job.getId(), yml);
+        jobActionService.toCreated(jobYml);
         return get(job.getId());
     }
 
@@ -260,10 +263,6 @@ public Job rerun(Flow flow, Job job) {
             throw new StatusException("Job not finished, cannot re-start");
         }
 
-        // load yaml
-        JobYml yml = ymlManager.get(job);
-        FlowNode root = ymlManager.parse(yml.getRaw());
-
         // reset
         job.setTimeout(flow.getStepTimeout());
         job.setExpire(flow.getStepTimeout());
@@ -302,11 +301,13 @@ public Job rerun(Flow flow, Job job) {
             iterator.remove();
         }
 
+        JobYml yml = ymlManager.get(job);
+        FlowNode root = ymlManager.parse(yml);
+
         initJobContext(job, flow, null);
         context.put(Variables.Job.TriggerBy, sessionManager.get().getEmail());
         context.merge(root.getEnvironments(), false);
 
-
         jobDao.save(job);
 
         // reset job agent
@@ -316,7 +317,7 @@ public Job rerun(Flow flow, Job job) {
         stepService.delete(job);
         ymlManager.delete(job);
 
-        jobActionService.toCreated(job.getId(), yml.getRaw());
+        jobActionService.toCreated(yml);
         jobActionService.toStart(job.getId());
         return get(job.getId());
     }
diff --git a/core/src/main/java/com/flowci/core/job/service/TtyService.java b/core/src/main/java/com/flowci/core/job/service/TtyService.java
index e89092bf5..d63608b80 100644
--- a/core/src/main/java/com/flowci/core/job/service/TtyService.java
+++ b/core/src/main/java/com/flowci/core/job/service/TtyService.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.service;
 
 import com.flowci.core.agent.domain.TtyCmd;
diff --git a/core/src/main/java/com/flowci/core/job/service/TtyServiceImpl.java b/core/src/main/java/com/flowci/core/job/service/TtyServiceImpl.java
index 72bb6bf8f..0ced57ad8 100644
--- a/core/src/main/java/com/flowci/core/job/service/TtyServiceImpl.java
+++ b/core/src/main/java/com/flowci/core/job/service/TtyServiceImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.service;
 
 import com.flowci.core.agent.domain.Agent;
diff --git a/core/src/main/java/com/flowci/core/job/util/Errors.java b/core/src/main/java/com/flowci/core/job/util/Errors.java
index 9d547d72c..370f5b98c 100644
--- a/core/src/main/java/com/flowci/core/job/util/Errors.java
+++ b/core/src/main/java/com/flowci/core/job/util/Errors.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.util;
 
 import com.flowci.exception.CIException;
diff --git a/core/src/main/java/com/flowci/core/job/util/JobContextHelper.java b/core/src/main/java/com/flowci/core/job/util/JobContextHelper.java
index 064434b48..faf2d3f26 100644
--- a/core/src/main/java/com/flowci/core/job/util/JobContextHelper.java
+++ b/core/src/main/java/com/flowci/core/job/util/JobContextHelper.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.flowci.core.job.util;
 
 import com.flowci.core.common.domain.Variables;
diff --git a/core/src/test/java/com/flowci/core/test/MockLoggedInScenario.java b/core/src/test/java/com/flowci/core/test/MockLoggedInScenario.java
new file mode 100644
index 000000000..a25d3176f
--- /dev/null
+++ b/core/src/test/java/com/flowci/core/test/MockLoggedInScenario.java
@@ -0,0 +1,47 @@
+package com.flowci.core.test;
+
+import com.flowci.core.common.domain.Mongoable;
+import com.flowci.core.common.manager.SessionManager;
+import com.flowci.core.user.domain.User;
+import com.flowci.util.HashingHelper;
+import org.junit.Assert;
+import org.junit.Before;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import java.util.Optional;
+
+public abstract class MockLoggedInScenario extends SpringScenario{
+
+    private final static User defaultAdminUser = new User();
+
+    static {
+        defaultAdminUser.setId("112233");
+        defaultAdminUser.setRole(User.Role.Admin);
+        defaultAdminUser.setEmail("test@flow.ci");
+        defaultAdminUser.setPasswordOnMd5(HashingHelper.md5("12345"));
+    }
+
+    @MockBean
+    protected SessionManager sessionManager;
+
+    @Before
+    public void login() {
+        Mockito.when(sessionManager.get()).thenReturn(defaultAdminUser);
+        Mockito.when(sessionManager.getUserEmail()).thenReturn(defaultAdminUser.getEmail());
+        Mockito.when(sessionManager.getCurrentAuditor()).thenReturn(Optional.of(defaultAdminUser.getEmail()));
+    }
+
+    protected void shouldHasCreatedAtAndCreatedBy(Mongoable obj) {
+        Assert.assertNotNull(obj.getCreatedAt());
+        Assert.assertNotNull(obj.getCreatedBy());
+        Assert.assertEquals(sessionManager.getUserEmail(), obj.getCreatedBy());
+    }
+
+    protected void shouldHasUpdatedAtAndUpdatedBy(Mongoable obj) {
+        Assert.assertNotNull(obj.getUpdatedAt());
+        Assert.assertNotNull(obj.getUpdatedBy());
+        Assert.assertEquals(sessionManager.getUserEmail(), obj.getUpdatedBy());
+    }
+
+}
diff --git a/core/src/test/java/com/flowci/core/test/SpringScenario.java b/core/src/test/java/com/flowci/core/test/SpringScenario.java
index 9625211b2..eeaf42cf2 100644
--- a/core/src/test/java/com/flowci/core/test/SpringScenario.java
+++ b/core/src/test/java/com/flowci/core/test/SpringScenario.java
@@ -16,9 +16,7 @@
 
 package com.flowci.core.test;
 
-import com.flowci.core.common.domain.Mongoable;
 import com.flowci.core.common.domain.Settings;
-import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.common.rabbit.RabbitOperations;
 import com.flowci.core.common.service.SettingService;
 import com.flowci.core.flow.dao.FlowDao;
@@ -27,17 +25,12 @@
 import com.flowci.core.test.SpringScenario.Config;
 import com.flowci.core.test.auth.AuthHelper;
 import com.flowci.core.test.flow.FlowMockHelper;
-import com.flowci.core.user.domain.User;
 import com.flowci.core.user.service.UserService;
-import com.flowci.exception.NotFoundException;
-import com.flowci.util.HashingHelper;
 import lombok.extern.log4j.Log4j2;
 import org.assertj.core.util.Lists;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -52,7 +45,10 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author yang
@@ -100,21 +96,9 @@ public List<Template> getTemplates() {
         }
     }
 
-    private final static User defaultAdminUser = new User();
-
-    static {
-        defaultAdminUser.setId("112233");
-        defaultAdminUser.setRole(User.Role.Admin);
-        defaultAdminUser.setEmail("test@flow.ci");
-        defaultAdminUser.setPasswordOnMd5(HashingHelper.md5("12345"));
-    }
-
     @MockBean
     protected SettingService settingService;
 
-    @MockBean
-    protected SessionManager sessionManager;
-
     @Autowired
     protected UserService userService;
 
@@ -159,18 +143,6 @@ public void queueCleanUp() {
         }
     }
 
-    protected void shouldHasCreatedAtAndCreatedBy(Mongoable obj) {
-        Assert.assertNotNull(obj.getCreatedAt());
-        Assert.assertNotNull(obj.getCreatedBy());
-        Assert.assertEquals(sessionManager.getUserEmail(), obj.getCreatedBy());
-    }
-
-    protected void shouldHasUpdatedAtAndUpdatedBy(Mongoable obj) {
-        Assert.assertNotNull(obj.getUpdatedAt());
-        Assert.assertNotNull(obj.getUpdatedBy());
-        Assert.assertEquals(sessionManager.getUserEmail(), obj.getUpdatedBy());
-    }
-
     protected void addEventListener(ApplicationListener<?> listener) {
         applicationEventMulticaster.addApplicationListener(listener);
         listenersForTest.add(listener);
@@ -188,10 +160,4 @@ protected void multicastEvent(ApplicationEvent event) {
     protected InputStream load(String resource) {
         return SpringScenario.class.getClassLoader().getResourceAsStream(resource);
     }
-
-    protected void mockLogin() {
-        Mockito.when(sessionManager.get()).thenReturn(defaultAdminUser);
-        Mockito.when(sessionManager.getUserEmail()).thenReturn(defaultAdminUser.getEmail());
-        Mockito.when(sessionManager.getCurrentAuditor()).thenReturn(Optional.of(defaultAdminUser.getEmail()));
-    }
 }
diff --git a/core/src/test/java/com/flowci/core/test/ZookeeperScenario.java b/core/src/test/java/com/flowci/core/test/ZookeeperScenario.java
index 7863fc33f..b13bc9931 100644
--- a/core/src/test/java/com/flowci/core/test/ZookeeperScenario.java
+++ b/core/src/test/java/com/flowci/core/test/ZookeeperScenario.java
@@ -44,7 +44,7 @@
  * @author yang
  */
 @Log4j2
-public abstract class ZookeeperScenario extends SpringScenario {
+public abstract class ZookeeperScenario extends MockLoggedInScenario {
 
     private final HttpHeaders headers = new HttpHeaders();
 
diff --git a/core/src/test/java/com/flowci/core/test/agent/AgentControllerTest.java b/core/src/test/java/com/flowci/core/test/agent/AgentControllerTest.java
index 156726b58..efbc07889 100644
--- a/core/src/test/java/com/flowci/core/test/agent/AgentControllerTest.java
+++ b/core/src/test/java/com/flowci/core/test/agent/AgentControllerTest.java
@@ -24,6 +24,7 @@
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.domain.http.ResponseMessage;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.exception.ErrorCode;
@@ -42,7 +43,7 @@
 /**
  * @author yang
  */
-public class AgentControllerTest extends SpringScenario {
+public class AgentControllerTest extends MockLoggedInScenario {
 
     private static final TypeReference<ResponseMessage<Agent>> AgentResponseType =
             new TypeReference<ResponseMessage<Agent>>() {
@@ -61,14 +62,6 @@ public class AgentControllerTest extends SpringScenario {
     @Autowired
     private ObjectMapper objectMapper;
 
-    @Autowired
-    private AppProperties.RabbitMQ rabbitConfig;
-
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_duplicate_error_when_create_agent_with_same_name() throws Throwable {
         createAgent("same.name", null, StatusCode.OK);
diff --git a/core/src/test/java/com/flowci/core/test/agent/AgentHostServiceTest.java b/core/src/test/java/com/flowci/core/test/agent/AgentHostServiceTest.java
index 6caf59617..60f136d12 100644
--- a/core/src/test/java/com/flowci/core/test/agent/AgentHostServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/agent/AgentHostServiceTest.java
@@ -22,11 +22,6 @@ public class AgentHostServiceTest extends ZookeeperScenario {
     @Autowired
     private AgentHostService agentHostService;
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @After
     public void cleanup() {
         for (AgentHost h : agentHostService.list()) {
diff --git a/core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java b/core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java
index 9689a6d9e..5fe1a13e3 100644
--- a/core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java
@@ -26,8 +26,10 @@
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.domain.JobOutput.ContentType;
 import com.flowci.core.job.domain.JobReport;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
+import com.flowci.util.StringHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,10 +38,11 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.mock.web.MockMultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
-public class OpenRestServiceTest extends SpringScenario {
+public class OpenRestServiceTest extends MockLoggedInScenario {
 
     @MockBean
     private JobDao jobDao;
@@ -53,15 +56,17 @@ public class OpenRestServiceTest extends SpringScenario {
     @Autowired
     private OpenRestService openRestService;
 
+    private Flow flow;
+
     @Before
-    public void login() {
-        mockLogin();
+    public void init() throws IOException {
+        var yaml = StringHelper.toString(load("flow.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        flow = flowService.create("user-test", option);
     }
 
     @Test
     public void should_list_all_flow_users() {
-        Flow flow = flowService.create("user-test", new CreateOption());
-
         List<User> users = openRestService.users(flow.getName());
         Assert.assertEquals(1, users.size());
 
@@ -78,10 +83,8 @@ public void should_list_all_flow_users() {
     }
 
     @Test
-    public void should_save_job_report() {
+    public void should_save_job_report() throws IOException {
         // given:
-        Flow flow = flowService.create("user-test", null);
-
         Job job = new Job();
         job.setId("12345");
         job.setFlowId(flow.getId());
diff --git a/core/src/test/java/com/flowci/core/test/auth/AuthControllerTest.java b/core/src/test/java/com/flowci/core/test/auth/AuthControllerTest.java
index e1a92c0c3..aa1e85bc4 100644
--- a/core/src/test/java/com/flowci/core/test/auth/AuthControllerTest.java
+++ b/core/src/test/java/com/flowci/core/test/auth/AuthControllerTest.java
@@ -21,6 +21,7 @@
 import com.flowci.core.auth.service.AuthService;
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.helper.ThreadHelper;
+import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
 import com.flowci.core.common.domain.http.ResponseMessage;
@@ -31,11 +32,15 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 
 public class AuthControllerTest extends SpringScenario {
 
     private User user;
 
+    @Autowired
+    private SessionManager sessionManager;
+
     @Autowired
     private AuthHelper authHelper;
 
@@ -67,7 +72,7 @@ public void should_login_and_logout_successfully() throws Exception {
         Assert.assertTrue(authService.set(token));
 
         // when: request logout
-        ResponseMessage logoutMsg = authHelper.logout(token);
+        var logoutMsg = authHelper.logout(token);
         Assert.assertEquals(StatusCode.OK, logoutMsg.getCode());
 
         // then: should throw new AuthenticationException("Not logged in") exception
diff --git a/core/src/test/java/com/flowci/core/test/config/ConfigServiceTest.java b/core/src/test/java/com/flowci/core/test/config/ConfigServiceTest.java
index 0c6f7bc08..4753b198a 100644
--- a/core/src/test/java/com/flowci/core/test/config/ConfigServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/config/ConfigServiceTest.java
@@ -6,6 +6,7 @@
 import com.flowci.core.config.service.ConfigService;
 import com.flowci.core.secret.domain.AuthSecret;
 import com.flowci.core.secret.event.GetSecretEvent;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.domain.SimpleAuthPair;
 import org.junit.Assert;
@@ -18,7 +19,7 @@
 import static com.flowci.core.config.domain.Config.Category.SMTP;
 import static com.flowci.core.config.domain.Config.Category.TEXT;
 
-public class ConfigServiceTest extends SpringScenario {
+public class ConfigServiceTest extends MockLoggedInScenario {
 
     @MockBean
     private SpringEventManager eventManager;
@@ -26,11 +27,6 @@ public class ConfigServiceTest extends SpringScenario {
     @Autowired
     private ConfigService configService;
 
-    @Before
-    public void init() {
-        mockLogin();
-    }
-
     @Test
     public void should_create_smtp_config_with_secret() {
         // init:
diff --git a/core/src/test/java/com/flowci/core/test/flow/CronServiceTest.java b/core/src/test/java/com/flowci/core/test/flow/CronServiceTest.java
index 546c996b9..e01f9c528 100644
--- a/core/src/test/java/com/flowci/core/test/flow/CronServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/flow/CronServiceTest.java
@@ -43,11 +43,6 @@ public class CronServiceTest extends ZookeeperScenario {
 
     private final ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_get_exec_time_from_crontab() throws InterruptedException {
         CronDefinition definition = CronDefinitionBuilder.instanceDefinitionFor(CronType.UNIX);
diff --git a/core/src/test/java/com/flowci/core/test/flow/FlowControllerTest.java b/core/src/test/java/com/flowci/core/test/flow/FlowControllerTest.java
index 7b58a0072..1f2ffcdd8 100644
--- a/core/src/test/java/com/flowci/core/test/flow/FlowControllerTest.java
+++ b/core/src/test/java/com/flowci/core/test/flow/FlowControllerTest.java
@@ -19,9 +19,9 @@
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.domain.http.ResponseMessage;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.FlowYml;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
-import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
 import com.flowci.domain.VarType;
 import com.flowci.domain.VarValue;
@@ -43,7 +43,7 @@
 /**
  * @author yang
  */
-public class FlowControllerTest extends SpringScenario {
+public class FlowControllerTest extends MockLoggedInScenario {
 
     @Autowired
     private FlowMockHelper flowMockHelper;
@@ -55,7 +55,6 @@ public class FlowControllerTest extends SpringScenario {
 
     @Before
     public void createFlowWithYml() throws Exception {
-        mockLogin();
         String yml = StringHelper.toString(load("flow.yml"));
         flowMockHelper.create(flowName, yml);
     }
@@ -63,19 +62,15 @@ public void createFlowWithYml() throws Exception {
     @Test
     public void should_get_flow_and_yml_then_delete() throws Exception {
         ResponseMessage<Flow> getFlowResponse = mockMvcHelper
-                .expectSuccessAndReturnClass(get("/flows/" + flowName), FlowMockHelper.FlowType);
+                .expectSuccessAndReturnClass(get("/flows/" + flowName + "?group=false"), FlowMockHelper.FlowType);
         Assert.assertEquals(StatusCode.OK, getFlowResponse.getCode());
         Assert.assertEquals(flowName, getFlowResponse.getData().getName());
 
-        ResponseMessage<List<Yml>> responseMessage = mockMvcHelper
+        ResponseMessage<List<FlowYml>> responseMessage = mockMvcHelper
                 .expectSuccessAndReturnClass(get("/flows/" + flowName + "/yml"), FlowMockHelper.FlowYmlNameListType);
-        List<Yml> yamlNameList = responseMessage.getData();
+        List<FlowYml> yamlNameList = responseMessage.getData();
         Assert.assertEquals(1, yamlNameList.size());
 
-        ResponseMessage<String> contentRespMsg = mockMvcHelper
-                .expectSuccessAndReturnClass(get("/flows/" + flowName + "/yml/" + yamlNameList.get(0).getName()), FlowMockHelper.FlowYmlContentType);
-        Assert.assertEquals(StringHelper.toString(load("flow.yml")), StringHelper.fromBase64(contentRespMsg.getData()));
-
         ResponseMessage<Flow> deleted = mockMvcHelper
                 .expectSuccessAndReturnClass(delete("/flows/" + flowName), FlowMockHelper.FlowType);
         Assert.assertEquals(StatusCode.OK, deleted.getCode());
diff --git a/core/src/test/java/com/flowci/core/test/flow/FlowMockHelper.java b/core/src/test/java/com/flowci/core/test/flow/FlowMockHelper.java
index dd8e7c3a7..228e87761 100644
--- a/core/src/test/java/com/flowci/core/test/flow/FlowMockHelper.java
+++ b/core/src/test/java/com/flowci/core/test/flow/FlowMockHelper.java
@@ -22,7 +22,7 @@
 import com.flowci.core.common.domain.http.ResponseMessage;
 import com.flowci.core.flow.domain.CreateOption;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.user.domain.User;
 import com.flowci.domain.VarValue;
@@ -42,25 +42,20 @@
  */
 public class FlowMockHelper {
 
-    static final TypeReference<ResponseMessage<Flow>> FlowType =
-            new TypeReference<ResponseMessage<Flow>>() {
-            };
+    static final TypeReference<ResponseMessage<Flow>> FlowType = new TypeReference<>() {
+    };
 
-    static final TypeReference<ResponseMessage<List<Flow>>> ListFlowType =
-            new TypeReference<ResponseMessage<List<Flow>>>() {
-            };
+    static final TypeReference<ResponseMessage<List<Flow>>> ListFlowType = new TypeReference<>() {
+    };
 
-    static final TypeReference<ResponseMessage<List<Yml>>> FlowYmlNameListType =
-            new TypeReference<ResponseMessage<List<Yml>>>() {
-            };
+    static final TypeReference<ResponseMessage<List<FlowYml>>> FlowYmlNameListType = new TypeReference<>() {
+    };
 
-    static final TypeReference<ResponseMessage<String>> FlowYmlContentType =
-            new TypeReference<ResponseMessage<String>>() {
-            };
+    static final TypeReference<ResponseMessage<String>> FlowYmlContentType = new TypeReference<>() {
+    };
 
-    private static final TypeReference<ResponseMessage<List<User>>> UserListType =
-            new TypeReference<ResponseMessage<List<User>>>() {
-            };
+    private static final TypeReference<ResponseMessage<List<User>>> UserListType = new TypeReference<>() {
+    };
 
     @Autowired
     private MockMvcHelper mockMvcHelper;
@@ -69,16 +64,13 @@ public class FlowMockHelper {
     private ObjectMapper objectMapper;
 
     public Flow create(String name, String yml) throws Exception {
-        // create
-        ResponseMessage<Flow> response = mockMvcHelper.expectSuccessAndReturnClass(post("/flows/" + name), FlowType);
+        var options = new CreateOption().setRawYaml(StringHelper.toBase64(yml));
 
-        // set yaml
-        mockMvcHelper.expectSuccessAndReturnString(
-                post(String.format("/%s/yml/default", name))
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsBytes(StringHelper.toBase64(yml))));
+        var post = post("/flows/" + name)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(options));
 
-        return response.getData();
+        return mockMvcHelper.expectSuccessAndReturnClass(post, FlowType).getData();
     }
 
     void addUsers(String name, User... users) throws Exception {
diff --git a/core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java b/core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java
index f714e3054..45e18cd95 100644
--- a/core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/flow/FlowServiceTest.java
@@ -35,6 +35,7 @@
 import com.flowci.core.job.event.CreateNewJobEvent;
 import com.flowci.core.secret.domain.AuthSecret;
 import com.flowci.core.secret.service.SecretService;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.domain.*;
 import com.flowci.exception.ArgumentException;
@@ -55,7 +56,7 @@
  * @author yang
  */
 @FixMethodOrder(value = MethodSorters.JVM)
-public class FlowServiceTest extends SpringScenario {
+public class FlowServiceTest extends MockLoggedInScenario {
 
     @Autowired
     private ObjectMapper objectMapper;
@@ -75,8 +76,7 @@ public class FlowServiceTest extends SpringScenario {
     private String defaultYml;
 
     @Before
-    public void login() throws IOException {
-        mockLogin();
+    public void init() throws IOException {
         defaultYml = StringHelper.toString(load("flow.yml"));
     }
 
diff --git a/core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java b/core/src/test/java/com/flowci/core/test/flow/FlowYmlServiceTest.java
similarity index 57%
rename from core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java
rename to core/src/test/java/com/flowci/core/test/flow/FlowYmlServiceTest.java
index cafb1e215..03dd2a57b 100644
--- a/core/src/test/java/com/flowci/core/test/flow/YmlServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/flow/FlowYmlServiceTest.java
@@ -18,10 +18,11 @@
 
 import com.flowci.core.flow.domain.CreateOption;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.SimpleYml;
+import com.flowci.core.flow.domain.FlowYml;
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.flow.service.YmlService;
-import com.flowci.core.test.SpringScenario;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.exception.NotFoundException;
 import com.flowci.exception.YmlException;
 import com.flowci.util.StringHelper;
@@ -31,11 +32,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @author yang
  */
-public class YmlServiceTest extends SpringScenario {
+public class FlowYmlServiceTest extends MockLoggedInScenario {
 
     @Autowired
     private FlowService flowService;
@@ -46,28 +48,31 @@ public class YmlServiceTest extends SpringScenario {
     private Flow flow;
 
     @Before
-    public void login() {
-        mockLogin();
-        flow = flowService.create("hello", new CreateOption());
+    public void init() throws IOException {
+        var raw = StringHelper.toString(load("flow.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(raw));
+        flow = flowService.create("hello", option);
     }
 
     @Test
-    public void should_save_yml_for_flow() throws IOException {
-        // when:
-        String ymlRaw = StringHelper.toString(load("flow.yml"));
-
-        // then: yml object should be created
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, ymlRaw);
-        Assert.assertNotNull(yml);
+    public void should_get_yml() {
+        var entity = ymlService.get(flow.getId());
+        Assert.assertNotNull(entity);
+        Assert.assertNotNull(entity.getId());
+        Assert.assertEquals(flow.getId(), entity.getFlowId());
+        Assert.assertEquals(1, entity.getList().size());
 
-        Assert.assertNotNull(yml.getId());
-        Assert.assertEquals(flow.getId(), yml.getFlowId());
-        Assert.assertEquals(Yml.DEFAULT_NAME, yml.getName());
+        var yml = entity.getList().get(0);
+        Assert.assertEquals(FlowYml.DEFAULT_NAME, yml.getName());
     }
 
     @Test(expected = YmlException.class)
     public void should_throw_exception_if_yml_illegal_yml_format() {
-        ymlService.saveYml(flow, "yaml_name", "hello-...");
+        var illegalYml = new SimpleYml();
+        illegalYml.setName("test");
+        illegalYml.setRawInB64(StringHelper.toBase64("hell-..."));
+
+        ymlService.saveYml(flow, List.of(illegalYml));
     }
 
     @Test(expected = NotFoundException.class)
@@ -75,7 +80,11 @@ public void should_throw_exception_if_plugin_not_found() throws IOException {
         // when:
         String ymlRaw = StringHelper.toString(load("flow-with-plugin-not-found.yml"));
 
+        var illegalYml = new SimpleYml();
+        illegalYml.setName("test");
+        illegalYml.setRawInB64(StringHelper.toBase64(ymlRaw));
+
         // then:
-        ymlService.saveYml(flow, "hello", ymlRaw);
+        ymlService.saveYml(flow, List.of(illegalYml));
     }
 }
diff --git a/core/src/test/java/com/flowci/core/test/git/GitHookControllerTest.java b/core/src/test/java/com/flowci/core/test/git/GitHookControllerTest.java
index 3bde60876..46b46ccfd 100644
--- a/core/src/test/java/com/flowci/core/test/git/GitHookControllerTest.java
+++ b/core/src/test/java/com/flowci/core/test/git/GitHookControllerTest.java
@@ -18,6 +18,7 @@
 
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.event.JobCreatedEvent;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.test.flow.FlowMockHelper;
@@ -38,7 +39,7 @@
 /**
  * @author yang
  */
-public class GitHookControllerTest extends SpringScenario {
+public class GitHookControllerTest extends MockLoggedInScenario {
 
     @Autowired
     private FlowMockHelper flowMockHelper;
@@ -46,11 +47,6 @@ public class GitHookControllerTest extends SpringScenario {
     @Autowired
     private MockMvcHelper mockMvcHelper;
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_start_job_from_github_push_event() throws Exception {
         String yml = StringHelper.toString(load("flow.yml"));
diff --git a/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java b/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java
index c4cbbe614..6f3570c51 100644
--- a/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java
+++ b/core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java
@@ -19,8 +19,6 @@
 import com.flowci.core.agent.domain.ShellIn;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.flow.domain.CreateOption;
-import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.flow.service.YmlService;
 import com.flowci.core.job.domain.Job;
@@ -30,14 +28,12 @@
 import com.flowci.core.job.service.StepService;
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.core.plugin.event.GetPluginEvent;
-import com.flowci.core.test.SpringScenario;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.domain.*;
 import com.flowci.tree.*;
 import com.flowci.util.StringHelper;
 import com.google.common.collect.Lists;
-import org.checkerframework.checker.units.qual.C;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +44,7 @@
 
 import static com.flowci.tree.FlowNode.DEFAULT_ROOT_NAME;
 
-public class CmdManagerTest extends SpringScenario {
+public class CmdManagerTest extends MockLoggedInScenario {
 
     @Autowired
     private FlowService flowService;
@@ -68,21 +64,18 @@ public class CmdManagerTest extends SpringScenario {
     @MockBean
     private SpringEventManager eventManager;
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_apply_flow_level_docker_option() throws IOException {
         // given: flow and job
-        Flow flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("flow-with-root-docker.yml"));
-        Yml ymlObj = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
-        Job job = jobService.create(flow, ymlObj.getRaw(), Job.Trigger.MANUAL, new StringVars());
+        var yaml = StringHelper.toString(load("flow-with-root-docker.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        var flow = flowService.create("hello", option);
+        var ymlEntity = ymlService.get(flow.getId());
+
+        Job job = jobService.create(flow, ymlEntity.getList(), Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
-        FlowNode root = YmlParser.load(ymlObj.getRaw());
+        FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
 
         // when: create first shell cmd
@@ -115,15 +108,16 @@ public void should_create_cmd_in_with_default_plugin_value() throws IOException
         Mockito.when(eventManager.publish(Mockito.any())).thenReturn(event);
 
         // given: flow and job
-        Flow flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("flow-with-plugin.yml"));
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        var yaml = StringHelper.toString(load("flow-with-plugin.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        var flow = flowService.create("hello", option);
+        var ymlEntity = ymlService.get(flow.getId());
 
-        Job job = jobService.create(flow, yml.getRaw(), Job.Trigger.MANUAL, new StringVars());
+        Job job = jobService.create(flow, ymlEntity.getList(), Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
         // when: create shell cmd
-        FlowNode root = YmlParser.load(yml.getRaw());
+        FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
         Node node = tree.get(NodePath.create(DEFAULT_ROOT_NAME, "plugin-test"));
         Step step = stepService.get(job.getId(), node.getPath().getPathInStr());
@@ -153,15 +147,16 @@ public void should_create_cmd_in_with_default_plugin_value() throws IOException
     @Test
     public void should_handle_step_in_step() throws IOException {
         // given: flow and job
-        Flow flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("step-in-step.yml"));
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        var yaml = StringHelper.toString(load("step-in-step.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        var flow = flowService.create("hello", option);
+        var ymlEntity = ymlService.get(flow.getId());
 
-        Job job = jobService.create(flow, yml.getRaw(), Job.Trigger.MANUAL, new StringVars());
+        Job job = jobService.create(flow, ymlEntity.getList(), Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
         // when: create shell cmd
-        FlowNode root = YmlParser.load(yml.getRaw());
+        FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
 
         Node step2_1 = tree.get(NodePath.create(DEFAULT_ROOT_NAME, "step2", "step-2-1"));
@@ -172,7 +167,7 @@ public void should_handle_step_in_step() throws IOException {
         Assert.assertEquals(500, cmdStep2_1.getTimeout());
         Assert.assertEquals(2, cmdStep2_1.getRetry());
 
-        // input should be overwrite
+        // input should be overwritten
         Assert.assertEquals("overwrite-parent", cmdStep2_1.getInputs().get("STEP_2"));
         Assert.assertEquals("overwrite-parent", cmdStep2_1.getInputs().get("STEP_2"));
 
diff --git a/core/src/test/java/com/flowci/core/test/job/JobControllerTest.java b/core/src/test/java/com/flowci/core/test/job/JobControllerTest.java
index b82ec31a1..c1789cc61 100644
--- a/core/src/test/java/com/flowci/core/test/job/JobControllerTest.java
+++ b/core/src/test/java/com/flowci/core/test/job/JobControllerTest.java
@@ -21,12 +21,9 @@
 import com.flowci.core.common.domain.JsonablePage;
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.domain.http.ResponseMessage;
-import com.flowci.core.job.domain.CreateJob;
-import com.flowci.core.job.domain.Job;
-import com.flowci.core.job.domain.JobItem;
-import com.flowci.core.job.domain.Step;
+import com.flowci.core.job.domain.*;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
-import com.flowci.core.test.SpringScenario;
 import com.flowci.core.test.flow.FlowMockHelper;
 import com.flowci.util.StringHelper;
 import org.junit.Assert;
@@ -48,22 +45,22 @@
  * @author yang
  */
 @FixMethodOrder(value = MethodSorters.JVM)
-public class JobControllerTest extends SpringScenario {
+public class JobControllerTest extends MockLoggedInScenario {
 
     private static final TypeReference<ResponseMessage<Job>> JobType =
-            new TypeReference<ResponseMessage<Job>>() {
+            new TypeReference<>() {
             };
 
     private static final TypeReference<ResponseMessage<JsonablePage<JobItem>>> JobListType =
-            new TypeReference<ResponseMessage<JsonablePage<JobItem>>>() {
+            new TypeReference<>() {
             };
 
     private static final TypeReference<ResponseMessage<List<Step>>> JobStepsType =
-            new TypeReference<ResponseMessage<List<Step>>>() {
+            new TypeReference<>() {
             };
 
-    private static final TypeReference<ResponseMessage<String>> JobYmlType =
-            new TypeReference<ResponseMessage<String>>() {
+    private static final TypeReference<ResponseMessage<JobYml>> JobYmlType =
+            new TypeReference<>() {
             };
 
     @Autowired
@@ -79,7 +76,6 @@ public class JobControllerTest extends SpringScenario {
 
     @Before
     public void init() throws Exception {
-        mockLogin();
         String yml = StringHelper.toString(load("flow.yml"));
         flowMockHelper.create(flow, yml);
     }
@@ -88,10 +84,11 @@ public void init() throws Exception {
     public void should_get_job_yml() throws Exception {
         createJobForFlow(flow);
 
-        ResponseMessage<String> responseMessage =
-                mockMvcHelper.expectSuccessAndReturnClass(get("/jobs/hello-flow/1/yml"), JobYmlType);
-        String yml = new String(Base64.getDecoder().decode(responseMessage.getData()));
+        var responseMessage = mockMvcHelper.expectSuccessAndReturnClass(get("/jobs/hello-flow/1/yml"), JobYmlType);
+        List<JobYml.Body> list = responseMessage.getData().getList();
+        Assert.assertEquals(1, list.size());
 
+        String yml = StringHelper.fromBase64(list.get(0).getRawInB64());
         Assert.assertNotNull(yml);
         Assert.assertEquals(StringHelper.toString(load("flow.yml")), yml);
     }
@@ -171,8 +168,8 @@ public void should_list_job_steps_by_flow_and_build_number() throws Exception {
 
     public Job createJobForFlow(String name) throws Exception {
         return mockMvcHelper.expectSuccessAndReturnClass(post("/jobs")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsBytes(new CreateJob(name))), JobType)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsBytes(new CreateJob(name))), JobType)
                 .getData();
     }
 }
diff --git a/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java b/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java
index 303e728a8..775be64ba 100644
--- a/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/job/JobServiceTest.java
@@ -25,7 +25,8 @@
 import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.domain.CreateOption;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.Yml;
+import com.flowci.core.flow.domain.FlowYml;
+import com.flowci.core.flow.domain.SimpleYml;
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.flow.service.YmlService;
 import com.flowci.core.job.dao.ExecutedCmdDao;
@@ -119,14 +120,14 @@ public class JobServiceTest extends ZookeeperScenario {
 
     private Flow flow;
 
-    private Yml yml;
+    private FlowYml ymlEntity;
 
     @Before
     public void mockFlowAndYml() throws IOException {
-        mockLogin();
-        flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("flow.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        var yaml = StringHelper.toString(load("flow.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        flow = flowService.create("hello", option);
+        ymlEntity = ymlService.get(flow.getId());
     }
 
     @Test
@@ -141,7 +142,7 @@ public void should_create_job_with_expected_context() {
         input.put(Variables.Git.EVENT_ID, "dummy_git_event_id");
 
         // when: create job
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, input);
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, input);
         Vars<String> context = job.getContext();
         Assert.assertNotNull(context);
 
@@ -171,7 +172,7 @@ public void should_create_job_with_expected_context() {
 
     @Test
     public void should_init_steps_cmd_after_job_created() {
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, StringVars.EMPTY);
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, StringVars.EMPTY);
 
         List<Step> steps = stepService.list(job);
         Assert.assertNotNull(steps);
@@ -197,7 +198,7 @@ public void should_start_new_job() throws Throwable {
         });
 
         // when: create and start job
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, StringVars.EMPTY);
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, StringVars.EMPTY);
         job = jobService.get(job.getId());
 
         Assert.assertEquals(Status.CREATED, job.getStatus());
@@ -218,7 +219,7 @@ public void should_start_new_job() throws Throwable {
 
     @Test
     public void should_get_job_expire() {
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, StringVars.EMPTY);
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, StringVars.EMPTY);
         Assert.assertFalse(job.isExpired());
     }
 
@@ -230,15 +231,15 @@ public void should_finish_whole_job() throws InterruptedException, IOException {
         p.setVersion(Version.parse("0.1.1"));
         pluginDao.save(p);
 
-        String yaml = StringHelper.toString(load("flow-with-notify.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        String yaml = StringHelper.toString(load("flow.yml"));
+        ymlEntity = ymlService.saveYml(flow, List.of(new SimpleYml("default", StringHelper.toBase64(yaml))));
 
         Agent agent = agentService.create(new AgentOption().setName("hello.agent"));
         mockAgentOnline(agent.getToken());
 
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, StringVars.EMPTY);
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, StringVars.EMPTY);
 
-        FlowNode root = YmlParser.load(yml.getRaw());
+        FlowNode root = YmlParser.load(FlowYml.toRawArray(ymlEntity.getList()));
         NodeTree tree = NodeTree.create(root);
 
         Node firstNode = tree.getRoot().getNext().get(0);
@@ -360,6 +361,7 @@ public void should_handle_cmd_callback_for_success_status() {
 
         // then: job context should be updated
         job = jobDao.findById(job.getId()).get();
+        Assert.assertEquals(Status.RUNNING, job.getStatus());
         Assert.assertEquals("hello.world", job.getContext().get("HELLO_WORLD"));
 
         // then: job current context should be updated
@@ -386,7 +388,8 @@ public void should_handle_cmd_callback_for_success_status() {
     public void should_handle_cmd_callback_for_failure_status() throws IOException {
         // init: agent and job
         String yaml = StringHelper.toString(load("flow-with-failure.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        ymlEntity = ymlService.saveYml(flow, List.of(new SimpleYml("default", StringHelper.toBase64(yaml))));
+
         Agent agent = agentService.create(new AgentOption().setName("hello.agent"));
         Job job = prepareJobForRunningStatus(agent);
 
@@ -409,7 +412,8 @@ public void should_handle_cmd_callback_for_failure_status() throws IOException {
     public void should_handle_cmd_callback_for_failure_status_but_allow_failure() throws IOException {
         // init: agent and job
         String yaml = StringHelper.toString(load("flow-all-failure.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        ymlEntity = ymlService.saveYml(flow, List.of(new SimpleYml("default", StringHelper.toBase64(yaml))));
+
         Agent agent = agentService.create(new AgentOption().setName("hello.agent"));
         Job job = prepareJobForRunningStatus(agent);
 
@@ -454,7 +458,7 @@ public void should_handle_cmd_callback_for_failure_status_but_allow_failure() th
     public void should_cancel_job_if_agent_offline() throws IOException, InterruptedException {
         // init:
         String yaml = StringHelper.toString(load("flow-with-condition.yml"));
-        yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        ymlEntity = ymlService.saveYml(flow, List.of(new SimpleYml("default", StringHelper.toBase64(yaml))));
 
         // mock agent online
         Agent agent = agentService.create(new AgentOption().setName("hello.agent.2"));
@@ -492,7 +496,7 @@ public void should_cancel_job_if_agent_offline() throws IOException, Interrupted
     @Test
     public void should_rerun_job() {
         // init: create old job wit success status
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, StringVars.EMPTY);
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, StringVars.EMPTY);
         job.setStatus(Status.SUCCESS);
         JobContextHelper.setStatus(job, Status.SUCCESS);
         jobDao.save(job);
@@ -521,8 +525,8 @@ public void should_rerun_job() {
     }
 
     private Job prepareJobForRunningStatus(Agent agent) {
-        // init: job to mock the first node been send to agent
-        Job job = jobService.create(flow, yml.getRaw(), Trigger.MANUAL, StringVars.EMPTY);
+        // init: job to mock the first node been sent to agent
+        Job job = jobService.create(flow, ymlEntity.getList(), Trigger.MANUAL, StringVars.EMPTY);
 
         NodeTree tree = ymlManager.getTree(job);
         Node firstNode = tree.getRoot().getNext().get(0);
diff --git a/core/src/test/java/com/flowci/core/test/secret/SecretServiceTest.java b/core/src/test/java/com/flowci/core/test/secret/SecretServiceTest.java
index 4e763c910..80af6ffb3 100644
--- a/core/src/test/java/com/flowci/core/test/secret/SecretServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/secret/SecretServiceTest.java
@@ -18,6 +18,7 @@
 
 import com.flowci.core.secret.domain.*;
 import com.flowci.core.secret.service.SecretService;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.domain.SimpleAuthPair;
 import org.assertj.core.util.Strings;
@@ -32,16 +33,11 @@
 /**
  * @author yang
  */
-public class SecretServiceTest extends SpringScenario {
+public class SecretServiceTest extends MockLoggedInScenario {
 
     @Autowired
     private SecretService secretService;
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Test
     public void should_create_rsa_secret() {
         Secret rsa = secretService.createRSA("hello.rsa");
diff --git a/core/src/test/java/com/flowci/core/test/trigger/TriggerServiceTest.java b/core/src/test/java/com/flowci/core/test/trigger/TriggerServiceTest.java
index 3333f2a19..934ddc3eb 100644
--- a/core/src/test/java/com/flowci/core/test/trigger/TriggerServiceTest.java
+++ b/core/src/test/java/com/flowci/core/test/trigger/TriggerServiceTest.java
@@ -8,6 +8,7 @@
 import com.flowci.core.git.domain.GitCommit;
 import com.flowci.core.git.domain.GitUser;
 import com.flowci.core.job.domain.Job;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.trigger.domain.EmailTrigger;
 import com.flowci.core.trigger.domain.Trigger;
 import com.flowci.core.trigger.event.EmailTemplateParsedEvent;
@@ -32,7 +33,7 @@
 import java.util.ArrayList;
 import java.util.Properties;
 
-public class TriggerServiceTest extends SpringScenario {
+public class TriggerServiceTest extends MockLoggedInScenario {
 
     @Autowired
     private TriggerService triggerService;
@@ -47,11 +48,6 @@ public class TriggerServiceTest extends SpringScenario {
 
     private final JavaMailSender sender = getSender();
 
-    @Before
-    public void login() {
-        mockLogin();
-    }
-
     @Before
     public void mock() {
         Mockito.when(configService.get(config.getName())).thenReturn(config);
diff --git a/core/src/test/java/com/flowci/core/test/user/UserControllerTest.java b/core/src/test/java/com/flowci/core/test/user/UserControllerTest.java
index 2a7472f27..94f19577f 100644
--- a/core/src/test/java/com/flowci/core/test/user/UserControllerTest.java
+++ b/core/src/test/java/com/flowci/core/test/user/UserControllerTest.java
@@ -20,6 +20,8 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.domain.StatusCode;
+import com.flowci.core.common.manager.SessionManager;
+import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.*;
@@ -29,6 +31,7 @@
 import com.flowci.exception.ErrorCode;
 import com.flowci.exception.NotFoundException;
 import com.flowci.util.HashingHelper;
+import com.flowci.util.StringHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +48,7 @@
 public class UserControllerTest extends SpringScenario {
 
     private static final TypeReference<ResponseMessage<User>> UserType =
-            new TypeReference<ResponseMessage<User>>() {
+            new TypeReference<>() {
             };
 
     @Autowired
@@ -54,13 +57,18 @@ public class UserControllerTest extends SpringScenario {
     @Autowired
     private ObjectMapper objectMapper;
 
-    @Before
-    public void loginBefore() {
-        mockLogin();
-    }
+    @Autowired
+    private SessionManager sessionManager;
 
     @Test(expected = AuthenticationException.class)
     public void should_change_password_for_current_user_successfully() throws Exception {
+        var dummy = new User();
+        dummy.setId("1111");
+        dummy.setPasswordOnMd5(HashingHelper.md5("22222"));
+        dummy.setRole(User.Role.Admin);
+        dummy.setEmail("test@flow.ci");
+        sessionManager.set(dummy);
+
         User user = sessionManager.get();
 
         String newPwOnMd5 = HashingHelper.md5("11111");
@@ -70,7 +78,7 @@ public void should_change_password_for_current_user_successfully() throws Except
         body.setConfirm(newPwOnMd5);
 
         // when:
-        ResponseMessage message = mockMvcHelper.expectSuccessAndReturnClass(
+        var message = mockMvcHelper.expectSuccessAndReturnClass(
                 post("/users/change/password")
                         .content(objectMapper.writeValueAsBytes(body))
                         .contentType(MediaType.APPLICATION_JSON), ResponseMessage.class);
diff --git a/core/src/test/resources/flow-with-notify.yml b/core/src/test/resources/flow-with-notify.yml
deleted file mode 100644
index b6f6daa9e..000000000
--- a/core/src/test/resources/flow-with-notify.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-envs:
-  FLOW_WORKSPACE: "echo hello"
-  FLOW_VERSION: "echo version"
-
-notifications:
-  - plugin: "email"
-    envs:
-      PLUGIN_VAR: "send"
-
-steps:
-  - envs:
-      FLOW_WORKSPACE: "echo step"
-      FLOW_VERSION: "echo step version"
-    allow_failure: true
-    bash: |
-      echo hello
-
-  - name: step2
-    allow_failure: false
-    bash: "echo 2"
diff --git a/core/src/test/resources/plugin-repo.json b/core/src/test/resources/plugin-repo.json
index d8c31e07c..87572dc86 100644
--- a/core/src/test/resources/plugin-repo.json
+++ b/core/src/test/resources/plugin-repo.json
@@ -8,6 +8,6 @@
       "git"
     ],
     "author": "32008001@qq.com",
-    "version": "1.0.0"
+    "version": "1.2.0"
   }
 ]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 524ea0692..18b8b6825 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <guava.version>31.0.1-jre</guava.version>
         <junit.version>4.13.1</junit.version>
         <spring.version>2.6.0</spring.version>
-        <snakeyaml.version>1.26</snakeyaml.version>
+        <snakeyaml.version>1.32</snakeyaml.version>
         <jackson.version>2.13.1</jackson.version>
         <curator.version>4.3.0</curator.version>
         <caffeine.version>2.6.2</caffeine.version>
@@ -40,7 +40,7 @@
         <amqp-client.version>5.9.0</amqp-client.version>
         <java-jwt.version>3.8.1</java-jwt.version>
         <minio.version>6.0.11</minio.version>
-        <log4j.version>2.17.0</log4j.version>
+        <log4j.version>2.18.0</log4j.version>
         <kubernetes-client.version>5.11.1</kubernetes-client.version>
     </properties>
 
@@ -266,6 +266,12 @@
                 <version>${log4j.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
diff --git a/sm/src/main/java/com/flowci/sm/StateMachine.java b/sm/src/main/java/com/flowci/sm/StateMachine.java
index fb8a88063..c06893de8 100644
--- a/sm/src/main/java/com/flowci/sm/StateMachine.java
+++ b/sm/src/main/java/com/flowci/sm/StateMachine.java
@@ -84,7 +84,7 @@ public void execute(T context) {
             });
 
         } catch (Throwable e) {
-            log.debug(e);
+            log.debug(e.getMessage());
             action.onException(e, context);
         } finally {
             action.onFinally(context);
diff --git a/tree/src/main/java/com/flowci/tree/FlowNode.java b/tree/src/main/java/com/flowci/tree/FlowNode.java
index 9c915c10d..6fc5467d9 100644
--- a/tree/src/main/java/com/flowci/tree/FlowNode.java
+++ b/tree/src/main/java/com/flowci/tree/FlowNode.java
@@ -19,7 +19,7 @@ public final class FlowNode extends Node {
     /**
      * Agent tags to set node running on which agent
      */
-    private Selector selector = Selector.EMPTY;
+    private Selector selector;
 
     private List<Node> children = new LinkedList<>();
 
diff --git a/tree/src/main/java/com/flowci/tree/YmlParser.java b/tree/src/main/java/com/flowci/tree/YmlParser.java
index c3c1c55d6..64f99f6e5 100644
--- a/tree/src/main/java/com/flowci/tree/YmlParser.java
+++ b/tree/src/main/java/com/flowci/tree/YmlParser.java
@@ -19,7 +19,6 @@
 import com.flowci.exception.YmlException;
 import com.flowci.tree.yml.FlowYml;
 import com.flowci.util.YamlHelper;
-import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.error.YAMLException;
 
 import static com.flowci.tree.FlowNode.DEFAULT_ROOT_NAME;
@@ -32,11 +31,18 @@ public class YmlParser {
     /**
      * Create Node instance from yml
      */
-    public static synchronized FlowNode load(String yml) {
-        Yaml yaml = YamlHelper.create(FlowYml.class);
+    public static synchronized FlowNode load(String ...ymls) {
+        if (ymls.length == 0) {
+            return new FlowNode(DEFAULT_ROOT_NAME);
+        }
 
         try {
-            FlowYml root = yaml.load(yml);
+            var root = new FlowYml();
+            for (var yml : ymls) {
+                var ymlObj = YamlHelper.create(FlowYml.class);
+                FlowYml tmp = ymlObj.load(yml);
+                root.merge(tmp);
+            }
             root.setName(DEFAULT_ROOT_NAME);
             return root.toNode(null);
         } catch (YAMLException e) {
diff --git a/tree/src/main/java/com/flowci/tree/yml/FlowYml.java b/tree/src/main/java/com/flowci/tree/yml/FlowYml.java
index 5b3b73850..01b0a4c90 100644
--- a/tree/src/main/java/com/flowci/tree/yml/FlowYml.java
+++ b/tree/src/main/java/com/flowci/tree/yml/FlowYml.java
@@ -21,16 +21,19 @@
 import com.flowci.tree.Node;
 import com.flowci.tree.NodePath;
 import com.flowci.tree.Selector;
-import com.flowci.util.ObjectsHelper;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.SneakyThrows;
 
+import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import static com.flowci.util.ObjectsHelper.*;
+
 /**
  * @author yang
  */
@@ -39,24 +42,52 @@
 @NoArgsConstructor
 public class FlowYml extends YmlBase<FlowNode> {
 
-    private Selector selector = new Selector();
+    private Selector selector;
 
     // post steps
     private List<StepYml> post = new LinkedList<>();
 
+    /**
+     * Merge yml element from others
+     * it will through YMLException if elements are duplicated
+     */
+    @SneakyThrows
+    public void merge(FlowYml flowYml) {
+        Set<Field> fields = fields(FlowYml.class);
+        for (Field field : fields) {
+            String fieldName = field.getName();
+
+            // for $jacocoData
+            if (fieldName.startsWith("$")) {
+                continue;
+            }
+
+            boolean hasValueOnThis = hasValue(this, field);
+            boolean hasValueOnOther = hasValue(flowYml, field);
+
+            if (hasValueOnThis && hasValueOnOther) {
+                throw new YmlException("Duplicated YAML " + fieldName);
+            }
+
+            if (hasValueOnOther) {
+                field.set(this, field.get(flowYml));
+            }
+        }
+    }
+
     public FlowNode toNode(Node parent) {
         if (!NodePath.validate(name)) {
             throw new YmlException("Invalid name {0}", name);
         }
 
         FlowNode node = new FlowNode(name, parent);
-        node.setSelector(selector);
+        node.setSelector(selector == null ? Selector.EMPTY : selector);
         node.setCondition(condition);
         node.setEnvironments(getVariableMap());
 
         setDockerToNode(node);
 
-        if (!ObjectsHelper.hasCollection(steps)) {
+        if (!hasCollection(steps)) {
             throw new YmlException("The 'steps' section must be defined");
         }
 
diff --git a/tree/src/main/java/com/flowci/tree/yml/StepYml.java b/tree/src/main/java/com/flowci/tree/yml/StepYml.java
index 53c791448..1af713b42 100644
--- a/tree/src/main/java/com/flowci/tree/yml/StepYml.java
+++ b/tree/src/main/java/com/flowci/tree/yml/StepYml.java
@@ -40,7 +40,7 @@ public class StepYml extends YmlBase<RegularStepNode> {
 
     private static final String DefaultParallelPrefix = "parallel-";
 
-    private static final Set<String> FieldsForStep = ObjectsHelper.fields(StepYml.class);
+    private static final Set<String> FieldsForStep = ObjectsHelper.nameOfFields(StepYml.class);
 
     static {
         FieldsForStep.remove("parallel");
@@ -76,7 +76,7 @@ public class StepYml extends YmlBase<RegularStepNode> {
     public Node toNode(Node parent, int index) {
         if (parallel != null) {
             try {
-                if (ObjectsHelper.hasValue(this, FieldsForStep)) {
+                if (ObjectsHelper.hasValues(this, FieldsForStep)) {
                     throw new YmlException("Parallel section only");
                 }
             } catch (ReflectiveOperationException e) {
diff --git a/tree/src/main/java/com/flowci/tree/yml/YmlBase.java b/tree/src/main/java/com/flowci/tree/yml/YmlBase.java
index 361a4717d..742fb1931 100644
--- a/tree/src/main/java/com/flowci/tree/yml/YmlBase.java
+++ b/tree/src/main/java/com/flowci/tree/yml/YmlBase.java
@@ -54,9 +54,7 @@ public abstract class YmlBase<T extends Node> implements Serializable {
 
     protected StringVars getVariableMap() {
         StringVars variables = new StringVars(envs.size());
-        for (Map.Entry<String, String> entry : envs.entrySet()) {
-            variables.put(entry.getKey(), entry.getValue());
-        }
+        variables.putAll(envs);
         return variables;
     }
 
diff --git a/tree/src/test/java/com/flowci/tree/test/FlowYmlTest.java b/tree/src/test/java/com/flowci/tree/test/FlowYmlTest.java
new file mode 100644
index 000000000..b24ce67ea
--- /dev/null
+++ b/tree/src/test/java/com/flowci/tree/test/FlowYmlTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flowci.tree.test;
+
+import com.flowci.exception.YmlException;
+import com.flowci.tree.yml.FlowYml;
+import com.flowci.tree.yml.StepYml;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FlowYmlTest {
+
+    @Test
+    public void should_merge_flow_yml() {
+        FlowYml main = new FlowYml();
+        main.setName("test");
+
+        var stepYml = new StepYml();
+        stepYml.setName("step");
+
+        FlowYml other = new FlowYml();
+        other.getSteps().add(stepYml);
+
+        main.merge(other);
+        Assert.assertEquals(main.getSteps(), other.getSteps());
+    }
+
+    @Test(expected = YmlException.class)
+    public void should_throw_yml_exception_on_duplicated_element() {
+        var stepYml = new StepYml();
+        stepYml.setName("step");
+
+        FlowYml main = new FlowYml();
+        main.setName("test");
+        main.getSteps().add(stepYml);
+
+        FlowYml other = new FlowYml();
+        other.getSteps().add(stepYml);
+
+        main.merge(other);
+    }
+}
diff --git a/tree/src/test/java/com/flowci/tree/test/YmlParserTest.java b/tree/src/test/java/com/flowci/tree/test/YmlParserTest.java
index 4bc7bbaa5..c1caa4114 100644
--- a/tree/src/test/java/com/flowci/tree/test/YmlParserTest.java
+++ b/tree/src/test/java/com/flowci/tree/test/YmlParserTest.java
@@ -29,7 +29,9 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static com.flowci.tree.FlowNode.DEFAULT_ROOT_NAME;
 
@@ -338,13 +340,21 @@ public void should_load_and_get_post_steps() throws IOException {
 
         List<Node> nextFromSubflowC = tree.post(NodePath.create("flow/parallel-3/subflow-C/C"));
         Assert.assertEquals(2, nextFromSubflowC.size());
-        Assert.assertEquals(postOfSubC, nextFromSubflowC.get(0).getPath());
-        Assert.assertEquals(postOfSubD, nextFromSubflowC.get(1).getPath());
+
+        Set<NodePath> postOfParallel3 = new HashSet<>(2);
+        postOfParallel3.add(nextFromSubflowC.get(0).getPath());
+        postOfParallel3.add(nextFromSubflowC.get(1).getPath());
+        Assert.assertTrue(postOfParallel3.contains(postOfSubC));
+        Assert.assertTrue(postOfParallel3.contains(postOfSubD));
 
         List<Node> nextFromSubA = tree.post(postOfSubA);
         Assert.assertEquals(2, nextFromSubA.size());
-        Assert.assertEquals(postOfSubC, nextFromSubA.get(0).getPath());
-        Assert.assertEquals(postOfSubD, nextFromSubA.get(1).getPath());
+
+        postOfParallel3 = new HashSet<>(2);
+        postOfParallel3.add(nextFromSubA.get(0).getPath());
+        postOfParallel3.add(nextFromSubA.get(1).getPath());
+        Assert.assertTrue(postOfParallel3.contains(postOfSubC));
+        Assert.assertTrue(postOfParallel3.contains(postOfSubD));
 
         List<Node> nextFromSubC = tree.post(postOfSubC);
         Assert.assertEquals(1, nextFromSubC.size());
diff --git a/tree/src/test/resources/flow-with-post.yml b/tree/src/test/resources/flow-with-post.yml
index 53d963e4c..c7b77ac04 100644
--- a/tree/src/test/resources/flow-with-post.yml
+++ b/tree/src/test/resources/flow-with-post.yml
@@ -36,7 +36,6 @@ steps:
         post:
           - name: subA-post-1
             bash: "echo sub A post-1"
-
       subflow-B:
         selector:
           label: [ "linux" ]
@@ -46,7 +45,6 @@ steps:
             script: |
               echo "A"
 
-
   - parallel:
       subflow-C:
         steps:
@@ -68,6 +66,7 @@ steps:
             bash: |
               echo "Post-D"
 
+
   - name: step3
     steps:
       - name: step-3-1
diff --git a/util/src/main/java/com/flowci/util/ObjectsHelper.java b/util/src/main/java/com/flowci/util/ObjectsHelper.java
index ae2a532d6..bcca1f4ce 100644
--- a/util/src/main/java/com/flowci/util/ObjectsHelper.java
+++ b/util/src/main/java/com/flowci/util/ObjectsHelper.java
@@ -38,7 +38,7 @@ public static boolean hasCollection(Map<?, ?> map) {
         return map != null && !map.isEmpty();
     }
 
-    public static Set<String> fields(Class<?> klass) {
+    public static Set<String> nameOfFields(Class<?> klass) {
         Set<String> fields = new HashSet<>();
         for (Class<?> c = klass; c != null; c = c.getSuperclass()) {
             for (Field f : c.getDeclaredFields()) {
@@ -48,10 +48,41 @@ public static Set<String> fields(Class<?> klass) {
         return fields;
     }
 
+    public static Set<Field> fields(Class<?> klass) {
+        Set<Field> fields = new HashSet<>();
+        for (Class<?> c = klass; c != null; c = c.getSuperclass()) {
+            fields.addAll(Arrays.asList(c.getDeclaredFields()));
+        }
+        return fields;
+    }
+
+    public static <T> boolean hasValue(T instance, Field field) throws ReflectiveOperationException {
+        field.setAccessible(true);
+        Object o = field.get(instance);
+
+        if (Objects.isNull(o)) {
+            return false;
+        }
+
+        if (o instanceof Collection) {
+            if (((Collection<?>) o).isEmpty()) {
+                return false;
+            }
+        }
+
+        if (o instanceof Map) {
+            if (((Map<?, ?>) o).isEmpty()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Check input fields are all have value or not
      */
-    public static <T> boolean hasValue(T instance, Set<String> fields) throws ReflectiveOperationException {
+    public static <T> boolean hasValues(T instance, Set<String> fields) throws ReflectiveOperationException {
         Map<String, Field> all = new HashMap<>();
 
         for (Class<?> c = instance.getClass(); c != null; c = c.getSuperclass()) {
@@ -66,18 +97,9 @@ public static <T> boolean hasValue(T instance, Set<String> fields) throws Reflec
                 throw new NoSuchFieldException(name);
             }
 
-            field.setAccessible(true);
-            Object o = field.get(instance);
-
-            if (o == null) {
+            if (!hasValue(instance, field)) {
                 return false;
             }
-
-            if (o instanceof Collection) {
-                if (((Collection<?>) o).isEmpty()) {
-                    return false;
-                }
-            }
         }
 
         return true;
diff --git a/util/src/test/java/com/flowci/util/test/ObjectsHelperTest.java b/util/src/test/java/com/flowci/util/test/ObjectsHelperTest.java
index 52fc4bfe3..cdb140513 100644
--- a/util/src/test/java/com/flowci/util/test/ObjectsHelperTest.java
+++ b/util/src/test/java/com/flowci/util/test/ObjectsHelperTest.java
@@ -35,7 +35,7 @@ public static class DummyObj extends DummyParent {
     public void should_check_fields_value() throws ReflectiveOperationException {
         DummyObj obj = new DummyObj();
 
-        boolean r = ObjectsHelper.hasValue(obj, Sets.newHashSet("id", "name", "isCreated", "array"));
+        boolean r = ObjectsHelper.hasValues(obj, Sets.newHashSet("id", "name", "isCreated", "array"));
         Assert.assertFalse(r);
 
         obj.setId("123");
@@ -43,7 +43,7 @@ public void should_check_fields_value() throws ReflectiveOperationException {
         obj.setIsCreated(true);
         obj.setArray(Lists.newArrayList("1"));
 
-        r = ObjectsHelper.hasValue(obj, Sets.newHashSet("id", "name", "isCreated", "array"));
+        r = ObjectsHelper.hasValues(obj, Sets.newHashSet("id", "name", "isCreated", "array"));
         Assert.assertTrue(r);
     }