diff --git a/openbis/source/java/applicationContext.xml b/openbis/source/java/applicationContext.xml
index 9a1abb0600ed86a70d218077cd6e80d643136124..7d15cb52a7caa80b211982cead67793784b25f12 100644
--- a/openbis/source/java/applicationContext.xml
+++ b/openbis/source/java/applicationContext.xml
@@ -11,4 +11,20 @@
     
     <import resource="genericApplicationContext.xml"/>
     
+    <bean class="org.springframework.scheduling.timer.TimerFactoryBean">
+        <property name="scheduledTimerTasks">
+            <list>
+                <bean class="org.springframework.scheduling.timer.ScheduledTimerTask">
+                    <property name="delay" value="0" />
+                    <property name="runnable" ref="full-text-indexer" />
+                </bean>
+                <bean class="org.springframework.scheduling.timer.ScheduledTimerTask">
+                    <property name="delay" value="1000" />
+                    <property name="runnable" ref="dynamic-property-evaluator" />
+                </bean>
+            </list>
+        </property>
+        <property name="daemon" value="true" />
+    </bean>
+    
 </beans>
\ No newline at end of file
diff --git a/openbis/source/java/hibernateContext.xml b/openbis/source/java/hibernateContext.xml
index b514675c5fffa58d65eaed6d99def021f880d43d..818294284c292663293395ccb4c6d789a78e6944 100644
--- a/openbis/source/java/hibernateContext.xml
+++ b/openbis/source/java/hibernateContext.xml
@@ -190,21 +190,4 @@
         <constructor-arg ref="full-text-index-updater" />
         <constructor-arg ref="dynamic-property-scheduler" />
     </bean>
-    
-    <bean class="org.springframework.scheduling.timer.TimerFactoryBean">
-        <property name="scheduledTimerTasks">
-            <list>
-                <bean class="org.springframework.scheduling.timer.ScheduledTimerTask">
-                    <property name="delay" value="0" />
-                    <property name="runnable" ref="full-text-indexer" />
-                </bean>
-                <bean class="org.springframework.scheduling.timer.ScheduledTimerTask">
-                    <property name="delay" value="1000" />
-                    <property name="runnable" ref="dynamic-property-evaluator" />
-                </bean>
-            </list>
-        </property>
-        <property name="daemon" value="true" />
-    </bean>
-
 </beans>
\ No newline at end of file
diff --git a/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml b/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml
index eb620fa2ad5f7479f431e01f8df922e33645036a..524257a13799a3d601eebb34b5deef5cc39253e4 100644
--- a/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml
+++ b/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml
@@ -11,8 +11,9 @@
             http://www.springframework.org/schema/context/spring-context-2.5.xsd
 ">
 
-    <import resource="applicationContext.xml"/>
-    
+    <import resource="genericCommonContext.xml"/>
+    <import resource="genericApplicationContext.xml"/>
+
     <bean name="bootstrap" class="ch.systemsx.cisd.common.spring.Bootstrapper">
         <property name="configLocation" value="classpath:applicationContext.xml" />
         <property name="conditionalConfigLocations">