diff --git a/examples/hello_routed_world/src/hello_routed_world.e b/examples/hello_routed_world/src/hello_routed_world.e
index daad0e8e..c34f3bcd 100644
--- a/examples/hello_routed_world/src/hello_routed_world.e
+++ b/examples/hello_routed_world/src/hello_routed_world.e
@@ -35,17 +35,27 @@ feature {NONE} -- Initialization
 	setup_router
 		local
 			ra: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
+			rag: DEFAULT_REQUEST_URI_TEMPLATE_ROUTING_HANDLER
 		do
 			router.map_agent ("/home", agent execute_home)
 
+			create rag.make (3)
+
 			create ra.make (agent handle_hello)
-			router.map ("/hello/{name}.{format}", ra)
-			router.map ("/hello.{format}/{name}", ra)
-			router.map ("/hello/{name}", ra)
+			rag.map ("/hello/{name}.{format}", ra)
+			rag.map ("/hello.{format}/{name}", ra)
+			rag.map ("/hello/{name}", ra)
+--			router.map ("/hello/{name}.{format}", ra)
+--			router.map ("/hello.{format}/{name}", ra)
+--			router.map ("/hello/{name}", ra)
 
 			create ra.make (agent handle_anonymous_hello)
-			router.map ("/hello", ra)
-			router.map ("/hello.{format}", ra)
+			rag.map ("/hello", ra)
+			rag.map ("/hello.{format}", ra)
+--			router.map ("/hello", ra)
+--			router.map ("/hello.{format}", ra)
+
+			router.map ("/hello", rag)
 
 			router.map_agent_with_request_methods ("/method/any", agent handle_method_any, Void)
 			router.map_agent_with_request_methods ("/method/guess", agent handle_method_get_or_post, <<"GET", "POST">>)
diff --git a/library/server/request/router/router-safe.ecf b/library/server/request/router/router-safe.ecf
index 040eb070..eba5a022 100644
--- a/library/server/request/router/router-safe.ecf
+++ b/library/server/request/router/router-safe.ecf
@@ -14,7 +14,6 @@
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="uri_template" location="..\..\..\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
@@ -32,7 +31,6 @@
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi_spec-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="uri_template" location="..\..\..\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
diff --git a/library/server/request/router/router.ecf b/library/server/request/router/router.ecf
index 88790095..b336e855 100644
--- a/library/server/request/router/router.ecf
+++ b/library/server/request/router/router.ecf
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true">
+		<option warning="true" full_class_checking="true" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
@@ -15,7 +15,6 @@
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi.ecf"/>
 		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
 		<library name="uri_template" location="..\..\..\protocol\uri_template\uri_template.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 	<target name="ewsgi_compliant_router">
@@ -33,7 +32,6 @@
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi.ecf"/>
 		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
 		<library name="uri_template" location="..\..\..\protocol\uri_template\uri_template.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 </system>