diff --git a/library/server/wsf/extension/handler/cgi/wsf_cgi_handler.e b/library/server/wsf/extension/handler/cgi/wsf_cgi_handler.e
index 2efaf68b..3076918e 100644
--- a/library/server/wsf/extension/handler/cgi/wsf_cgi_handler.e
+++ b/library/server/wsf/extension/handler/cgi/wsf_cgi_handler.e
@@ -50,6 +50,7 @@ feature -- Status report
 feature -- Execution
 
 	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute `req' responding in `res'.
 		local
 			fut: FILE_UTILITIES
 			l_exec_path: PATH
diff --git a/library/server/wsf/router/support/execute/helpers/wsf_execute_response_agent_handler.e b/library/server/wsf/router/support/execute/helpers/wsf_execute_response_agent_handler.e
index a15cadd5..0086a225 100644
--- a/library/server/wsf/router/support/execute/helpers/wsf_execute_response_agent_handler.e
+++ b/library/server/wsf/router/support/execute/helpers/wsf_execute_response_agent_handler.e
@@ -32,7 +32,7 @@ feature -- Execution
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/server/wsf/router/support/uri/helpers/wsf_uri_response_handler.e b/library/server/wsf/router/support/uri/helpers/wsf_uri_response_handler.e
index 37bb1d59..8a6ee91d 100644
--- a/library/server/wsf/router/support/uri/helpers/wsf_uri_response_handler.e
+++ b/library/server/wsf/router/support/uri/helpers/wsf_uri_response_handler.e
@@ -8,10 +8,20 @@ deferred class
 	WSF_URI_RESPONSE_HANDLER
 
 inherit
-	WSF_EXECUTE_HANDLER
+	WSF_HANDLER
 
 	WSF_URI_HANDLER
 
+feature -- Response
+
+	response (req: WSF_REQUEST): WSF_RESPONSE_MESSAGE
+		require
+			is_valid_context: is_valid_context (req)
+		deferred
+		ensure
+			Result_attached: Result /= Void
+		end
+
 note
 	copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/library/server/wsf/router/support/uri/wsf_uri_handler.e b/library/server/wsf/router/support/uri/wsf_uri_handler.e
index dc030471..346c7313 100644
--- a/library/server/wsf/router/support/uri/wsf_uri_handler.e
+++ b/library/server/wsf/router/support/uri/wsf_uri_handler.e
@@ -8,10 +8,20 @@ deferred class
 	WSF_URI_HANDLER
 
 inherit
-	WSF_EXECUTE_HANDLER
+	WSF_HANDLER
 
 	WSF_ROUTER_MAPPING_FACTORY
 
+feature -- Execution
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute `req' responding in `res'.
+		require
+			req_attached: req /= Void
+			res_attached: res /= Void
+		deferred
+		end
+		
 feature {WSF_ROUTER} -- Mapping
 
 	new_mapping (a_uri: READABLE_STRING_8): WSF_ROUTER_MAPPING
diff --git a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_response_handler.e b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_response_handler.e
index 5f1444fa..01c28f0b 100644
--- a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_response_handler.e
+++ b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_response_handler.e
@@ -8,10 +8,20 @@ deferred class
 	WSF_URI_TEMPLATE_RESPONSE_HANDLER
 
 inherit
-	WSF_EXECUTE_RESPONSE_HANDLER
+	WSF_RESPONSE_HANDLER
 
 	WSF_URI_TEMPLATE_HANDLER
 
+feature -- Response
+
+	response (req: WSF_REQUEST): WSF_RESPONSE_MESSAGE
+		require
+			is_valid_context: is_valid_context (req)
+		deferred
+		ensure
+			Result_attached: Result /= Void
+		end
+
 note
 	copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/library/server/wsf/router/support/uri_template/wsf_uri_template_handler.e b/library/server/wsf/router/support/uri_template/wsf_uri_template_handler.e
index fc9511df..c190724e 100644
--- a/library/server/wsf/router/support/uri_template/wsf_uri_template_handler.e
+++ b/library/server/wsf/router/support/uri_template/wsf_uri_template_handler.e
@@ -8,10 +8,20 @@ deferred class
 	WSF_URI_TEMPLATE_HANDLER
 
 inherit
-	WSF_EXECUTE_HANDLER
+	WSF_HANDLER
 
 	WSF_ROUTER_MAPPING_FACTORY
 
+feature -- Execution
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute `req' responding in `res'.
+		require
+			req_attached: req /= Void
+			res_attached: res /= Void
+		deferred
+		end
+
 feature {WSF_ROUTER} -- Mapping
 
 	new_mapping (a_tpl: READABLE_STRING_8): WSF_ROUTER_MAPPING
diff --git a/library/server/wsf/router/wsf_response_handler.e b/library/server/wsf/router/wsf_response_handler.e
new file mode 100644
index 00000000..11fa79ab
--- /dev/null
+++ b/library/server/wsf/router/wsf_response_handler.e
@@ -0,0 +1,24 @@
+note
+	description: "[
+			Represents the ancestor of all the WSF_ROUTER handler based on message response.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_RESPONSE_HANDLER
+
+inherit
+	WSF_HANDLER
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
diff --git a/library/server/wsf/router/wsf_routing_handler.e b/library/server/wsf/router/wsf_routing_handler.e
index 153bff9e..bd910c48 100644
--- a/library/server/wsf/router/wsf_routing_handler.e
+++ b/library/server/wsf/router/wsf_routing_handler.e
@@ -8,7 +8,7 @@ deferred class
 	WSF_ROUTING_HANDLER
 
 inherit
-	WSF_EXECUTE_HANDLER
+	WSF_HANDLER
 
 feature {NONE} -- Initialization
 
@@ -48,7 +48,10 @@ feature -- Element change
 feature -- Execution
 
 	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute request handler
+			-- Execute `req' responding in `res'.
+		require
+			req_attached: req /= Void
+			res_attached: res /= Void
 		local
 			sess: WSF_ROUTER_SESSION
 		do
@@ -60,7 +63,7 @@ feature -- Execution
 		end
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software