diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e
index ef6882d9..2b653222 100644
--- a/examples/widgetapp/sample_page.e
+++ b/examples/widgetapp/sample_page.e
@@ -26,7 +26,7 @@ feature
 		do
 			create textbox1.make ("txtBox1", "1")
 			create textbox2.make ("txtBox2", "2")
-			button1 := create {WSF_BUTTON_CONTROL}.make ("sample_button1", "SUM")
+			create button1.make ("sample_button1", "SUM")
 			create textbox_result.make ("txtBox3", "")
 			button1.set_click_event (agent handle_click)
 			create panel.make ("panel")
@@ -37,12 +37,9 @@ feature
 			control := panel
 		end
 
-	handle_click (context: WSF_PAGE_CONTROL)
+	handle_click
 		do
-			if attached {SAMPLE_PAGE} context as sp then
-
-				sp.textbox_result.set_text (textbox1.text + " + " + textbox2.text+" = "+ (textbox1.text.to_integer_16+textbox2.text.to_integer_16).out)
-			end
+			textbox_result.set_text (textbox1.text + " + " + textbox2.text + " = " + (textbox1.text.to_integer_16 + textbox2.text.to_integer_16).out)
 		end
 
 	process
diff --git a/library/server/wsf_html/webcontrol/wsf_button_control.e b/library/server/wsf_html/webcontrol/wsf_button_control.e
index ebb1b97b..ffab2c78 100644
--- a/library/server/wsf_html/webcontrol/wsf_button_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_button_control.e
@@ -40,15 +40,15 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
 
 feature --EVENT HANDLING
 
-	set_click_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]])
+	set_click_event (e: attached like click_event)
 		do
 			click_event := e
 		end
 
-	handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL)
+	handle_callback (cname: STRING; event: STRING)
 		do
 			if Current.control_name.is_equal (cname) and attached click_event as cevent then
-				cevent.call ([page])
+				cevent.call ([])
 			end
 		end
 
@@ -68,6 +68,6 @@ feature
 
 	text: STRING
 
-	click_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]
+	click_event: detachable PROCEDURE [ANY, TUPLE []]
 
 end
diff --git a/library/server/wsf_html/webcontrol/wsf_control.e b/library/server/wsf_html/webcontrol/wsf_control.e
index 9ad4dbef..380ce181 100644
--- a/library/server/wsf_html/webcontrol/wsf_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_control.e
@@ -38,7 +38,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
 
 feature --EVENT HANDLING
 
-	handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL)
+	handle_callback (cname: STRING; event: STRING)
 		deferred
 		end
 
diff --git a/library/server/wsf_html/webcontrol/wsf_multi_control.e b/library/server/wsf_html/webcontrol/wsf_multi_control.e
index edde597d..71bc87d0 100644
--- a/library/server/wsf_html/webcontrol/wsf_multi_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_multi_control.e
@@ -67,14 +67,14 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
 
 feature --EVENT HANDLING
 
-	handle_callback (event: STRING; cname: STRING; page: WSF_PAGE_CONTROL)
+	handle_callback (event: STRING; cname: STRING)
 		do
 			if equal (cname, control_name) then
 			else
 				across
 					controls as c
 				loop
-					c.item.handle_callback (event, cname, page)
+					c.item.handle_callback (event, cname)
 				end
 			end
 		end
diff --git a/library/server/wsf_html/webcontrol/wsf_page_control.e b/library/server/wsf_html/webcontrol/wsf_page_control.e
index acbc2e54..dd454754 100644
--- a/library/server/wsf_html/webcontrol/wsf_page_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_page_control.e
@@ -52,7 +52,7 @@ feature
 				if attached {JSON_OBJECT} json_parser.parse_json as sp then
 					control.load_state (sp)
 				end
-				control.handle_callback (control_name, event, Current)
+				control.handle_callback (control_name, event)
 				create new_states.make
 				control.read_state (new_states)
 				response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>)
diff --git a/library/server/wsf_html/webcontrol/wsf_text_control.e b/library/server/wsf_html/webcontrol/wsf_text_control.e
index 9af033fa..15e0b8a5 100644
--- a/library/server/wsf_html/webcontrol/wsf_text_control.e
+++ b/library/server/wsf_html/webcontrol/wsf_text_control.e
@@ -41,16 +41,16 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
 feature --EVENT HANDLING
 
 
-	set_change_event (e: PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]])
+	set_change_event (e:  attached like change_event)
 		do
 			change_event := e
 		end
 
-	handle_callback (cname: STRING; event: STRING; page: WSF_PAGE_CONTROL)
+	handle_callback (cname: STRING; event: STRING)
 		do
 			if Current.control_name.is_equal (cname) and attached change_event as cevent then
 				if event.is_equal ("change") then
-					cevent.call ([page])
+					cevent.call ([])
 				end
 			end
 		end
@@ -71,6 +71,6 @@ feature
 
 	text: STRING
 
-	change_event: detachable PROCEDURE [ANY, TUPLE [WSF_PAGE_CONTROL]]
+	change_event: detachable PROCEDURE [ANY, TUPLE []]
 
 end