diff --git a/library/server/wsf/router/request_router.e b/library/server/wsf/router/request_router.e
index 99e6a316..d83d95d4 100644
--- a/library/server/wsf/router/request_router.e
+++ b/library/server/wsf/router/request_router.e
@@ -107,7 +107,7 @@ feature -- Traversing
 		deferred
 		end
 
-feature {NONE} -- Access: Implementation
+feature {ROUTED_SERVICE_I} -- Handler
 
 	source_uri (req: WSF_REQUEST): READABLE_STRING_32
 			-- URI to use to find handler.
@@ -124,6 +124,8 @@ feature {NONE} -- Access: Implementation
 			source_uri_unchanged: source_uri (req).same_string (old source_uri (req))
 		end
 
+feature {NONE} -- Access: Implementation
+
 	is_matching_request_methods (a_request_method: READABLE_STRING_GENERAL; rqst_methods: like formatted_request_methods): BOOLEAN
 			-- `a_request_method' is matching `rqst_methods' contents
 		local
diff --git a/library/server/wsf/router/uri_template/request_uri_template_router_i.e b/library/server/wsf/router/uri_template/request_uri_template_router_i.e
index 23dfbf21..3faa32ba 100644
--- a/library/server/wsf/router/uri_template/request_uri_template_router_i.e
+++ b/library/server/wsf/router/uri_template/request_uri_template_router_i.e
@@ -52,7 +52,7 @@ feature -- Registration
 			map_with_uri_template_and_request_methods (create {URI_TEMPLATE}.make (tpl), h, rqst_methods)
 		end
 
-feature {NONE} -- Access: Implementation
+feature {ROUTED_SERVICE_I} -- Hanlder
 
 	handler (req: WSF_REQUEST): detachable TUPLE [handler: attached like default_handler; context: like default_handler_context]
 		local