diff --git a/examples/widgetapp/application.e b/examples/widgetapp/application.e
index 33253619..de75b387 100644
--- a/examples/widgetapp/application.e
+++ b/examples/widgetapp/application.e
@@ -101,42 +101,42 @@ feature -- Helper: mapping
 
 feature -- Execution
 
-	execute_hello (req: WSF_REQUEST; res: WSF_RESPONSE)
+	execute_hello (request:  WSF_REQUEST; response: WSF_RESPONSE)
 		local
 			page: SAMPLE_PAGE
 		do
 				-- To send a response we need to setup, the status code and
 				-- the response headers.
-			create page.make (req, res)
+			create page.make (request, response)
 			page.execute
 		end
 
-	grid_demo (req: WSF_REQUEST; res: WSF_RESPONSE)
+	grid_demo (request: WSF_REQUEST; response: WSF_RESPONSE)
 		local
 			page: GRID_PAGE
 		do
 				-- To send a response we need to setup, the status code and
 				-- the response headers.
-			create page.make (req, res)
+			create page.make (request, response)
 			page.execute
 		end
 
-	repeater_demo (req: WSF_REQUEST; res: WSF_RESPONSE)
+	repeater_demo (request: WSF_REQUEST; response: WSF_RESPONSE)
 		local
 			page: REPEATER_PAGE
 		do
 				-- To send a response we need to setup, the status code and
 				-- the response headers.
-			create page.make (req, res)
+			create page.make (request, response)
 			page.execute
 		end
 
-	load_file (name: STRING; req: WSF_REQUEST; res: WSF_RESPONSE)
+	load_file (name: STRING; request: WSF_REQUEST; response: WSF_RESPONSE)
 		local
 			f: WSF_FILE_RESPONSE
 		do
 			create f.make_html (name)
-			res.send (f)
+			response.send (f)
 		end
 
 end
diff --git a/examples/widgetapp/widgetapp.ecf b/examples/widgetapp/widgetapp.ecf
index 7cc3767d..7611e274 100644
--- a/examples/widgetapp/widgetapp.ecf
+++ b/examples/widgetapp/widgetapp.ecf
@@ -6,14 +6,14 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all"  syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
-		<library name="wsf_html" location="..\..\library\server\wsf_html\wsf_html-safe.ecf" readonly="false"/>
+		<library name="wsf_js_widget" location="..\..\library\server\wsf_js_widget\wsf_js_widget-safe.ecf" readonly="false"/>
 	</target>
 	<target name="widgetapp_nino" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
diff --git a/library/server/wsf_html/wsf_html-safe.ecf b/library/server/wsf_html/wsf_html-safe.ecf
index d441e72f..e1b2baca 100644
--- a/library/server/wsf_html/wsf_html-safe.ecf
+++ b/library/server/wsf_html/wsf_html-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="wsf_html" uuid="6AAAE037-7E66-4F5D-BED0-0042245C26BC" library_target="wsf_html">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="wsf_html" uuid="6AAAE037-7E66-4F5D-BED0-0042245C26BC" library_target="wsf_html">
 	<target name="wsf_html">
 		<root all_classes="true"/>
 		<file_rule>
@@ -11,22 +11,11 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
-		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
-		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
-		<library name="pcre" location="$ISE_EIFFEL\unstable\library\text\regexp\pcre\pcre-safe.ecf"/>
 		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="..\wsf\wsf-safe.ecf"/>
 		<cluster name="api" location=".\api\" recursive="true"/>
 		<cluster name="css" location=".\css\" recursive="true"/>
 		<cluster name="form" location=".\form\" recursive="true"/>
-		<cluster name="webcontrol" location=".\webcontrol\">
-			<cluster name="validators" location=".\webcontrol\validators\"/>
-			<cluster name="input" location=".\webcontrol\input\"/>
-			<cluster name="grid" location=".\webcontrol\grid\"/>
-			<cluster name="autocompletions" location=".\webcontrol\autocompletions\"/>
-			<cluster name="navbar" location=".\webcontrol\navbar\"/>
-			<cluster name="progressbar" location=".\webcontrol\progressbar\"/>
-		</cluster>
 		<cluster name="widget" location=".\widget\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf_html/webcontrol/autocompletions/wsf_autocompletion.e b/library/server/wsf_js_widget/autocompletions/wsf_autocompletion.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/autocompletions/wsf_autocompletion.e
