diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
index 4063185..601274f 100644
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
@@ -20,153 +20,156 @@
 import ns ${{BASIC_PROJECT_NAME}}.model.entities.Warehouse
 import ns ${{BASIC_PROJECT_NAME}}.model.entities.WarehouseClass
 
-package ${{MODEL_PROJECT_PACKAGE_NAME}} title "DataInterchange" {
+package ${{MODEL_PROJECT_PACKAGE_NAME}}  {
 
-    interchange Currencies describedBy "european central bank currency exchange rates based on euro" persist elementSize 50 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/eurofxref-daily.xml"
-    //XML "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml"
-
-	path {
-		entity CurrencyStream createOn "/Envelope/Cube" latestImport latest expression {
-			assign importDate with NowDate as Date
-		}
-		entity CurrencyDay createOn "/Envelope/Cube/Cube" format {
-			for ratingDate coding "yyyy-MM-dd"
-		}
-		mapping {
-			map ratingDate to "time"
-		}
-		entity Currency createOn "/Envelope/Cube/Cube/Cube" expression {
-			copy currencyDate from CurrencyDay property ratingDate
-		}
-		lookup {
-			for currencyName on CurrencyNames createOn "/Envelope/Cube/Cube/Cube" with isoCode cacheSize 300 mapTo "currency"
-			markerPath {
-				markerEntity CurrencyNamesStream markedBy latest
+	group DataInterchange {
+	
+	    interchange Currencies describedBy "european central bank currency exchange rates based on euro" persist elementSize 50 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/eurofxref-daily.xml"
+	    //XML "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml"
+	
+		path {
+			entity CurrencyStream createOn "/Envelope/Cube" latestImport latest expression {
+				assign importDate with NowDate as Date
+			}
+			entity CurrencyDay createOn "/Envelope/Cube/Cube" format {
+				for ratingDate coding "yyyy-MM-dd"
+			}
+			mapping {
+				map ratingDate to "time"
+			}
+			entity Currency createOn "/Envelope/Cube/Cube/Cube" expression {
+				copy currencyDate from CurrencyDay property ratingDate
+			}
+			lookup {
+				for currencyName on CurrencyNames createOn "/Envelope/Cube/Cube/Cube" with isoCode cacheSize 300 mapTo "currency"
+				markerPath {
+					markerEntity CurrencyNamesStream markedBy latest
+				}
+			}
+			mapping {
+				map conversionRatio to "rate"
 			}
 		}
-		mapping {
-			map conversionRatio to "rate"
+		
+	    interchange CurrencyNames persist file
+	    CSV "file://${{PROJECT_LOC}}/models/smooksresources/ISOCurrencyCodes081507.csv" delimiter ";" skipLines 1
+		path {
+			entity CurrencyNamesStream latestImport latest expression {
+				assign importDate with NowDate as Date
+			}
+			entity CurrencyNames
 		}
-	}
+		
+	    interchange EDIOrders describedBy "edi orders" persist elementSize 50 file
+	    EDI "file://${{PROJECT_LOC}}/models/smooksresources/orders.edi" locale "en-US" mappingModel "file://${{PROJECT_LOC}}/models/smooksmappings/edi-order-mapping.xml" validate
+	    path {
+			entity EDIOrders createOn "Order" latestImport latest expression {
+				assign importDate with NowDate as Date
+			}
+			entity EDIOrderHeader createOn "/Order/header" format {
+				for hdrDate coding "EEE MMM dd HH:mm:ss zzz yyyy"
+			}
+			mapping {
+				map orderId to "order-id"
+				map statusCode to "status-code"
+				map netAmount to "net-amount"
+				map totalAmount to "total-amount"
+				map taxAmount to "tax"
+				map hdrDate to "date"
+			}
+			entity EDIOrderCustomer createOn "/Order/customer-details" mapping {
+				map country to "state"
+				map firstName to "name/firstName"
+				map lastName to "name/lastName"
+				map userName to "userName"
+			}
+			entity EDIOrderItem createOn "/Order/order-item" mapping {
+				map position to "position"
+				map quantity to "quantity"
+				map sku to "product-id"
+				map ^title to "title"
+				map price to "price"
+			}
+		}
 	
-    interchange CurrencyNames persist file
-    CSV "file://${{PROJECT_LOC}}/models/smooksresources/ISOCurrencyCodes081507.csv" delimiter ";" skipLines 1
-	path {
-		entity CurrencyNamesStream latestImport latest expression {
-			assign importDate with NowDate as Date
+	    interchange Stores merge vectorName "stores" elementSize 83 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/stores.xml" locale "de_DE"
+		path {
+			entity Region
+			entity Store format {
+				for firstOpenedDate coding "dd.MM.yyyy"
+				for lastRemodelDate coding "dd.MM.yyyy"
+				for frozenSqft coding "####,#####################"
+				for meatSqft coding "####,#####################"
+			}
+			entity Warehouse
 		}
-		entity CurrencyNames
-	}
-	
-    interchange EDIOrders describedBy "edi orders" persist elementSize 50 file
-    EDI "file://${{PROJECT_LOC}}/models/smooksresources/orders.edi" locale "en-US" mappingModel "file://${{PROJECT_LOC}}/models/smooksmappings/edi-order-mapping.xml" validate
-    path {
-		entity EDIOrders createOn "Order" latestImport latest expression {
-			assign importDate with NowDate as Date
+		
+	    interchange Warehouses merge elementSize 80 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/warehouses.xml"
+	    path {
+			entity WarehouseClass
+			entity Warehouse
 		}
-		entity EDIOrderHeader createOn "/Order/header" format {
-			for hdrDate coding "EEE MMM dd HH:mm:ss zzz yyyy"
+		
+	    interchange Products merge elementSize 80 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/products.xml"locale "de_DE" 
+		path {
+			entity ProductClass
+			entity Product format {
+				for srp coding "####,#####################"
+				for grossWeight coding "####,#####################"
+				for netWeight coding "####,#####################"
+				for shelfWidth coding "####,#####################"
+				for shelfHeight coding "####,#####################"
+				for shelfDepth coding "####,#####################"
+			}
 		}
-		mapping {
-			map orderId to "order-id"
-			map statusCode to "status-code"
-			map netAmount to "net-amount"
-			map totalAmount to "total-amount"
-			map taxAmount to "tax"
-			map hdrDate to "date"
+		
+	    interchange EmployeesPosition merge elementSize 80 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/employeesposition.xml" locale "de_DE" 
+	    path {
+			entity Position
+			entity Employee format {
+				for birthDate coding "dd.MM.yyyy"
+				for hireDate coding "dd.MM.yyyy"
+				for endDate coding "dd.MM.yyyy"
+			}
 		}
-		entity EDIOrderCustomer createOn "/Order/customer-details" mapping {
-			map country to "state"
-			map firstName to "name/firstName"
-			map lastName to "name/lastName"
-			map userName to "userName"
+		
+	    interchange EmployeesDepartment merge elementSize 80 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/employeesdepartment.xml"
+	    path {
+			entity Department
 		}
-		entity EDIOrderItem createOn "/Order/order-item" mapping {
-			map position to "position"
-			map quantity to "quantity"
-			map sku to "product-id"
-			map ^title to "title"
-			map price to "price"
+		
+	    interchange Customer merge elementSize 80 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/customer.xml"
+	    path {
+			entity Customer format {
+				for birthdate coding "dd.MM.yyyy"
+				for dateAccntOpened coding "yyyy-MM-dd"
+			}
 		}
-	}
-
-    interchange Stores merge vectorName "stores" elementSize 83 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/stores.xml" locale "de_DE"
-	path {
-		entity Region
-		entity Store format {
-			for firstOpenedDate coding "dd.MM.yyyy"
-			for lastRemodelDate coding "dd.MM.yyyy"
-			for frozenSqft coding "####,#####################"
-			for meatSqft coding "####,#####################"
+		
+	    interchange Promotion merge elementSize 80 file
+	    XML "file://${{PROJECT_LOC}}/models/smooksresources/promotion.xml" locale "de_DE" 
+	    path {
+			entity Promotion format {
+				for startDate coding "dd.MM.yyyy"
+				for endDate coding "dd.MM.yyyy"
+				for cost coding "####,#####################"
+			}
 		}
-		entity Warehouse
-	}
-	
-    interchange Warehouses merge elementSize 80 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/warehouses.xml"
-    path {
-		entity WarehouseClass
-		entity Warehouse
-	}
-	
-    interchange Products merge elementSize 80 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/products.xml"locale "de_DE" 
-	path {
-		entity ProductClass
-		entity Product format {
-			for srp coding "####,#####################"
-			for grossWeight coding "####,#####################"
-			for netWeight coding "####,#####################"
-			for shelfWidth coding "####,#####################"
-			for shelfHeight coding "####,#####################"
-			for shelfDepth coding "####,#####################"
-		}
-	}
-	
-    interchange EmployeesPosition merge elementSize 80 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/employeesposition.xml" locale "de_DE" 
-    path {
-		entity Position
-		entity Employee format {
-			for birthDate coding "dd.MM.yyyy"
-			for hireDate coding "dd.MM.yyyy"
-			for endDate coding "dd.MM.yyyy"
-		}
-	}
-	
-    interchange EmployeesDepartment merge elementSize 80 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/employeesdepartment.xml"
-    path {
-		entity Department
-	}
-	
-    interchange Customer merge elementSize 80 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/customer.xml"
-    path {
-		entity Customer format {
-			for birthdate coding "dd.MM.yyyy"
-			for dateAccntOpened coding "yyyy-MM-dd"
-		}
-	}
-	
-    interchange Promotion merge elementSize 80 file
-    XML "file://${{PROJECT_LOC}}/models/smooksresources/promotion.xml" locale "de_DE" 
-    path {
-		entity Promotion format {
-			for startDate coding "dd.MM.yyyy"
-			for endDate coding "dd.MM.yyyy"
-			for cost coding "####,#####################"
-		}
-	}
-	
-	interchange Suppliers merge elementSize 50 file 
-	XML "file://${{PROJECT_LOC}}/models/smooksresources/suppliers.xml"
-	path {
-		entity Supplier format {
-			for firstContract coding "yyyy-MM-dd"
-			for lastOrder coding "yyyy-MM-dd"
+		
+		interchange Suppliers merge elementSize 50 file 
+		XML "file://${{PROJECT_LOC}}/models/smooksresources/suppliers.xml"
+		path {
+			entity Supplier format {
+				for firstContract coding "yyyy-MM-dd"
+				for lastOrder coding "yyyy-MM-dd"
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE
index 5e493ef..ffe6919 100644
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.perspective/src/BUSINESSBUNDLECLASSNAME.perspective.TEMPLATE
@@ -114,7 +114,7 @@
 			orientation vertical {
 				sashContainer Left orientation horizontal {
 					partStack Data spaceVolume "70" {
-						part ProdTable spaceVolume "1" view	table Products
+						part ProdTable spaceVolume "1" view	readOnlyTable Products
 						part ProdReport spaceVolume "1" view report Products
 						part ProdGrid spaceVolume "1" view editableTable Product
 					}
@@ -141,7 +141,7 @@
 				report EmployeeSalaryViaApi
 			}
 			part Part3 view
-			table Employees
+			readOnlyTable Employees
 		}
 	}
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE
index a83619f..e768cdd 100644
--- a/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui.model.foodmart/wizardtemplates/MODEL/FOODMART/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE
@@ -20,7 +20,7 @@
 
 package ${{MODEL_PROJECT_PACKAGE_NAME}} {
 
-	table Products describedBy "Products" as readOnly filtering using
+	table Products describedBy "Products" as readOnly using
 	datamart Products {
 		axis rows notifyOnSelect {
 			property productSubcategory
@@ -45,19 +45,19 @@
 		editable prop grossWeight style progressbarStyle max 50
 	}
 
-	table Employees describedBy "All Employees" as readOnly filtering using
+	table Employees describedBy "All Employees" as readOnly  using
 	datamart Employees {
 		axis rows
 		axis columns
 	}
 
-	table Employees describedBy "All Employees" as editable filtering using
+	table Employees describedBy "All Employees" as editable  using
 	dto EmployeeDto {
 		prop firstName style textStyle
 		prop lastName style textStyle
 	}
 
-	table EmployeeSalary describedBy "Employee salary assignment" as readOnly filtering using
+	table EmployeeSalary describedBy "Employee salary assignment" as readOnly  using
 	datamart EmployeeSalary {
 		axis columns details {
 			value
@@ -203,7 +203,7 @@
 		}
 	}
 
-	table Supplier describedBy "All Supplier" as readOnly filtering using
+	table Supplier describedBy "All Supplier" as readOnly  using
 	datamart SupplierData
 
 	table TaskMenu as readOnly embedded toolbar HandleTask using
diff --git a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java
index 67d07b5..4c2b1c0 100644
--- a/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java
+++ b/org.eclipse.osbp.wizard.ui/src/org/eclipse/osbp/wizard/ui/model/ModelProjectCreator.java
@@ -156,6 +156,7 @@
 				+ "org.eclipse.osbp.datainterchange.api;bundle-version=\"0.9.0\"," + "org.eclipse.osbp.dsl.common.xtext;bundle-version=\"0.9.1\","
 				+ "org.eclipse.osbp.dsl.datatype.lib;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.dsl.dto.lib;bundle-version=\"0.9.1\","
 				+ "org.eclipse.osbp.dsl.entity.xtext;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.ecview.core.common.editparts.emf;bundle-version=\"0.9.1\","
+				+ "org.eclipse.osbp.ecview.core.common;bundle-version=\"0.9.0\""
 				+ "org.eclipse.osbp.ecview.core.common.model;bundle-version=\"0.9.1\"," + "org.eclipse.osbp.ecview.core.common;bundle-version=\"0.9.1\","
 				+ "org.eclipse.osbp.ecview.core.extension.model;bundle-version=\"0.8.1\"," + "org.eclipse.osbp.ecview.dsl.lib;bundle-version=\"0.9.1\","
 				+ "org.eclipse.osbp.ecview.dsl;bundle-version=\"0.9.1\";resolution:=optional," + "org.eclipse.osbp.ecview.extension.api;bundle-version=\"0.1.0\","
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml b/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml
index ebe9bba..c638914 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/APPLICATION/__basic__/PROJECT/plugin.xml
@@ -43,6 +43,10 @@
             value="${{VAACLIPSE_THEME}}">
         </property>
         <property
+        	name="vaadin.pushmode"
+        	value="AUTOMATIC">
+        </property>
+        <property
               name="startupForegroundColor"
               value="000000">
         </property>
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE
index f3191d1..a2d9b77 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE
@@ -21,8 +21,8 @@
     }
     
     toolbar Report describedBy "Toolbar for reports" items {
-		item printDownload command printDownload icon "print"
-		item print command print icon "xml"
+		item printDownload command printDownload icon "download"
+		item print command print icon "print"
 	}
     
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE
index e0b0a3f..4cc87d8 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE
@@ -1,2 +1,2 @@
 
-package ${{MODEL_PROJECT_PACKAGE_NAME}}
\ No newline at end of file
+package ${{MODEL_PROJECT_PACKAGE_NAME}}
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/Listing.bpmn2 b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/Listing.bpmn2
deleted file mode 100644
index c98ae1a..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/Listing.bpmn2
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- origin at X=0.0 Y=0.0 -->
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:java="http://www.java.com/javaTypes" xmlns:tns="http://www.jboss.org/drools" xmlns="http://www.jboss.org/drools" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd http://www.jboss.org/drools drools.xsd http://www.bpsim.org/schemas/1.0 bpsim.xsd" id="Definition" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.1.0.201409091530" expressionLanguage="http://www.mvel.org/2.0" targetNamespace="http://www.jboss.org/drools" typeLanguage="http://www.java.com/javaTypes">
-  <bpmn2:itemDefinition id="ItemDefinition_1" structureRef="String"/>
-  <bpmn2:itemDefinition id="ItemDefinition_2" structureRef="Integer"/>
-  <bpmn2:itemDefinition id="ItemDefinition_3" structureRef="Boolean"/>
-  <bpmn2:process id="listing" tns:version="1" tns:packageName="defaultPackage" tns:adHoc="false" name="Listing" isExecutable="true" processType="Private">
-    <bpmn2:startEvent id="StartEvent_1" name="StartProcess">
-      <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" tns:priority="1" name="" sourceRef="StartEvent_1" targetRef="UserTask_1"/>
-    <bpmn2:endEvent id="EndEvent_1" name="">
-      <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:userTask id="UserTask_1" name="Select brand owners" implementation="Java">
-      <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
-      <bpmn2:ioSpecification id="_InputOutputSpecification_3">
-        <bpmn2:dataInput id="_DataInput_9" itemSubjectRef="ItemDefinition_1" name="TaskName"/>
-        <bpmn2:dataInput id="_DataInput_10" itemSubjectRef="ItemDefinition_2" name="Priority"/>
-        <bpmn2:dataInput id="_DataInput_11" itemSubjectRef="ItemDefinition_1" name="Comment"/>
-        <bpmn2:dataInput id="_DataInput_12" itemSubjectRef="ItemDefinition_1" name="GroupId"/>
-        <bpmn2:dataInput id="_DataInput_13" itemSubjectRef="ItemDefinition_3" name="Skippable"/>
-        <bpmn2:dataInput id="_DataInput_14" itemSubjectRef="ItemDefinition_1" name="Content"/>
-        <bpmn2:dataInput id="_DataInput_15" itemSubjectRef="ItemDefinition_1" name="Locale"/>
-        <bpmn2:inputSet id="_InputSet_3" name="New Input Set">
-          <bpmn2:dataInputRefs>_DataInput_9</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_10</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_11</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_12</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_13</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_14</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_15</bpmn2:dataInputRefs>
-        </bpmn2:inputSet>
-        <bpmn2:outputSet id="_OutputSet_3" name="Output Set"/>
-      </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_9">
-        <bpmn2:targetRef>_DataInput_9</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_1">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_2">Select brand owners</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1">_DataInput_9</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_10">
-        <bpmn2:targetRef>_DataInput_10</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_2">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_4">2</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_3">_DataInput_10</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_11">
-        <bpmn2:targetRef>_DataInput_11</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_3">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_6">Brand owners must be selected in order to decide for brands</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_5">_DataInput_11</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_12">
-        <bpmn2:targetRef>_DataInput_12</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_4">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_8">StoreManagement</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_7">_DataInput_12</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_13">
-        <bpmn2:targetRef>_DataInput_13</bpmn2:targetRef>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_14">
-        <bpmn2:targetRef>_DataInput_14</bpmn2:targetRef>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_15">
-        <bpmn2:targetRef>_DataInput_15</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_7">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_14">de-DE</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_13">_DataInput_15</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-    </bpmn2:userTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" tns:priority="1" name="" sourceRef="UserTask_1" targetRef="EndEvent_1"/>
-  </bpmn2:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="listing">
-      <bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="157.0" y="207.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_1">
-          <dc:Bounds height="15.0" width="71.0" x="140.0" y="243.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_EndEvent_1" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="510.0" y="207.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_2"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_UserTask_1" bpmnElement="UserTask_1">
-        <dc:Bounds height="50.0" width="110.0" x="300.0" y="200.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_3">
-          <dc:Bounds height="30.0" width="72.0" x="319.0" y="210.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_UserTask_1">
-        <di:waypoint xsi:type="dc:Point" x="193.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="241.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="241.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="300.0" y="225.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_4"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="BPMNShape_UserTask_1" targetElement="BPMNShape_EndEvent_1">
-        <di:waypoint xsi:type="dc:Point" x="410.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="455.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="455.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="510.0" y="225.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_5"/>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/ListingGateWaysTest.bpmn2 b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/ListingGateWaysTest.bpmn2
deleted file mode 100644
index 9e51057..0000000
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.blip/src/ListingGateWaysTest.bpmn2
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- origin at X=0.0 Y=0.0 -->
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:java="http://www.java.com/javaTypes" xmlns:tns="http://www.jboss.org/drools" xmlns="http://www.jboss.org/drools" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd http://www.jboss.org/drools drools.xsd http://www.bpsim.org/schemas/1.0 bpsim.xsd" id="Definition" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.1.4.201511051307" expressionLanguage="http://www.mvel.org/2.0" targetNamespace="http://www.jboss.org/drools" typeLanguage="http://www.java.com/javaTypes">
-  <bpmn2:itemDefinition id="ItemDefinition_1" isCollection="false" structureRef="String"/>
-  <bpmn2:itemDefinition id="ItemDefinition_2" isCollection="false" structureRef="Integer"/>
-  <bpmn2:itemDefinition id="ItemDefinition_3" isCollection="false" structureRef="Boolean"/>
-  <bpmn2:itemDefinition id="ItemDefinition_11" isCollection="false" structureRef="${{BASIC_PROJECT_NAME}}.functionlibrary.ListingGateWays"/>
-  <bpmn2:process id="listingGateWaysTest" tns:version="1" tns:packageName="defaultPackage" tns:adHoc="false" name="ListingGateWaysTest" isExecutable="true" processType="Private">
-    <bpmn2:extensionElements>
-      <tns:import name="${{BASIC_PROJECT_NAME}}.functionlibrary.ListingGateWays"/>
-    </bpmn2:extensionElements>
-    <bpmn2:startEvent id="StartEvent_1" name="StartProcess">
-      <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
-    </bpmn2:startEvent>
-    <bpmn2:endEvent id="EndEvent_1" name="">
-      <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
-    </bpmn2:endEvent>
-    <bpmn2:userTask id="UserTask_1" name="Choose brand owners" implementation="Java">
-      <bpmn2:extensionElements>
-        <tns:onEntry-script scriptFormat="http://www.java.com/java">
-          <tns:script>ListingGateWays.onEntryChooseBrandOwners();</tns:script>
-        </tns:onEntry-script>
-        <tns:onExit-script scriptFormat="http://www.java.com/java">
-          <tns:script>${{BASIC_PROJECT_NAME}}.functionlibrary.ListingGateWays.onExitChooseBrandOwners();</tns:script>
-        </tns:onExit-script>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
-      <bpmn2:ioSpecification id="_InputOutputSpecification_3">
-        <bpmn2:dataInput id="_DataInput_9" itemSubjectRef="ItemDefinition_1" name="TaskName"/>
-        <bpmn2:dataInput id="_DataInput_10" itemSubjectRef="ItemDefinition_2" name="Priority"/>
-        <bpmn2:dataInput id="_DataInput_11" itemSubjectRef="ItemDefinition_1" name="Comment"/>
-        <bpmn2:dataInput id="_DataInput_12" itemSubjectRef="ItemDefinition_1" name="GroupId"/>
-        <bpmn2:dataInput id="_DataInput_13" itemSubjectRef="ItemDefinition_3" name="Skippable"/>
-        <bpmn2:dataInput id="_DataInput_14" itemSubjectRef="ItemDefinition_1" name="Content"/>
-        <bpmn2:dataInput id="_DataInput_15" itemSubjectRef="ItemDefinition_1" name="Locale"/>
-        <bpmn2:inputSet id="_InputSet_3" name="New Input Set">
-          <bpmn2:dataInputRefs>_DataInput_9</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_10</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_11</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_12</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_13</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_14</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>_DataInput_15</bpmn2:dataInputRefs>
-        </bpmn2:inputSet>
-        <bpmn2:outputSet id="_OutputSet_3" name="Output Set"/>
-      </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_9">
-        <bpmn2:targetRef>_DataInput_9</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_1">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_2">Select brand owners</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1">_DataInput_9</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_10">
-        <bpmn2:targetRef>_DataInput_10</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_2">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_4">2</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_3">_DataInput_10</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_11">
-        <bpmn2:targetRef>_DataInput_11</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_3">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_6">Brand owners must be selected in order to decide for brands</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_5">_DataInput_11</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_12">
-        <bpmn2:targetRef>_DataInput_12</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_4">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_8">StoreManagement</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_7">_DataInput_12</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_13">
-        <bpmn2:targetRef>_DataInput_13</bpmn2:targetRef>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_14">
-        <bpmn2:targetRef>_DataInput_14</bpmn2:targetRef>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="_DataInputAssociation_15">
-        <bpmn2:targetRef>_DataInput_15</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_7">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_14">de-DE</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_13">_DataInput_15</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-    </bpmn2:userTask>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_2" name="decide" gatewayDirection="Diverging">
-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
-      <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" tns:priority="1" sourceRef="StartEvent_1" targetRef="ExclusiveGateway_2"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_4" tns:priority="1" name="lets choose" sourceRef="ExclusiveGateway_2" targetRef="UserTask_1">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_47" language="http://www.java.com/java">return ListingGateWays.decideLetsChoose();</bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:userTask id="UserTask_3" name="Select brand owners" implementation="Java">
-      <bpmn2:extensionElements>
-        <tns:onEntry-script>
-          <tns:script>System.out.println(&quot;ListingGateWays.onEntrySelectBrandOwners();&quot;);</tns:script>
-        </tns:onEntry-script>
-        <tns:onExit-script scriptFormat="http://www.mvel.org/2.0">
-          <tns:script>System.out.println(&quot;ListingGateWays.onExitSelectBrandOwners();&quot;);</tns:script>
-        </tns:onExit-script>
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-      <bpmn2:ioSpecification id="InputOutputSpecification_2">
-        <bpmn2:dataInput id="DataInput_8" itemSubjectRef="ItemDefinition_1" name="TaskName"/>
-        <bpmn2:dataInput id="DataInput_9" itemSubjectRef="ItemDefinition_2" name="Priority"/>
-        <bpmn2:dataInput id="DataInput_10" itemSubjectRef="ItemDefinition_1" name="Comment"/>
-        <bpmn2:dataInput id="DataInput_11" itemSubjectRef="ItemDefinition_1" name="GroupId"/>
-        <bpmn2:dataInput id="DataInput_12" itemSubjectRef="ItemDefinition_3" name="Skippable"/>
-        <bpmn2:dataInput id="DataInput_13" itemSubjectRef="ItemDefinition_1" name="Content"/>
-        <bpmn2:dataInput id="DataInput_14" itemSubjectRef="ItemDefinition_1" name="Locale"/>
-        <bpmn2:inputSet id="InputSet_3" name="New Input Set">
-          <bpmn2:dataInputRefs>DataInput_8</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>DataInput_9</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>DataInput_10</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>DataInput_11</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>DataInput_12</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>DataInput_13</bpmn2:dataInputRefs>
-          <bpmn2:dataInputRefs>DataInput_14</bpmn2:dataInputRefs>
-        </bpmn2:inputSet>
-        <bpmn2:outputSet id="OutputSet_3" name="Output Set"/>
-      </bpmn2:ioSpecification>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_8">
-        <bpmn2:targetRef>DataInput_8</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_11">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_21">Select brand owners</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_22">_DataInput_9</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_9">
-        <bpmn2:targetRef>DataInput_9</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_12">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_23">2</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_24">_DataInput_10</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_10">
-        <bpmn2:targetRef>DataInput_10</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_13">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_25">Brand owners must be selected in order to decide for brands</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_26">_DataInput_11</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_11">
-        <bpmn2:targetRef>DataInput_11</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_14">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_27">StoreManagement</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_28">_DataInput_12</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_12">
-        <bpmn2:targetRef>DataInput_12</bpmn2:targetRef>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_13">
-        <bpmn2:targetRef>DataInput_13</bpmn2:targetRef>
-      </bpmn2:dataInputAssociation>
-      <bpmn2:dataInputAssociation id="DataInputAssociation_14">
-        <bpmn2:targetRef>DataInput_14</bpmn2:targetRef>
-        <bpmn2:assignment id="Assignment_15">
-          <bpmn2:from xsi:type="bpmn2:tFormalExpression" id="FormalExpression_29">de-DE</bpmn2:from>
-          <bpmn2:to xsi:type="bpmn2:tFormalExpression" id="FormalExpression_30">_DataInput_15</bpmn2:to>
-        </bpmn2:assignment>
-      </bpmn2:dataInputAssociation>
-    </bpmn2:userTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" tns:priority="1" name="lets select" sourceRef="ExclusiveGateway_2" targetRef="UserTask_3">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_48" language="http://www.mvel.org/2.0">System.out.println(&quot;ListingGateWays.decideLetsSelect();&quot;); return false;</bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_3" name="it's done" gatewayDirection="Converging">
-      <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
-    </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_6" tns:priority="1" sourceRef="UserTask_1" targetRef="ExclusiveGateway_3"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_7" tns:priority="1" sourceRef="UserTask_3" targetRef="ExclusiveGateway_3"/>
-    <bpmn2:sequenceFlow id="SequenceFlow_8" tns:priority="1" sourceRef="ExclusiveGateway_3" targetRef="EndEvent_1"/>
-  </bpmn2:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="listing">
-      <bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="71.0" y="207.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_1">
-          <dc:Bounds height="15.0" width="71.0" x="54.0" y="243.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_EndEvent_1" bpmnElement="EndEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="590.0" y="207.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_2"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_UserTask_1" bpmnElement="UserTask_1">
-        <dc:Bounds height="50.0" width="110.0" x="300.0" y="151.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_3">
-          <dc:Bounds height="30.0" width="83.0" x="313.0" y="161.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_ExclusiveGateway_2" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="150.0" y="200.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_4">
-          <dc:Bounds height="15.0" width="37.0" x="156.0" y="250.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_UserTask_2" bpmnElement="UserTask_3">
-        <dc:Bounds height="50.0" width="110.0" x="300.0" y="250.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_5">
-          <dc:Bounds height="30.0" width="73.0" x="318.0" y="260.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_ExclusiveGateway_3" bpmnElement="ExclusiveGateway_3" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="466.0" y="200.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_6">
-          <dc:Bounds height="15.0" width="46.0" x="468.0" y="250.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_ExclusiveGateway_2">
-        <di:waypoint xsi:type="dc:Point" x="107.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="128.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="150.0" y="225.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_7"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="BPMNShape_ExclusiveGateway_2" targetElement="BPMNShape_UserTask_1">
-        <di:waypoint xsi:type="dc:Point" x="175.0" y="200.0"/>
-        <di:waypoint xsi:type="dc:Point" x="175.0" y="176.0"/>
-        <di:waypoint xsi:type="dc:Point" x="300.0" y="176.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_8">
-          <dc:Bounds height="15.0" width="64.0" x="195.0" y="177.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="BPMNShape_ExclusiveGateway_2" targetElement="BPMNShape_UserTask_2">
-        <di:waypoint xsi:type="dc:Point" x="175.0" y="250.0"/>
-        <di:waypoint xsi:type="dc:Point" x="175.0" y="275.0"/>
-        <di:waypoint xsi:type="dc:Point" x="300.0" y="275.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_9">
-          <dc:Bounds height="15.0" width="56.0" x="198.0" y="276.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="BPMNShape_UserTask_1" targetElement="BPMNShape_ExclusiveGateway_3">
-        <di:waypoint xsi:type="dc:Point" x="410.0" y="176.0"/>
-        <di:waypoint xsi:type="dc:Point" x="491.0" y="176.0"/>
-        <di:waypoint xsi:type="dc:Point" x="491.0" y="200.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_10"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="BPMNShape_UserTask_2" targetElement="BPMNShape_ExclusiveGateway_3">
-        <di:waypoint xsi:type="dc:Point" x="410.0" y="275.0"/>
-        <di:waypoint xsi:type="dc:Point" x="491.0" y="275.0"/>
-        <di:waypoint xsi:type="dc:Point" x="491.0" y="250.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_11"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="BPMNShape_ExclusiveGateway_3" targetElement="BPMNShape_EndEvent_1">
-        <di:waypoint xsi:type="dc:Point" x="516.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="553.0" y="225.0"/>
-        <di:waypoint xsi:type="dc:Point" x="590.0" y="225.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_12"/>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
index dc73c4e..35497c2 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
@@ -1,4 +1,4 @@
 
-package ${{MODEL_PROJECT_PACKAGE_NAME}} title "Sample" { 
+package ${{MODEL_PROJECT_PACKAGE_NAME}} { 
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE
index 53d53f8..83a2bb3 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE
@@ -47,7 +47,7 @@
 			 */
 		)
 
-	datatype Price jvmType Double properties(key="decimalformat" value="###,##0.00 &curren")
+	datatype Price jvmType Double properties(key="decimalformat" value="###,##0.00 &curren;")
 	datatype DateOnly dateType date properties(key = "Date" value = "Day")
 	datatype BirthDate dateType date isNotNull isPast[severity=error] properties(key = "Date" value = "Day")
 	datatype Time dateType time
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE
index 10b6320..e82d942 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entity/src/BUSINESSBUNDLECLASSNAME.entity.TEMPLATE
@@ -1,4 +1,4 @@
-import ns ${{BASIC_PROJECT_NAME}}.model.datatypes.Date
+import ns ${{BASIC_PROJECT_NAME}}.model.datatypes.BirthDate
 import ns ${{BASIC_PROJECT_NAME}}.model.datatypes.String
 import ns ${{BASIC_PROJECT_NAME}}.model.datatypes.int
 
@@ -19,7 +19,7 @@
         persistenceUnit "businessdata"
         var String firstName
         var String lastName
-        var Date birthdate
+        var BirthDate birthdate
     }
 
 
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
index 74e7331..f49603e 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
@@ -4,7 +4,7 @@
 
 package ${{MODEL_PROJECT_PACKAGE_NAME}} {
 
-    mock ${{BUSINESS_BUNDLE}}Users {
+    mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Users {
     	priority 4
 
 	    resources {
@@ -30,7 +30,7 @@
 	    
 	}
 
-	mock ${{BUSINESS_BUNDLE}}Entities{
+	mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Entities{
 		priority 1
 	    resources {
 	
@@ -68,7 +68,7 @@
 	    }
 	    
 	     entities {
-	        mocking mockedPerson entity Person rows 20 to 50 {
+	        mocking mockedPerson entity Person rows 120 to 150 {
 	            template personData					byObject PersonObject
 	            var firstName							as personData.firstName
 	            var lastName							as personData.lastName
@@ -78,7 +78,7 @@
 	    }
     }
 	
-	mock ${{BUSINESS_BUNDLE}}Blobs {
+	mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Blobs {
     	priority 2
 
 	    resources {
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE
index de34cc4..9c629fa 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/PIM/PROJECT.table/src/BUSINESSBUNDLECLASSNAME.table.TEMPLATE
@@ -2,6 +2,6 @@
 
 package ${{MODEL_PROJECT_PACKAGE_NAME}} {
 
-	table Persons describedBy "All Persons" as editable filtering using dto PersonDto
+	table Persons describedBy "All Persons" as editable using dto PersonDto
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE
index f3191d1..a2d9b77 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.action/src/BUSINESSBUNDLECLASSNAME.action.TEMPLATE
@@ -21,8 +21,8 @@
     }
     
     toolbar Report describedBy "Toolbar for reports" items {
-		item printDownload command printDownload icon "print"
-		item print command print icon "xml"
+		item printDownload command printDownload icon "download"
+		item print command print icon "print"
 	}
     
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE
index f7f4493..c00f5a0 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.blip/src/BUSINESSBUNDLECLASSNAME.blip.TEMPLATE
@@ -1,2 +1,2 @@
 
-package ${{MODEL_PROJECT_PACKAGE_NAME}} 
\ No newline at end of file
+package ${{MODEL_PROJECT_PACKAGE_NAME}} 
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
index dc73c4e..35497c2 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datainterchange/src/BUSINESSBUNDLECLASSNAME.data.TEMPLATE
@@ -1,4 +1,4 @@
 
-package ${{MODEL_PROJECT_PACKAGE_NAME}} title "Sample" { 
+package ${{MODEL_PROJECT_PACKAGE_NAME}} { 
 
 }
\ No newline at end of file
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE
index d737163..ec8788e 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.datatype/src/BUSINESSBUNDLECLASSNAME.datatype.TEMPLATE
@@ -46,7 +46,7 @@
 		)
 
 	datatype Date dateType date
-	datatype Price jvmType Double properties(key="decimalformat" value="###,##0.00 &curren")
+	datatype Price jvmType Double properties(key="decimalformat" value="###,##0.00 &curren;")
 	datatype DateOnly dateType date properties(key = "Date" value = "Day")
 	datatype BirthDate dateType date isNotNull isPast[severity=error] properties(key = "Date" value = "Day")
 	datatype Time dateType time
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
index 5405c45..5c58ce4 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/MODEL/__basic__/PROJECT.entitymock/src/BUSINESSBUNDLECLASSNAME.entitymock.TEMPLATE
@@ -2,7 +2,7 @@
 import ns org.eclipse.osbp.blob.^entities.BlobMapping
 
 package ${{MODEL_PROJECT_PACKAGE_NAME}} {
-	mock  ${{BUSINESS_BUNDLE}}Users {
+	mock  ${{BUSINESS_BUNDLE_CLASS_NAME}}Users {
     priority 4
 
 		resources {
@@ -27,7 +27,7 @@
 		}
 	}
 	
-	mock ${{BUSINESS_BUNDLE}}Entities {
+	mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Entities {
 		objects {
 			
 		}
@@ -37,7 +37,7 @@
 		}
 	}
 	
-	mock ${{BUSINESS_BUNDLE}}Blobs {
+	mock ${{BUSINESS_BUNDLE_CLASS_NAME}}Blobs {
     priority 2
 	
 	    resources {
diff --git a/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT b/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT
index bf5134e..1ebff34 100644
--- a/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT
+++ b/org.eclipse.osbp.wizard.ui/wizardtemplates/PRODUCT/__basic__/PROJECT/BUSINESSBUNDLECLASSNAME.product.TEMPLATE_NO_COMMENT
@@ -19,7 +19,7 @@
 -Dlog4j.configuration=file:///${{PROJECT_LOC}}/META-INF/log4j.xml 
 -Dlogback.configurationFile=${{PROJECT_LOC}}/META-INF/logback.xml
 -DproductConfigurationFile=${{PROJECT_LOC}}/DEFAULTFILE
--DmockDataGeneratorFilter=${{MOCK_PRODUCT_DATA_FORCE}}${{BUSINESS_BUNDLE}}Users,${{MOCK_PRODUCT_DATA_FORCE}}${{BUSINESS_BUNDLE}}Entities,${{MOCK_PRODUCT_DATA_FORCE}}${{BUSINESS_BUNDLE}}Blobs
+-DmockDataGeneratorFilter=${{MOCK_PRODUCT_DATA_FORCE}}${{BUSINESS_BUNDLE_CLASS_NAME}}Users,${{MOCK_PRODUCT_DATA_FORCE}}${{BUSINESS_BUNDLE_CLASS_NAME}}Entities,${{MOCK_PRODUCT_DATA_FORCE}}${{BUSINESS_BUNDLE_CLASS_NAME}}Blobs
 -Xms${{XMS_SIZE}}m -Xmx${{XMX_SIZE}}m
       </vmArgs>
       <vmArgsMac>-Dorg.eclipse.swt.internal.carbon.smallFonts