diff --git a/src/main/java/li/strolch/tutorialwebapp/StartupListener.java b/src/main/java/li/strolch/tutorialwebapp/StartupListener.java
index 2e4e4bd4c..fc23fa95c 100644
--- a/src/main/java/li/strolch/tutorialwebapp/StartupListener.java
+++ b/src/main/java/li/strolch/tutorialwebapp/StartupListener.java
@@ -7,6 +7,7 @@ import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
 
 import li.strolch.agent.api.StrolchAgent;
+import li.strolch.runtime.configuration.StrolchEnvironment;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,9 +24,10 @@ public class StartupListener implements ServletContextListener {
 
 		String realPath = sce.getServletContext().getRealPath("/WEB-INF");
 		File pathF = new File(realPath);
+		String environment = StrolchEnvironment.getEnvironmentFromEnvProperties(pathF);
 		logger.info("Starting Agent...");
 		this.agent = new StrolchAgent();
-		this.agent.setup(pathF);
+		this.agent.setup(environment, pathF);
 		this.agent.initialize();
 		this.agent.start();
 		logger.info("Agent started.");
diff --git a/src/main/webapp/WEB-INF/config/StrolchConfiguration.xml b/src/main/webapp/WEB-INF/config/StrolchConfiguration.xml
index 203a24035..fbab8e584 100644
--- a/src/main/webapp/WEB-INF/config/StrolchConfiguration.xml
+++ b/src/main/webapp/WEB-INF/config/StrolchConfiguration.xml
@@ -1,82 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <StrolchConfiguration>
-	<Runtime>
-		<applicationName>StrolchTutorialApp</applicationName>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Runtime>
-	<Component>
-		<name>RealmHandler</name>
-		<api>li.strolch.agent.api.RealmHandler</api>
-		<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
-		<depends>PersistenceHandler</depends>
-		<Properties>
-			<dataStoreMode>TRANSIENT</dataStoreMode>
-			<dataStoreFile>StrolchModel.xml</dataStoreFile>
-		</Properties>
-	</Component>
-	<Component>
-		<name>ServiceHandler</name>
-		<api>li.strolch.service.api.ServiceHandler</api>
-		<impl>li.strolch.service.api.DefaultServiceHandler</impl>
-		<depends>RealmHandler</depends>
-		<depends>PrivilegeHandler</depends>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PrivilegeHandler</name>
-		<api>li.strolch.runtime.privilege.StrolchPrivilegeHandler</api>
-		<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
-		<Properties>
-			<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PostInitializer</name>
-		<api>li.strolch.agent.api.PostInitializer</api>
-		<impl>li.strolch.tutorialwebapp.postinitializer.PostInitializer</impl>
-		<depends>ServiceHandler</depends>
-		<Properties>
-		</Properties>
-	</Component>
-	<Component>
-		<name>PersistenceHandler</name>
-		<api>li.strolch.persistence.api.PersistenceHandler</api>
-		<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-		<Properties>
-			<verbose>true</verbose>
-		</Properties>
-	</Component>
-	<Component>
-		<name>EnumHandler</name>
-		<api>li.strolch.runtime.query.enums.EnumHandler</api>
-		<impl>li.strolch.runtime.query.enums.DefaultEnumHandler</impl>
-		<depends>RealmHandler</depends>
-		<Properties>
-			<realm>defaultRealm</realm>
-			<salutations>Resource/Enumeration/salutations</salutations>
-			<sex>Resource/Enumeration/sex</sex>
-			<religions>Resource/Enumeration/religions</religions>
-		</Properties>
-	</Component>
-	<Component>
-		<name>RestfulHandler</name>
-		<api>li.strolch.rest.RestfulStrolchComponent</api>
-		<impl>li.strolch.rest.RestfulStrolchComponent</impl>
-		<depends>SessionHandler</depends>
-		<Properties>
-		</Properties>
-	</Component>
-	<Component>
-		<name>SessionHandler</name>
-		<api>li.strolch.rest.StrolchSessionHandler</api>
-		<impl>li.strolch.rest.DefaultStrolchSessionHandler</impl>
-		<depends>PrivilegeHandler</depends>
-		<Properties>
-			<rememberUser>true</rememberUser>
-		</Properties>
-	</Component>
+	<env id="dev">
+		<Runtime>
+			<applicationName>StrolchTutorialApp</applicationName>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Runtime>
+		<Component>
+			<name>RealmHandler</name>
+			<api>li.strolch.agent.api.RealmHandler</api>
+			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
+			<depends>PersistenceHandler</depends>
+			<Properties>
+				<dataStoreMode>TRANSIENT</dataStoreMode>
+				<dataStoreFile>StrolchModel.xml</dataStoreFile>
+			</Properties>
+		</Component>
+		<Component>
+			<name>ServiceHandler</name>
+			<api>li.strolch.service.api.ServiceHandler</api>
+			<impl>li.strolch.service.api.DefaultServiceHandler</impl>
+			<depends>RealmHandler</depends>
+			<depends>PrivilegeHandler</depends>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PrivilegeHandler</name>
+			<api>li.strolch.runtime.privilege.StrolchPrivilegeHandler</api>
+			<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
+			<Properties>
+				<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PostInitializer</name>
+			<api>li.strolch.agent.api.PostInitializer</api>
+			<impl>li.strolch.tutorialwebapp.postinitializer.PostInitializer</impl>
+			<depends>ServiceHandler</depends>
+			<Properties>
+			</Properties>
+		</Component>
+		<Component>
+			<name>PersistenceHandler</name>
+			<api>li.strolch.persistence.api.PersistenceHandler</api>
+			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
+			<Properties>
+				<verbose>true</verbose>
+			</Properties>
+		</Component>
+		<Component>
+			<name>EnumHandler</name>
+			<api>li.strolch.runtime.query.enums.EnumHandler</api>
+			<impl>li.strolch.runtime.query.enums.DefaultEnumHandler</impl>
+			<depends>RealmHandler</depends>
+			<Properties>
+				<realm>defaultRealm</realm>
+				<salutations>Resource/Enumeration/salutations</salutations>
+				<sex>Resource/Enumeration/sex</sex>
+				<religions>Resource/Enumeration/religions</religions>
+			</Properties>
+		</Component>
+		<Component>
+			<name>RestfulHandler</name>
+			<api>li.strolch.rest.RestfulStrolchComponent</api>
+			<impl>li.strolch.rest.RestfulStrolchComponent</impl>
+			<depends>SessionHandler</depends>
+			<Properties>
+				<corsEnabled>true</corsEnabled>
+				<corsOrigin>http://localhost:8180</corsOrigin>
+			</Properties>
+		</Component>
+		<Component>
+			<name>SessionHandler</name>
+			<api>li.strolch.rest.StrolchSessionHandler</api>
+			<impl>li.strolch.rest.DefaultStrolchSessionHandler</impl>
+			<depends>PrivilegeHandler</depends>
+			<Properties>
+				<rememberUser>true</rememberUser>
+			</Properties>
+		</Component>
+	</env>
 </StrolchConfiguration>