rename to library/server/wsf_js_widget/autocompletions/wsf_autocompletion.e
diff --git a/library/server/wsf_html/webcontrol/autocompletions/wsf_simple_autocompletion.e b/library/server/wsf_js_widget/autocompletions/wsf_simple_autocompletion.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/autocompletions/wsf_simple_autocompletion.e
rename to library/server/wsf_js_widget/autocompletions/wsf_simple_autocompletion.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_datasource.e b/library/server/wsf_js_widget/grid/wsf_datasource.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_datasource.e
rename to library/server/wsf_js_widget/grid/wsf_datasource.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_entity.e b/library/server/wsf_js_widget/grid/wsf_entity.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_entity.e
rename to library/server/wsf_js_widget/grid/wsf_entity.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_grid_column.e b/library/server/wsf_js_widget/grid/wsf_grid_column.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_grid_column.e
rename to library/server/wsf_js_widget/grid/wsf_grid_column.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_grid_control.e b/library/server/wsf_js_widget/grid/wsf_grid_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_grid_control.e
rename to library/server/wsf_js_widget/grid/wsf_grid_control.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e b/library/server/wsf_js_widget/grid/wsf_grid_image_column.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e
rename to library/server/wsf_js_widget/grid/wsf_grid_image_column.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e b/library/server/wsf_js_widget/grid/wsf_pagable_datasource.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e
rename to library/server/wsf_js_widget/grid/wsf_pagable_datasource.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e b/library/server/wsf_js_widget/grid/wsf_pagination_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e
rename to library/server/wsf_js_widget/grid/wsf_pagination_control.e
diff --git a/library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e b/library/server/wsf_js_widget/grid/wsf_repeater_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e
rename to library/server/wsf_js_widget/grid/wsf_repeater_control.e
diff --git a/library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e b/library/server/wsf_js_widget/input/wsf_autocomplete_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e
rename to library/server/wsf_js_widget/input/wsf_autocomplete_control.e
diff --git a/library/server/wsf_html/webcontrol/input/wsf_checkbox_control.e b/library/server/wsf_js_widget/input/wsf_checkbox_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/input/wsf_checkbox_control.e
rename to library/server/wsf_js_widget/input/wsf_checkbox_control.e
diff --git a/library/server/wsf_html/webcontrol/input/wsf_checkbox_list_control.e b/library/server/wsf_js_widget/input/wsf_checkbox_list_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/input/wsf_checkbox_list_control.e
rename to library/server/wsf_js_widget/input/wsf_checkbox_list_control.e
diff --git a/library/server/wsf_html/webcontrol/input/wsf_input_control.e b/library/server/wsf_js_widget/input/wsf_input_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/input/wsf_input_control.e
rename to library/server/wsf_js_widget/input/wsf_input_control.e
diff --git a/library/server/wsf_html/webcontrol/input/wsf_password_control.e b/library/server/wsf_js_widget/input/wsf_password_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/input/wsf_password_control.e
rename to library/server/wsf_js_widget/input/wsf_password_control.e
diff --git a/library/server/wsf_html/webcontrol/input/wsf_textarea_control.e b/library/server/wsf_js_widget/input/wsf_textarea_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/input/wsf_textarea_control.e
rename to library/server/wsf_js_widget/input/wsf_textarea_control.e
diff --git a/library/server/wsf_html/webcontrol/navbar/wsf_navbar_control.e b/library/server/wsf_js_widget/navbar/wsf_navbar_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/navbar/wsf_navbar_control.e
rename to library/server/wsf_js_widget/navbar/wsf_navbar_control.e
diff --git a/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e b/library/server/wsf_js_widget/progressbar/wsf_progress_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e
rename to library/server/wsf_js_widget/progressbar/wsf_progress_control.e
diff --git a/library/server/wsf_html/webcontrol/progressbar/wsf_progresssource.e b/library/server/wsf_js_widget/progressbar/wsf_progresssource.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/progressbar/wsf_progresssource.e
rename to library/server/wsf_js_widget/progressbar/wsf_progresssource.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e b/library/server/wsf_js_widget/validators/wsf_decimal_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_decimal_validator.e
rename to library/server/wsf_js_widget/validators/wsf_decimal_validator.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_email_validator.e b/library/server/wsf_js_widget/validators/wsf_email_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_email_validator.e
rename to library/server/wsf_js_widget/validators/wsf_email_validator.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_max_validator.e b/library/server/wsf_js_widget/validators/wsf_max_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_max_validator.e
rename to library/server/wsf_js_widget/validators/wsf_max_validator.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_min_validator.e b/library/server/wsf_js_widget/validators/wsf_min_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_min_validator.e
rename to library/server/wsf_js_widget/validators/wsf_min_validator.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e b/library/server/wsf_js_widget/validators/wsf_phone_number_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_phone_number_validator.e
rename to library/server/wsf_js_widget/validators/wsf_phone_number_validator.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e b/library/server/wsf_js_widget/validators/wsf_regexp_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_regexp_validator.e
rename to library/server/wsf_js_widget/validators/wsf_regexp_validator.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_validatable.e b/library/server/wsf_js_widget/validators/wsf_validatable.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_validatable.e
rename to library/server/wsf_js_widget/validators/wsf_validatable.e
diff --git a/library/server/wsf_html/webcontrol/validators/wsf_validator.e b/library/server/wsf_js_widget/validators/wsf_validator.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/validators/wsf_validator.e
rename to library/server/wsf_js_widget/validators/wsf_validator.e
diff --git a/library/server/wsf_html/webcontrol/wsf_basic_control.e b/library/server/wsf_js_widget/webcontrol/wsf_basic_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_basic_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_basic_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_js_widget/webcontrol/wsf_button_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_button_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_button_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_js_widget/webcontrol/wsf_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_form_control.e b/library/server/wsf_js_widget/webcontrol/wsf_form_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_form_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_form_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_form_element_control.e b/library/server/wsf_js_widget/webcontrol/wsf_form_element_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_form_element_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_form_element_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_html_control.e b/library/server/wsf_js_widget/webcontrol/wsf_html_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_html_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_html_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_js_widget/webcontrol/wsf_multi_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_multi_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_multi_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_js_widget/webcontrol/wsf_page_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_page_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_page_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_stateless_control.e b/library/server/wsf_js_widget/webcontrol/wsf_stateless_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_stateless_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_stateless_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_stateless_multi_control.e b/library/server/wsf_js_widget/webcontrol/wsf_stateless_multi_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_stateless_multi_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_stateless_multi_control.e
diff --git a/library/server/wsf_html/webcontrol/wsf_value_control.e b/library/server/wsf_js_widget/webcontrol/wsf_value_control.e
similarity index 100%
rename from library/server/wsf_html/webcontrol/wsf_value_control.e
rename to library/server/wsf_js_widget/webcontrol/wsf_value_control.e
diff --git a/library/server/wsf_js_widget/wsf_js_widget-safe.ecf b/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
new file mode 100644
index 00000000..e45fa443
--- /dev/null
+++ b/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="wsf_js_widget" uuid="660D6D82-2218-11E3-86B1-F23C91AEC05E" library_target="wsf_js_widget">
+	<target name="wsf_js_widget">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
+		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
+		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
+		<library name="pcre" location="$ISE_EIFFEL\unstable\library\text\regexp\pcre\pcre-safe.ecf"/>
+		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template-safe.ecf"/>
+		<library name="wsf" location="..\wsf\wsf-safe.ecf"/>
+		<cluster name="webcontrol" location=".\webcontrol\"/>
+		<cluster name="validators" location=".\validators\"/>
+		<cluster name="input" location=".\input\"/>
+		<cluster name="grid" location=".\grid\"/>
+		<cluster name="autocompletions" location=".\autocompletions\"/>
+		<cluster name="navbar" location=".\navbar\"/>
+		<cluster name="progressbar" location=".\progressbar\"/>
+	</target>
+</system>
diff --git a/library/server/wsf_js_widget/wsf_js_widget.ecf b/library/server/wsf_js_widget/wsf_js_widget.ecf
new file mode 100644
index 00000000..eddf8a7c
--- /dev/null
+++ b/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="wsf_js_widget" uuid="660D6D82-2218-11E3-86B1-F23C91AEC05E" library_target="wsf_js_widget">
+	<target name="wsf_js_widget">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
+		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
+		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json.ecf"/>
+		<library name="pcre" location="$ISE_EIFFEL\unstable\library\text\regexp\pcre\pcre.ecf"/>
+		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template.ecf"/>
+		<library name="wsf" location="..\wsf\wsf.ecf"/>
+		<cluster name="webcontrol" location=".\webcontrol\"/>
+		<cluster name="validators" location=".\validators\"/>
+		<cluster name="input" location=".\input\"/>
+		<cluster name="grid" location=".\grid\"/>
+		<cluster name="autocompletions" location=".\autocompletions\"/>
+		<cluster name="navbar" location=".\navbar\"/>
+		<cluster name="progressbar" location=".\progressbar\"/>
+	</target>
+</system>