Index: oceandb/webapproot/WEB-INF/project-managers.xml
===================================================================
--- oceandb/webapproot/WEB-INF/project-managers.xml	(revision 47)
+++ oceandb/webapproot/WEB-INF/project-managers.xml	(revision 48)
@@ -1,25 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Server-side manager bean definitions.  These are only to be used at runtime.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:aop="http://www.springframework.org/schema/aop"
-        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                http://www.springframework.org/schema/aop
-                http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-    <!-- extend beans to have the proper names; add in server-specific information -->
-    <bean id="serviceManager"
-            class="com.wavemaker.runtime.service.ServiceManager"
-            scope="singleton"
-            lazy-init="true"
-            parent="serviceManagerBase">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<beans xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans">
+    <bean scope="singleton" parent="serviceManagerBase" class="com.wavemaker.runtime.service.ServiceManager" id="serviceManager">
         <property name="services">
             <list merge="true">
+                <value>runtimeService</value>
             </list>
         </property>
     </bean>
+    <bean scope="singleton" parent="typeManagerBase" class="com.wavemaker.runtime.service.TypeManager" id="typeManager">
+        <property name="types">
+            <map merge="true">
+                <entry key="runtimeService">
+                    <list>
+                        <value>com.wavemaker.runtime.service.PagingOptions</value>
+                        <value>com.wavemaker.runtime.service.PropertyOptions</value>
+                    </list>
+                </entry>
+            </map>
+        </property>
+    </bean>
 </beans>
Index: oceandb/webapproot/WEB-INF/project-services.xml
===================================================================
--- oceandb/webapproot/WEB-INF/project-services.xml	(revision 47)
+++ oceandb/webapproot/WEB-INF/project-services.xml	(revision 48)
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Server definition of all services; 
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<beans xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans">
+    <import resource="classpath:com/wavemaker/runtime/service/runtimeServiceBean.xml"/>
 </beans>