diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Companies.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Companies.java
new file mode 100644
index 0000000..148543f
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Companies.java
@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class Companies {
+	private Map<String, Company> value = new HashMap<>();
+	public Map<String, Company> getValue() {
+		return new HashMap<>(value);
+	}
+	public Company getCompany(String cid) {
+		return this.value.get(cid);
+	}
+	public void addCampany(String address, String cid) {
+		this.value.put(cid,new Company(address));
+	}
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Company.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Company.java
new file mode 100644
index 0000000..fd0eaba
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Company.java
@@ -0,0 +1,19 @@
+import java.util.*;
+
+public class Company {
+	private String address;
+	public Map<String, Object> getValue() {
+		Map temp_nil6 = new HashMap<>();
+		temp_nil6.put("address",this.getAddress());
+		return temp_nil6;
+	}
+	public String getAddress() {
+		return this.address;
+	}
+	public void setAddress(String cid, String add) {
+		this.address = add;
+	}
+	public Company(String address) {
+		this.address = address;
+	}
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Customer.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Customer.java
new file mode 100644
index 0000000..4c19192
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Customer.java
@@ -0,0 +1,28 @@
+import java.util.*;
+
+public class Customer {
+	private String organization;
+	private Company company;
+	private Companies companies;
+	public Map<String, Object> getValue() {
+		Map temp_nil7 = new HashMap<>();
+		temp_nil7.put("address",this.getAddress());
+		temp_nil7.put("organization",this.getOrganization());
+		return temp_nil7;
+	}
+	public String getOrganization() {
+		return this.organization;
+	}
+	public String getAddress() {
+		return this.company.getAddress();
+	}
+	public void setOrganization(String uid, String cid) {
+		this.organization = cid;
+		this.company = this.companies.getCompany(this.organization);
+	}
+	public Customer(String organization, Companies companies) {
+		this.organization = organization;
+		this.companies = companies;
+		this.company = this.companies.getCompany(this.organization);
+	}
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/CustomerManagement.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/CustomerManagement.java
new file mode 100644
index 0000000..a919176
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/CustomerManagement.java
@@ -0,0 +1,43 @@
+import java.util.*;
+
+public class CustomerManagement {
+	private Companies companies;
+	private Customers customers;
+	public CustomerManagement() {
+		companies = new Companies();
+		customers = new Customers(companies);
+	}
+	public Map<String, Company> getCompanies() {
+		return this.companies.getValue();
+	}
+	public void addCampany(String address, String cid) {
+		this.companies.addCampany(address, cid);
+	}
+	public String getAddress(String cid) {
+		return this.companies.getCompany(cid).getAddress();
+	}
+	public void setAddress(String cid, String add) {
+		this.companies.getCompany(cid).setAddress(cid, add);
+	}
+	public String getOrganization(String uid) {
+		return this.customers.getCustomer(uid).getOrganization();
+	}
+	public void setOrganization(String uid, String cid) {
+		this.customers.getCustomer(uid).setOrganization(uid, cid);
+	}
+	public String getAddress(String uid) {
+		return this.customers.getCustomer(uid).getAddress();
+	}
+	public Map<String, Object> getCompany(String cid) {
+		return this.companies.getCompany(cid).getValue();
+	}
+	public Map<String, Customer> getCustomers() {
+		return this.customers.getValue();
+	}
+	public void addCustomer(String org, String uid) {
+		this.customers.addCustomer(org, uid);
+	}
+	public Map<String, Object> getCustomer(String uid) {
+		return this.customers.getCustomer(uid).getValue();
+	}
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Customers.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Customers.java
new file mode 100644
index 0000000..04725d7
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/Customers.java
@@ -0,0 +1,18 @@
+import java.util.*;
+
+public class Customers {
+	private Map<String, Customer> value = new HashMap<>();
+	private Companies companies;
+	public Map<String, Customer> getValue() {
+		return new HashMap<>(value);
+	}
+	public Customer getCustomer(String uid) {
+		return this.value.get(uid);
+	}
+	public void addCustomer(String org, String uid) {
+		this.value.put(uid,new Customer(org, companies));
+	}
+	public Customers(Companies companies) {
+		this.companies = companies;
+	}
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Companies.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Companies.java
deleted file mode 100644
index 148543f..0000000
--- a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Companies.java
+++ /dev/null
@@ -1,14 +0,0 @@
-import java.util.*;
-
-public class Companies {
-	private Map<String, Company> value = new HashMap<>();
-	public Map<String, Company> getValue() {
-		return new HashMap<>(value);
-	}
-	public Company getCompany(String cid) {
-		return this.value.get(cid);
-	}
-	public void addCampany(String address, String cid) {
-		this.value.put(cid,new Company(address));
-	}
-}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Company.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Company.java
deleted file mode 100644
index fd0eaba..0000000
--- a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Company.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import java.util.*;
-
-public class Company {
-	private String address;
-	public Map<String, Object> getValue() {
-		Map temp_nil6 = new HashMap<>();
-		temp_nil6.put("address",this.getAddress());
-		return temp_nil6;
-	}
-	public String getAddress() {
-		return this.address;
-	}
-	public void setAddress(String cid, String add) {
-		this.address = add;
-	}
-	public Company(String address) {
-		this.address = address;
-	}
-}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Customer.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Customer.java
deleted file mode 100644
index 4c19192..0000000
--- a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Customer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-import java.util.*;
-
-public class Customer {
-	private String organization;
-	private Company company;
-	private Companies companies;
-	public Map<String, Object> getValue() {
-		Map temp_nil7 = new HashMap<>();
-		temp_nil7.put("address",this.getAddress());
-		temp_nil7.put("organization",this.getOrganization());
-		return temp_nil7;
-	}
-	public String getOrganization() {
-		return this.organization;
-	}
-	public String getAddress() {
-		return this.company.getAddress();
-	}
-	public void setOrganization(String uid, String cid) {
-		this.organization = cid;
-		this.company = this.companies.getCompany(this.organization);
-	}
-	public Customer(String organization, Companies companies) {
-		this.organization = organization;
-		this.companies = companies;
-		this.company = this.companies.getCompany(this.organization);
-	}
-}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/CustomerManagement.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/CustomerManagement.java
deleted file mode 100644
index a919176..0000000
--- a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/CustomerManagement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-import java.util.*;
-
-public class CustomerManagement {
-	private Companies companies;
-	private Customers customers;
-	public CustomerManagement() {
-		companies = new Companies();
-		customers = new Customers(companies);
-	}
-	public Map<String, Company> getCompanies() {
-		return this.companies.getValue();
-	}
-	public void addCampany(String address, String cid) {
-		this.companies.addCampany(address, cid);
-	}
-	public String getAddress(String cid) {
-		return this.companies.getCompany(cid).getAddress();
-	}
-	public void setAddress(String cid, String add) {
-		this.companies.getCompany(cid).setAddress(cid, add);
-	}
-	public String getOrganization(String uid) {
-		return this.customers.getCustomer(uid).getOrganization();
-	}
-	public void setOrganization(String uid, String cid) {
-		this.customers.getCustomer(uid).setOrganization(uid, cid);
-	}
-	public String getAddress(String uid) {
-		return this.customers.getCustomer(uid).getAddress();
-	}
-	public Map<String, Object> getCompany(String cid) {
-		return this.companies.getCompany(cid).getValue();
-	}
-	public Map<String, Customer> getCustomers() {
-		return this.customers.getValue();
-	}
-	public void addCustomer(String org, String uid) {
-		this.customers.addCustomer(org, uid);
-	}
-	public Map<String, Object> getCustomer(String uid) {
-		return this.customers.getCustomer(uid).getValue();
-	}
-}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Customers.java b/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Customers.java
deleted file mode 100644
index 04725d7..0000000
--- a/AlgebraicDataflowArchitectureModel/prototypes/Java/CustomerManagement/PULL-first/Customers.java
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.util.*;
-
-public class Customers {
-	private Map<String, Customer> value = new HashMap<>();
-	private Companies companies;
-	public Map<String, Customer> getValue() {
-		return new HashMap<>(value);
-	}
-	public Customer getCustomer(String uid) {
-		return this.value.get(uid);
-	}
-	public void addCustomer(String org, String uid) {
-		this.value.put(uid,new Customer(org, companies));
-	}
-	public Customers(Companies companies) {
-		this.companies = companies;
-	}
-}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java
index 7c4f6aa..82f252a 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java
@@ -56,7 +56,7 @@
 		testGroupChat();
 		testInventoryManagement();
 //		testOnlineBattleGame();			// A feature has not been implemented for Java prototype generation.
-		testOnlineBattleGame2();		// Two methods with the same signature are generated. 
+		testOnlineBattleGame2();		// Two methods with the same signature are generated. PUSH-first implementation still does not work.
 		testPOS();
 		testSimpleTwitter();
 		testVotingSystem();
@@ -272,8 +272,7 @@
 	
 	private void testCustomerManagement() {
 		try {
-			// check PULL-first
-			ArrayList<CompilationUnit> generatedCode = generateCode("models/CustomerManagement.model", PushPullValue.PULL);
+			ArrayList<CompilationUnit> generatedCode = generateCode("models/CustomerManagement.model", null);
 			Map<String, 									// class name
 					Entry<Map<String, String>,  			// field name to type
 						  Map<String, 						// method name to			
@@ -377,109 +376,6 @@
 			
 			checkStructure(generatedCode, exprectedStructure);
 //			generateCheckCode(generatedCode);
-			
-			// check PUSH-first
-			generatedCode = generateCode("models/CustomerManagement.model", PushPullValue.PUSH);
-			exprectedStructure.clear();
-			exprectedStructure.put("Main", Map.entry(Map.ofEntries(Map.entry("companies", "Companies"),
-																   Map.entry("customers", "Customers")),
-													 Map.ofEntries(Map.entry("Main", Map.entry("void", 
-																							   Map.entry(List.of(),
-																							   2))),
-																   Map.entry("getCustomer", Map.entry("Map<String, Object>", 
-																									  Map.entry(List.of("String"),
-																									  1))),
-																   Map.entry("getCompany", Map.entry("Map<String, Object>", 
-																									 Map.entry(List.of("String"),
-																									 1))),
-																   Map.entry("getAddress", Map.entry("String", 
-																									 Map.entry(List.of("String"),
-																									 1))),
-																   Map.entry("getOrganization", Map.entry("String", 
-																										  Map.entry(List.of("String"),
-																										  1))),
-																   Map.entry("setOrganization", Map.entry("void", 
-																										  Map.entry(List.of("String","String"),
-																										  1))),
-//																   Map.entry("getAddress", Map.entry("String", 
-//																									 Map.entry(List.of("String"),
-//																									 1))),
-																   Map.entry("setAddress", Map.entry("void", 
-																									 Map.entry(List.of("String","String"),
-																									 1))),
-																   Map.entry("getCompanies", Map.entry("Map<String, Company>", 
-																									   Map.entry(List.of(),
-																									   1))),
-																   Map.entry("addCampany", Map.entry("void", 
-																									 Map.entry(List.of("String","String"),
-																									 1))),
-																   Map.entry("getCustomers", Map.entry("Map<String, Customer>", 
-																									   Map.entry(List.of(),
-																									   1))),
-																   Map.entry("addCustomer", Map.entry("void", 
-																									  Map.entry(List.of("String","String"),
-																									  1))))));
-			exprectedStructure.put("Customer", Map.entry(Map.ofEntries(Map.entry("company", "Company"),
-																	   Map.entry("companies", "Companies"),
-																	   Map.entry("organization", "String")),
-														 Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
-																									   Map.entry(List.of(),
-																									   1))),
-																	   Map.entry("getAddress", Map.entry("String", 
-																										 Map.entry(List.of(),
-																										 1))),
-																	   Map.entry("getOrganization", Map.entry("String", 
-																											  Map.entry(List.of(),
-																											  1))),
-																	   Map.entry("updateAddressFromOrganization", Map.entry("void", 
-																															Map.entry(List.of("String","String","String"),
-																															2))),
-																	   Map.entry("setOrganization", Map.entry("void", 
-																											  Map.entry(List.of("String","String"),
-																											  4))),
-																	   Map.entry("Customer", Map.entry("void", 
-																									   Map.entry(List.of("Companies","String"),
-																									   3))))));
-			exprectedStructure.put("Company", Map.entry(Map.ofEntries(),
-														Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
-																									  Map.entry(List.of(),
-																									  1))),
-																	  Map.entry("getAddress", Map.entry("String", 
-																										Map.entry(List.of(),
-																										1))),
-																	  Map.entry("setAddress", Map.entry("void", 
-																										Map.entry(List.of("String","String"),
-																										1))),
-																	  Map.entry("Company", Map.entry("void", 
-																									 Map.entry(List.of("String"),
-																									 1))))));
-			exprectedStructure.put("Companies", Map.entry(Map.ofEntries(),
-														  Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Company>", 
-																										Map.entry(List.of(),
-																										1))),
-																		Map.entry("getCompany", Map.entry("Company", 
-																										  Map.entry(List.of("String"),
-																										  1))),
-																		Map.entry("addCampany", Map.entry("void", 
-																										  Map.entry(List.of("String","String"),
-																										  1))))));
-			exprectedStructure.put("Customers", Map.entry(Map.ofEntries(Map.entry("value", "Map<String, Customer>"),
-																		Map.entry("companies", "Companies")),
-														  Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Customer>", 
-																										Map.entry(List.of(),
-																										1))),
-																		Map.entry("getCustomer", Map.entry("Customer", 
-																										   Map.entry(List.of("String"),
-																										   1))),
-																		Map.entry("addCustomer", Map.entry("void", 
-																										   Map.entry(List.of("String","String"),
-																										   1))),
-																		Map.entry("Customers", Map.entry("void", 
-																										 Map.entry(List.of("Companies"),
-																										 1))))));
-			
-			checkStructure(generatedCode, exprectedStructure);
-//			generateCheckCode(generatedCode);
 		} catch (FileNotFoundException 
 				| ExpectedChannel | ExpectedChannelName | ExpectedLeftCurlyBracket | ExpectedInOrOutOrRefOrSubKeyword
 				| ExpectedStateTransition | ExpectedEquals | ExpectedRHSExpression | WrongLHSExpression
@@ -1210,156 +1106,156 @@
 			checkStructure(generatedCode, exprectedStructure);
 //			generateCheckCode(generatedCode);
 			
-			// check PUSH-first
-			generatedCode = generateCode("models/OnlineBattleGame2.model", PushPullValue.PUSH);
-			exprectedStructure.clear();
-			exprectedStructure.put("Main", Map.entry(Map.ofEntries(Map.entry("accounts", "Accounts"),
-																   Map.entry("rooms", "Rooms")),
-													 Map.ofEntries(Map.entry("Main", Map.entry("void", 
-																							   Map.entry(List.of(),
-																							   2))),
-																   Map.entry("getMembers", Map.entry("List<Member>", 
-																									 Map.entry(List.of("String"),
-																									 1))),
-																   Map.entry("addRoomMember", Map.entry("void", 
-																										Map.entry(List.of("String","String"),
-																										1))),
-																   Map.entry("getRoom", Map.entry("Map<String, Object>", 
-																								  Map.entry(List.of("String"),
-																								  1))),
-																   Map.entry("getBattle", Map.entry("boolean", 
-																									Map.entry(List.of("String"),
-																									1))),
-																   Map.entry("battle", Map.entry("void", 
-																								 Map.entry(List.of("String","boolean"),
-																								 1))),
-																   Map.entry("getName", Map.entry("String", 
-																								  Map.entry(List.of("String","int"),
-																								  1))),
-																   Map.entry("getId", Map.entry("String", 
-																								Map.entry(List.of("String","int"),
-																								1))),
-																   Map.entry("getAccount", Map.entry("Map<String, Object>", 
-																									 Map.entry(List.of("String"),
-																									 1))),
-																   Map.entry("getPoint", Map.entry("int", 
-																								   Map.entry(List.of("String"),
-																								   1))),
-																   Map.entry("getAccounts", Map.entry("Map<String, Account>", 
-																									  Map.entry(List.of(),
-																									  1))),
-																   Map.entry("signUp", Map.entry("void", 
-																								 Map.entry(List.of("String","String"),
-																								 1))),
-																   Map.entry("getRooms", Map.entry("Map<String, Room>", 
-																								   Map.entry(List.of(),
-																								   1))),
-																   Map.entry("createRoom", Map.entry("void", 
-																									 Map.entry(List.of("String"),
-																									 1))),
-																   Map.entry("getMember", Map.entry("Map<String, Object>", 
-																									Map.entry(List.of("String","int"),
-																									1))),
-//																   Map.entry("getName", Map.entry("String", 
+//			// check PUSH-first
+//			generatedCode = generateCode("models/OnlineBattleGame2.model", PushPullValue.PUSH);
+//			exprectedStructure.clear();
+//			exprectedStructure.put("Main", Map.entry(Map.ofEntries(Map.entry("accounts", "Accounts"),
+//																   Map.entry("rooms", "Rooms")),
+//													 Map.ofEntries(Map.entry("Main", Map.entry("void", 
+//																							   Map.entry(List.of(),
+//																							   2))),
+//																   Map.entry("getMembers", Map.entry("List<Member>", 
+//																									 Map.entry(List.of("String"),
+//																									 1))),
+//																   Map.entry("addRoomMember", Map.entry("void", 
+//																										Map.entry(List.of("String","String"),
+//																										1))),
+//																   Map.entry("getRoom", Map.entry("Map<String, Object>", 
 //																								  Map.entry(List.of("String"),
 //																								  1))),
-																   Map.entry("changeName", Map.entry("void", 
-																									 Map.entry(List.of("String","String"),
-																									 1))))));
-			exprectedStructure.put("Members", Map.entry(Map.ofEntries(),
-														Map.ofEntries(Map.entry("getValue", Map.entry("List<Member>", 
-																									  Map.entry(List.of(),
-																									  1))),
-																	  Map.entry("getMember", Map.entry("Member", 
-																									   Map.entry(List.of("int"),
-																									   1))),
-																	  Map.entry("addRoomMember", Map.entry("void", 
-																										   Map.entry(List.of("String","String"),
-																										   1))))));
-			exprectedStructure.put("Room", Map.entry(Map.ofEntries(Map.entry("members", "Members"),
-																   Map.entry("battle", "boolean"),
-																   Map.entry("account", "Account"),
-																   Map.entry("accounts", "Accounts")),
-													 Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
-																								   Map.entry(List.of(),
-																								   1))),
-																   Map.entry("getMembers", Map.entry("Members", 
-																									 Map.entry(List.of(),
-																									 1))),
-																   Map.entry("getBattle", Map.entry("boolean", 
-																									Map.entry(List.of(),
-																									1))),
-																   Map.entry("battle", Map.entry("void", 
-																								 Map.entry(List.of("String","boolean"),
-																								 6))),
-																   Map.entry("Room", Map.entry("void", 
-																							   Map.entry(List.of("boolean","Accounts"),
-																							   2))))));
-			exprectedStructure.put("Account", Map.entry(Map.ofEntries(Map.entry("point", "int"),
-																	  Map.entry("name", "String")),
-														Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
-																									  Map.entry(List.of(),
-																									  1))),
-																	  Map.entry("getPoint", Map.entry("int", 
-																									  Map.entry(List.of(),
-																									  1))),
-																	  Map.entry("getName", Map.entry("String", 
-																									 Map.entry(List.of(),
-																									 1))),
-																	  Map.entry("updatePointFromBattle", Map.entry("void", 
-																												   Map.entry(List.of("String","String","int","boolean","String"),
-																												   1))),
-																	  Map.entry("changeName", Map.entry("void", 
-																										Map.entry(List.of("String","String"),
-																										1))),
-																	  Map.entry("Account", Map.entry("void", 
-																									 Map.entry(List.of("int","String"),
-																									 2))))));
-			exprectedStructure.put("Accounts", Map.entry(Map.ofEntries(),
-														 Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Account>", 
-																									   Map.entry(List.of(),
-																									   1))),
-																	   Map.entry("getAccount", Map.entry("Account", 
-																										 Map.entry(List.of("String"),
-																										 1))),
-																	   Map.entry("signUp", Map.entry("void", 
-																									 Map.entry(List.of("String","String"),
-																									 1))))));
-			exprectedStructure.put("Rooms", Map.entry(Map.ofEntries(Map.entry("value", "Map<String, Room>"),
-																	Map.entry("accounts", "Accounts")),
-													  Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Room>", 
-																									Map.entry(List.of(),
-																									1))),
-																	Map.entry("getRoom", Map.entry("Room", 
-																								   Map.entry(List.of("String"),
-																								   1))),
-																	Map.entry("createRoom", Map.entry("void", 
-																									  Map.entry(List.of("String"),
-																									  1))),
-																	Map.entry("Rooms", Map.entry("void", 
-																								 Map.entry(List.of("Accounts"),
-																								 1))))));
-			exprectedStructure.put("Member", Map.entry(Map.ofEntries(Map.entry("account", "Account"),
-																	 Map.entry("accounts", "Accounts"),
-																	 Map.entry("id", "String")),
-													   Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
-																									 Map.entry(List.of(),
-																									 1))),
-																	 Map.entry("getName", Map.entry("String", 
-																									Map.entry(List.of(),
-																									1))),
-																	 Map.entry("getId", Map.entry("String", 
-																								  Map.entry(List.of(),
-																								  1))),
-																	 Map.entry("updateNameFromId", Map.entry("void", 
-																											 Map.entry(List.of("String","int","String","int","String"),
-																											 2))),
-																	 Map.entry("Member", Map.entry("void", 
-																								   Map.entry(List.of("Accounts","String"),
-																								   2))))));
-			
-			checkStructure(generatedCode, exprectedStructure);			
-//			generateCheckCode(generatedCode);
+//																   Map.entry("getBattle", Map.entry("boolean", 
+//																									Map.entry(List.of("String"),
+//																									1))),
+//																   Map.entry("battle", Map.entry("void", 
+//																								 Map.entry(List.of("String","boolean"),
+//																								 1))),
+//																   Map.entry("getName", Map.entry("String", 
+//																								  Map.entry(List.of("String","int"),
+//																								  1))),
+//																   Map.entry("getId", Map.entry("String", 
+//																								Map.entry(List.of("String","int"),
+//																								1))),
+//																   Map.entry("getAccount", Map.entry("Map<String, Object>", 
+//																									 Map.entry(List.of("String"),
+//																									 1))),
+//																   Map.entry("getPoint", Map.entry("int", 
+//																								   Map.entry(List.of("String"),
+//																								   1))),
+//																   Map.entry("getAccounts", Map.entry("Map<String, Account>", 
+//																									  Map.entry(List.of(),
+//																									  1))),
+//																   Map.entry("signUp", Map.entry("void", 
+//																								 Map.entry(List.of("String","String"),
+//																								 1))),
+//																   Map.entry("getRooms", Map.entry("Map<String, Room>", 
+//																								   Map.entry(List.of(),
+//																								   1))),
+//																   Map.entry("createRoom", Map.entry("void", 
+//																									 Map.entry(List.of("String"),
+//																									 1))),
+//																   Map.entry("getMember", Map.entry("Map<String, Object>", 
+//																									Map.entry(List.of("String","int"),
+//																									1))),
+////																   Map.entry("getName", Map.entry("String", 
+////																								  Map.entry(List.of("String"),
+////																								  1))),
+//																   Map.entry("changeName", Map.entry("void", 
+//																									 Map.entry(List.of("String","String"),
+//																									 1))))));
+//			exprectedStructure.put("Members", Map.entry(Map.ofEntries(),
+//														Map.ofEntries(Map.entry("getValue", Map.entry("List<Member>", 
+//																									  Map.entry(List.of(),
+//																									  1))),
+//																	  Map.entry("getMember", Map.entry("Member", 
+//																									   Map.entry(List.of("int"),
+//																									   1))),
+//																	  Map.entry("addRoomMember", Map.entry("void", 
+//																										   Map.entry(List.of("String","String"),
+//																										   1))))));
+//			exprectedStructure.put("Room", Map.entry(Map.ofEntries(Map.entry("members", "Members"),
+//																   Map.entry("battle", "boolean"),
+//																   Map.entry("account", "Account"),
+//																   Map.entry("accounts", "Accounts")),
+//													 Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
+//																								   Map.entry(List.of(),
+//																								   1))),
+//																   Map.entry("getMembers", Map.entry("Members", 
+//																									 Map.entry(List.of(),
+//																									 1))),
+//																   Map.entry("getBattle", Map.entry("boolean", 
+//																									Map.entry(List.of(),
+//																									1))),
+//																   Map.entry("battle", Map.entry("void", 
+//																								 Map.entry(List.of("String","boolean"),
+//																								 6))),
+//																   Map.entry("Room", Map.entry("void", 
+//																							   Map.entry(List.of("boolean","Accounts"),
+//																							   2))))));
+//			exprectedStructure.put("Account", Map.entry(Map.ofEntries(Map.entry("point", "int"),
+//																	  Map.entry("name", "String")),
+//														Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
+//																									  Map.entry(List.of(),
+//																									  1))),
+//																	  Map.entry("getPoint", Map.entry("int", 
+//																									  Map.entry(List.of(),
+//																									  1))),
+//																	  Map.entry("getName", Map.entry("String", 
+//																									 Map.entry(List.of(),
+//																									 1))),
+//																	  Map.entry("updatePointFromBattle", Map.entry("void", 
+//																												   Map.entry(List.of("String","String","int","boolean","String"),
+//																												   1))),
+//																	  Map.entry("changeName", Map.entry("void", 
+//																										Map.entry(List.of("String","String"),
+//																										1))),
+//																	  Map.entry("Account", Map.entry("void", 
+//																									 Map.entry(List.of("int","String"),
+//																									 2))))));
+//			exprectedStructure.put("Accounts", Map.entry(Map.ofEntries(),
+//														 Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Account>", 
+//																									   Map.entry(List.of(),
+//																									   1))),
+//																	   Map.entry("getAccount", Map.entry("Account", 
+//																										 Map.entry(List.of("String"),
+//																										 1))),
+//																	   Map.entry("signUp", Map.entry("void", 
+//																									 Map.entry(List.of("String","String"),
+//																									 1))))));
+//			exprectedStructure.put("Rooms", Map.entry(Map.ofEntries(Map.entry("value", "Map<String, Room>"),
+//																	Map.entry("accounts", "Accounts")),
+//													  Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Room>", 
+//																									Map.entry(List.of(),
+//																									1))),
+//																	Map.entry("getRoom", Map.entry("Room", 
+//																								   Map.entry(List.of("String"),
+//																								   1))),
+//																	Map.entry("createRoom", Map.entry("void", 
+//																									  Map.entry(List.of("String"),
+//																									  1))),
+//																	Map.entry("Rooms", Map.entry("void", 
+//																								 Map.entry(List.of("Accounts"),
+//																								 1))))));
+//			exprectedStructure.put("Member", Map.entry(Map.ofEntries(Map.entry("account", "Account"),
+//																	 Map.entry("accounts", "Accounts"),
+//																	 Map.entry("id", "String")),
+//													   Map.ofEntries(Map.entry("getValue", Map.entry("Map<String, Object>", 
+//																									 Map.entry(List.of(),
+//																									 1))),
+//																	 Map.entry("getName", Map.entry("String", 
+//																									Map.entry(List.of(),
+//																									1))),
+//																	 Map.entry("getId", Map.entry("String", 
+//																								  Map.entry(List.of(),
+//																								  1))),
+//																	 Map.entry("updateNameFromId", Map.entry("void", 
+//																											 Map.entry(List.of("String","int","String","int","String"),
+//																											 2))),
+//																	 Map.entry("Member", Map.entry("void", 
+//																								   Map.entry(List.of("Accounts","String"),
+//																								   2))))));
+//			
+//			checkStructure(generatedCode, exprectedStructure);			
+////			generateCheckCode(generatedCode);
 		} catch (FileNotFoundException 
 				| ExpectedChannel | ExpectedChannelName | ExpectedLeftCurlyBracket | ExpectedInOrOutOrRefOrSubKeyword
 				| ExpectedStateTransition | ExpectedEquals | ExpectedRHSExpression | WrongLHSExpression