diff --git a/library/server/wsf/router/uri/wsf_uri_router_i.e b/library/server/wsf/router/uri/wsf_uri_router_i.e
index aa38ed97..f9290bc6 100644
--- a/library/server/wsf/router/uri/wsf_uri_router_i.e
+++ b/library/server/wsf/router/uri/wsf_uri_router_i.e
@@ -12,7 +12,7 @@ note
 					map_with_request_methods ("/groups/", write_groups_handler, <<"POST", "PUT", "DELETE">>)
 					map_agent_with_request_methods ("/order/", agent do_get_order, <<"GET">>)
 					map_agent_with_request_methods ("/order/", agent do_post_order, <<"POST">>)
-				
+
 
 			]"
 	date: "$Date$"
@@ -102,9 +102,9 @@ feature {NONE} -- Implementation
 			end
 		end
 
-feature {NONE} -- Access: Implementation
+feature {WSF_ROUTED_SERVICE_I} -- Handler
 
-	handler (req: WSF_REQUEST): detachable WSF_ROUTE [H, C]
+	matching_route (req: WSF_REQUEST): detachable WSF_ROUTE [H, C]
 		local
 			h: detachable H
 			ctx: detachable C
@@ -128,6 +128,8 @@ feature {NONE} -- Access: Implementation
 			end
 		end
 
+feature {NONE} -- Access: Implementation		
+
 	smart_handler (req: WSF_REQUEST): detachable TUPLE [path: READABLE_STRING_8; handler: H]
 		require
 			req_valid: req /= Void and then source_uri (req) /= Void