diff --git a/config/jcae.properties b/config/jcae.properties
index ffa04fb..0dd3372 100644
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,6 +1,6 @@
-#Wed Jan 20 14:25:21 CET 2016
+#Mon Nov 28 10:21:13 CET 2016
 ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
-ch.psi.jcae.ChannelFactory.timeout=1000
+ch.psi.jcae.ChannelFactory.timeout=500
 ch.psi.jcae.ChannelFactory.retries=1
 ch.psi.jcae.ChannelBeanFactory.timeout=10000
 ch.psi.jcae.ChannelBeanFactory.waitTimeout=1800000
@@ -11,3 +11,7 @@ ch.psi.jcae.impl.DefaultChannelService.waitTimeout=60000
 ch.psi.jcae.impl.DefaultChannelService.waitRetryPeriod=5000
 ch.psi.jcae.impl.DefaultChannelService.retries=4
 ch.psi.jcae.ContextFactory.addressList=
+ch.psi.jcae.ContextFactory.serverPort=
+ch.psi.jcae.ContextFactory.autoAddressList=true
+ch.psi.jcae.ContextFactory.useShellVariables=false
+ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false