diff --git a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/Bench4qTestScriptAdapter.java b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/Bench4qTestScriptAdapter.java
index ae92fb2a..18886ad8 100644
--- a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/Bench4qTestScriptAdapter.java
+++ b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/Bench4qTestScriptAdapter.java
@@ -11,20 +11,20 @@ import javax.xml.bind.Marshaller;
 import org.bench4q.master.helper.MarshalHelper;
 import org.bench4q.master.scriptrecord.httpcapture.generator.ChildrenUrl;
 import org.bench4q.share.models.agent.ParameterModel;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 import org.bench4q.share.models.agent.scriptrecord.BatchBehavior;
 import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
 import org.bench4q.share.models.agent.scriptrecord.UsePluginModel;
 
 public class Bench4qTestScriptAdapter implements IScriptAdapter {
-	private RunScenarioModel runScenarioModel;
+	private RunScenarioModelNew runScenarioModel;
 	private List<ChildrenUrl> childrenUrls = new ArrayList<ChildrenUrl>();
 
-	public RunScenarioModel getRunScenarioModel() {
+	public RunScenarioModelNew getRunScenarioModel() {
 		return runScenarioModel;
 	}
 
-	private void setRunScenarioModel(RunScenarioModel runScenarioModel) {
+	private void setRunScenarioModel(RunScenarioModelNew runScenarioModel) {
 		this.runScenarioModel = runScenarioModel;
 	}
 
@@ -36,7 +36,7 @@ public class Bench4qTestScriptAdapter implements IScriptAdapter {
 		this.childrenUrls = childrenUrls;
 	}
 
-	public Bench4qTestScriptAdapter(RunScenarioModel runScenarioModel) {
+	public Bench4qTestScriptAdapter(RunScenarioModelNew runScenarioModel) {
 		this.runScenarioModel = runScenarioModel;
 		this.setChildrenUrls(new ArrayList<ChildrenUrl>());
 	}
@@ -149,11 +149,11 @@ public class Bench4qTestScriptAdapter implements IScriptAdapter {
 
 	public void setText(String text) {
 		if (text.isEmpty()) {
-			this.setRunScenarioModel(new RunScenarioModel());
+			this.setRunScenarioModel(new RunScenarioModelNew());
 			return;
 		}
-		this.runScenarioModel = (RunScenarioModel) MarshalHelper.unmarshal(
-				RunScenarioModel.class, text);
+		this.runScenarioModel = (RunScenarioModelNew) MarshalHelper.unmarshal(
+				RunScenarioModelNew.class, text);
 	}
 
 }
diff --git a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/HttpCapture.java b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/HttpCapture.java
index 7fbec5b1..6748edeb 100644
--- a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/HttpCapture.java
+++ b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/HttpCapture.java
@@ -8,7 +8,7 @@ import java.util.concurrent.Executors;
 import javax.swing.JTextArea;
 
 import org.apache.log4j.Logger;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 
 public class HttpCapture {
 	private int localport;
@@ -93,7 +93,7 @@ public class HttpCapture {
 			e.printStackTrace();
 		}
 		this.currentTest = new Test(this.proxy, new Bench4qTestScriptAdapter(
-				new RunScenarioModel()), generator);
+				new RunScenarioModelNew()), generator);
 	}
 
 	public void startProxyServer() throws IOException, Utils.UserException {
diff --git a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/IScriptAdapter.java b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/IScriptAdapter.java
index 0e0fe428..77b5764c 100644
--- a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/IScriptAdapter.java
+++ b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/IScriptAdapter.java
@@ -3,13 +3,13 @@ package org.bench4q.master.scriptrecord.httpcapture;
 import java.util.List;
 
 import org.bench4q.master.scriptrecord.httpcapture.generator.ChildrenUrl;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
 import org.bench4q.share.models.agent.scriptrecord.UsePluginModel;
 
 public interface IScriptAdapter {
 
-	public abstract RunScenarioModel getRunScenarioModel();
+	public abstract RunScenarioModelNew getRunScenarioModel();
 
 	public abstract void appendUsePluginsToScenario(
 			List<UsePluginModel> usePluginModels);
diff --git a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/generator/AbstractCodeGenerator.java b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/generator/AbstractCodeGenerator.java
index 58d599c0..e52e8d3a 100644
--- a/src/main/java/org/bench4q/master/scriptrecord/httpcapture/generator/AbstractCodeGenerator.java
+++ b/src/main/java/org/bench4q/master/scriptrecord/httpcapture/generator/AbstractCodeGenerator.java
@@ -30,7 +30,7 @@ import org.bench4q.master.scriptrecord.httpcapture.Param;
 import org.bench4q.master.scriptrecord.httpcapture.ProxyServer;
 import org.bench4q.master.scriptrecord.httpcapture.Utils;
 import org.bench4q.master.scriptrecord.httpcapture.Utils.UserException;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 import org.bench4q.share.models.agent.scriptrecord.BehaviorBaseModel;
 
 public abstract class AbstractCodeGenerator implements IScriptGenerator,
@@ -114,7 +114,7 @@ public abstract class AbstractCodeGenerator implements IScriptGenerator,
 	public boolean doSave(String path, String fileName) {
 		String name = fileName;
 		int dotPos = fileName.indexOf(".");
-		RunScenarioModel runScenarioModel = this.scriptAdapter
+		RunScenarioModelNew runScenarioModel = this.scriptAdapter
 				.getRunScenarioModel();
 		FileWriter fileWriter;
 
@@ -124,7 +124,6 @@ public abstract class AbstractCodeGenerator implements IScriptGenerator,
 		setTestPath(path);
 
 		if (runScenarioModel == null) {
-			runScenarioModel = new RunScenarioModel();
 		}
 
 		try {
diff --git a/src/test/java/org/bench4q/master/test/recordscript/TestCodeGenerator.java b/src/test/java/org/bench4q/master/test/recordscript/TestCodeGenerator.java
index 88dbd41a..ac26e84e 100644
--- a/src/test/java/org/bench4q/master/test/recordscript/TestCodeGenerator.java
+++ b/src/test/java/org/bench4q/master/test/recordscript/TestCodeGenerator.java
@@ -16,12 +16,12 @@ import org.bench4q.master.scriptrecord.httpcapture.generator.Bench4qCodeGenerato
 import org.bench4q.master.scriptrecord.httpcapture.generator.ContentDecoder;
 import org.bench4q.master.scriptrecord.httpcapture.generator.IScriptGenerator;
 import org.bench4q.master.scriptrecord.httpcapture.generator.ResponseParser;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 import org.junit.Test;
 
 public class TestCodeGenerator {
 	private Bench4qTestScriptAdapter scriptAdapter = new Bench4qTestScriptAdapter(
-			new RunScenarioModel());
+			new RunScenarioModelNew());
 	private Bench4qCodeGenerator codeGenerator = new Bench4qCodeGenerator(
 			this.scriptAdapter);
 
diff --git a/src/test/java/org/bench4q/master/test/recordscript/TestParentRequest.java b/src/test/java/org/bench4q/master/test/recordscript/TestParentRequest.java
index e5e7fb80..8650341f 100644
--- a/src/test/java/org/bench4q/master/test/recordscript/TestParentRequest.java
+++ b/src/test/java/org/bench4q/master/test/recordscript/TestParentRequest.java
@@ -9,7 +9,7 @@ import org.bench4q.master.scriptrecord.httpcapture.Bench4qTestScriptAdapter;
 import org.bench4q.master.scriptrecord.httpcapture.IScriptAdapter;
 import org.bench4q.master.scriptrecord.httpcapture.generator.ChildrenUrl;
 import org.bench4q.share.models.agent.ParameterModel;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 import org.bench4q.share.models.agent.scriptrecord.BatchBehavior;
 import org.bench4q.share.models.agent.scriptrecord.UserBehaviorModel;
 import org.junit.Test;
@@ -31,7 +31,7 @@ public class TestParentRequest {
 	}
 
 	public TestParentRequest() {
-		this.setAdapater(new Bench4qTestScriptAdapter(new RunScenarioModel()));
+		this.setAdapater(new Bench4qTestScriptAdapter(new RunScenarioModelNew()));
 	}
 
 	@Test
@@ -58,7 +58,7 @@ public class TestParentRequest {
 				createUserBehavior(independentUrl));
 		this.getAdapater().insertUserBehaviorsToScenario(
 				createUserBehavior(independentUrl2));
-		RunScenarioModel runScenarioModel = this.getAdapater()
+		RunScenarioModelNew runScenarioModel = this.getAdapater()
 				.getRunScenarioModel();
 		assertNotNull(runScenarioModel);
 		assertNotNull(runScenarioModel.getBatches());
@@ -93,7 +93,7 @@ public class TestParentRequest {
 				.add(createChildrenUrl(childUrl, 0));
 		this.getAdapater().insertUserBehaviorsToScenario(
 				createUserBehavior(childUrl));
-		RunScenarioModel runScenarioModel = this.getAdapater()
+		RunScenarioModelNew runScenarioModel = this.getAdapater()
 				.getRunScenarioModel();
 		assertNotNull(runScenarioModel);
 		assertNotNull(runScenarioModel.getBatches());
diff --git a/src/test/java/org/bench4q/master/test/recordscript/TestRecordBase.java b/src/test/java/org/bench4q/master/test/recordscript/TestRecordBase.java
index 93d8e9d4..ef63b94e 100644
--- a/src/test/java/org/bench4q/master/test/recordscript/TestRecordBase.java
+++ b/src/test/java/org/bench4q/master/test/recordscript/TestRecordBase.java
@@ -7,7 +7,7 @@ import org.bench4q.master.scriptrecord.httpcapture.Bench4qTestScriptAdapter;
 import org.bench4q.master.scriptrecord.httpcapture.IScriptAdapter;
 import org.bench4q.master.scriptrecord.httpcapture.generator.Bench4qCodeGenerator;
 import org.bench4q.share.models.agent.ParameterModel;
-import org.bench4q.share.models.agent.RunScenarioModel;
+import org.bench4q.share.models.agent.RunScenarioModelNew;
 import org.bench4q.share.models.agent.scriptrecord.UserBehaviorModel;
 
 public abstract class TestRecordBase {
@@ -34,7 +34,7 @@ public abstract class TestRecordBase {
 	}
 
 	protected void init() {
-		this.setAdpater(new Bench4qTestScriptAdapter(new RunScenarioModel()));
+		this.setAdpater(new Bench4qTestScriptAdapter(new RunScenarioModelNew()));
 		this.setCodeGenerator(new Bench4qCodeGenerator(this.getAdpater()));
 	}