diff --git a/config/jcae.properties b/config/jcae.properties
index 2b51c190..272adfe5 100644
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,9 +1,12 @@
-#ch.psi.jcae.ContextFactory.addressList=
+#Tue Jan 12 14:13:35 CET 2016
 ch.psi.jcae.ContextFactory.maxArrayBytes=20000000
-
-ch.psi.jcae.ChannelFactory.timeout=2000
-ch.psi.jcae.ChannelFactory.retries=2
+ch.psi.jcae.ChannelFactory.timeout=500
+ch.psi.jcae.ChannelFactory.retries=1
 ch.psi.jcae.ChannelBeanFactory.timeout=10000
 ch.psi.jcae.ChannelBeanFactory.waitTimeout=3600000
 ch.psi.jcae.ChannelBeanFactory.retries=2
-
+ch.psi.jcae.ContextFactory.addressList=
+ch.psi.jcae.impl.DefaultChannelService.retries=2
+ch.psi.jcae.impl.DefaultChannelService.timeout=500
+ch.psi.jcae.impl.DefaultChannelService.waitTimeout=
+ch.psi.jcae.impl.DefaultChannelService.waitRetryPeriod=10000