diff --git a/source/BaselineOfWillow/BaselineOfWillow.class.st b/source/BaselineOfWillow/BaselineOfWillow.class.st
index 06253996..a40a5265 100644
--- a/source/BaselineOfWillow/BaselineOfWillow.class.st
+++ b/source/BaselineOfWillow/BaselineOfWillow.class.st
@@ -2,12 +2,13 @@
 Metacello Baseline definition for Willow
 "
 Class {
-	#name : #BaselineOfWillow,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfWillow
+	#name : 'BaselineOfWillow',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfWillow',
+	#package : 'BaselineOfWillow'
 }
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfWillow >> baseline: spec [
 
 	<baseline>
@@ -23,30 +24,30 @@ BaselineOfWillow >> baseline: spec [
 			]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BaselineOfWillow >> projectClass [
 
 	^ MetacelloCypressBaselineProject
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfWillow >> setUpDependencies: spec [
 
 	spec
-		baseline: 'Seaside3' with: [ spec repository: 'github://SeasideSt/Seaside:v3.5.x/repository' ];
+		baseline: 'Seaside3' with: [ spec repository: 'github://SeasideSt/Seaside:v3.6.x/repository' ];
 		project: 'Seaside3-JQuery'
 			copyFrom: 'Seaside3'
 			with: [ spec loads: #('Core' 'Javascript' 'JQuery') ];
 		project: 'Seaside3-Development' copyFrom: 'Seaside3' with: [ spec loads: #('Development') ].
 
 	spec
-		baseline: 'RenoirSt' with: [ spec repository: 'github://ba-st/RenoirSt:v8/source' ];
+		baseline: 'RenoirSt' with: [ spec repository: 'github://ba-st/RenoirSt:v9/source' ];
 		project: 'RenoirSt-Deployment'
 			copyFrom: 'RenoirSt'
 			with: [ spec loads: 'Deployment-Seaside-Extensions' ].
 
 	spec
-		baseline: 'Boardwalk' with: [ spec repository: 'github://ba-st/Boardwalk:v7/source' ];
+		baseline: 'Boardwalk' with: [ spec repository: 'github://ba-st/Boardwalk:v8/source' ];
 		project: 'Boardwalk-Deployment' copyFrom: 'Boardwalk' with: [ spec loads: 'Deployment' ];
 		project: 'Boardwalk-SUnit'
 			copyFrom: 'Boardwalk'
@@ -54,7 +55,7 @@ BaselineOfWillow >> setUpDependencies: spec [
 		project: 'Boardwalk-Tools' copyFrom: 'Boardwalk' with: [ spec loads: 'Tools' ]
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfWillow >> setUpPackages: spec [
 
 	spec
diff --git a/source/BaselineOfWillow/package.st b/source/BaselineOfWillow/package.st
index 9fea6c9e..9b5bba07 100644
--- a/source/BaselineOfWillow/package.st
+++ b/source/BaselineOfWillow/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfWillow }
+Package { #name : 'BaselineOfWillow' }
diff --git a/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st b/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
index 06cb72ea..d348cf06 100644
--- a/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
+++ b/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
@@ -117,7 +117,7 @@ CombinedWebInteractionInterpreterTest >> testCloseAllDialogs [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Dialogs' }
@@ -139,7 +139,7 @@ CombinedWebInteractionInterpreterTest >> testCloseLastDialog [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Instance Creation' }
@@ -179,7 +179,7 @@ CombinedWebInteractionInterpreterTest >> testConfirmAsking [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){if(confirm("Continue?")){Willow.callServer({"url":"/","data":"1"})}});$("#button-id4").click(function(event){if(confirm("Continue?")){Willow.callServer({"url":"/","data":"3"})}});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){if(confirm("Continue?")){Willow.callServer({"dataType":"script","url":"/","data":"1"})}});$("#button-id4").click(function(event){if(confirm("Continue?")){Willow.callServer({"dataType":"script","url":"/","data":"3"})}});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -274,7 +274,7 @@ CombinedWebInteractionInterpreterTest >> testFocus [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -294,7 +294,7 @@ CombinedWebInteractionInterpreterTest >> testFocusUsing [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -356,7 +356,7 @@ CombinedWebInteractionInterpreterTest >> testOpen [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -381,7 +381,7 @@ CombinedWebInteractionInterpreterTest >> testRemove [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - CSS' }
@@ -454,7 +454,7 @@ CombinedWebInteractionInterpreterTest >> testRender [
 	self
 		assert: html
 		equals:
-			'<div id="container-id1"><input type="text"/></div><button id="button-id3" type="button">Ok</button><button id="button-id5" type="button">Cancel</button><script type="text/javascript">$("#button-id3").click(function(event){Willow.callServer({"url":"/","data":"2"})});$("#button-id5").click(function(event){Willow.callServer({"url":"/","data":"4"})});</script>'
+			'<div id="container-id1"><input type="text"/></div><button id="button-id3" type="button">Ok</button><button id="button-id5" type="button">Cancel</button><script type="text/javascript">$("#button-id3").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"2"})});$("#button-id5").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"4"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -486,7 +486,7 @@ CombinedWebInteractionInterpreterTest >> testRenderAll [
 	self
 		assert: html
 		equals:
-			'<div id="container-id1"><input type="text"/></div><div id="container-id2"><input type="number"/></div><button id="button-id4" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><script type="text/javascript">$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});$("#button-id6").click(function(event){Willow.callServer({"url":"/","data":"5"})});</script>'
+			'<div id="container-id1"><input type="text"/></div><div id="container-id2"><input type="number"/></div><button id="button-id4" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><script type="text/javascript">$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});$("#button-id6").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"5"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -510,7 +510,7 @@ CombinedWebInteractionInterpreterTest >> testScrollingIntoView [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -530,7 +530,7 @@ CombinedWebInteractionInterpreterTest >> testSerializeChildForm [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).children("form").serialize()].join("&")})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).children("form").serialize()].join("&")})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).children("form").serialize()].join("&"),"dataType":"script"})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).children("form").serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -550,7 +550,7 @@ CombinedWebInteractionInterpreterTest >> testSerializeContainerForm [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).closest("form").find(":input").serialize()].join("&")})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).closest("form").find(":input").serialize()].join("&")})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).closest("form").find(":input").serialize()].join("&"),"dataType":"script"})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).closest("form").find(":input").serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -574,7 +574,7 @@ CombinedWebInteractionInterpreterTest >> testSerializeForm [
 	self
 		assert: html
 		equals:
-			'<form accept-charset="utf-8" method="post" action="/" id="id15"></form><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$("#id15").serialize()].join("&")})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$("#id15").serialize()].join("&")})});</script>'
+			'<form accept-charset="utf-8" method="post" action="/" id="id15"></form><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$("#id15").serialize()].join("&"),"dataType":"script"})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$("#id15").serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -594,7 +594,7 @@ CombinedWebInteractionInterpreterTest >> testSerializeIt [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).serialize()].join("&")})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).serialize()].join("&")})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).serialize()].join("&"),"dataType":"script"})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -614,7 +614,7 @@ CombinedWebInteractionInterpreterTest >> testSerializeWithHiddenInputs [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).next("input:hidden").addBack().serialize()].join("&")})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).next("input:hidden").addBack().serialize()].join("&")})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).next("input:hidden").addBack().serialize()].join("&"),"dataType":"script"})});$("#button-id4").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).next("input:hidden").addBack().serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -635,7 +635,7 @@ CombinedWebInteractionInterpreterTest >> testServerDo [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -659,7 +659,7 @@ CombinedWebInteractionInterpreterTest >> testSetValueToThenTriggerChangeOf [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -683,7 +683,7 @@ CombinedWebInteractionInterpreterTest >> testSetValueToWithoutTriggeringChangeOf
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -704,7 +704,7 @@ CombinedWebInteractionInterpreterTest >> testShowLoadingNotificationDisplayingAp
 	self
 		assert: html
 		equals:
-		'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"1"})});$("#button-id4").click(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"3"})});</script>'
+		'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -723,7 +723,7 @@ CombinedWebInteractionInterpreterTest >> testShowLoadingNotificationStyledAsAll
 	self
 		assert: html
 		equals:
-		'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#willow-notification-section").html("<div>Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"1"})});$("#button-id4").click(function(event){$("#willow-notification-section").html("<div>Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"3"})});</script>'
+		'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#willow-notification-section").html("<div>Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){$("#willow-notification-section").html("<div>Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -749,7 +749,7 @@ CombinedWebInteractionInterpreterTest >> testShowWhileCallingServerToRender [
 	self
 		assert: html
 		equals:
-			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><div id="container-id1"></div><script type="text/javascript">$("#button-id3").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"url":"/","data":"2"})});$("#button-id6").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"url":"/","data":"5"})});</script>'
+			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><div id="container-id1"></div><script type="text/javascript">$("#button-id3").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"dataType":"script","url":"/","data":"2"})});$("#button-id6").click(function(event){$("#container-id1").html("Loading...");Willow.callServer({"dataType":"script","url":"/","data":"5"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -775,7 +775,7 @@ CombinedWebInteractionInterpreterTest >> testSubmitForm [
 	self
 		assert: html
 		equals:
-			'<form accept-charset="utf-8" method="post" action="/" id="15"></form><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<form accept-charset="utf-8" method="post" action="/" id="15"></form><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -795,7 +795,7 @@ CombinedWebInteractionInterpreterTest >> testSubmitFormStyledAs [
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"3"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -820,7 +820,7 @@ CombinedWebInteractionInterpreterTest >> testTemporarilyDisableAndTransformInto
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){var componentToDisable=$("#15");if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"url":"/","data":"1"})}});$("#button-id4").click(function(event){var componentToDisable=$("#15");if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"url":"/","data":"3"})}});</script>'
+			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){var componentToDisable=$("#15");if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"dataType":"script","url":"/","data":"1"})}});$("#button-id4").click(function(event){var componentToDisable=$("#15");if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"dataType":"script","url":"/","data":"3"})}});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -840,7 +840,7 @@ CombinedWebInteractionInterpreterTest >> testTemporarilyDisableAndTransformSelfI
 	self
 		assert: html
 		equals:
-			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){var componentToDisable=$(this);if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"url":"/","data":"1"})}});$("#button-id4").click(function(event){var componentToDisable=$(this);if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"url":"/","data":"3"})}});</script>'
+			'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){var componentToDisable=$(this);if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"dataType":"script","url":"/","data":"1"})}});$("#button-id4").click(function(event){var componentToDisable=$(this);if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"dataType":"script","url":"/","data":"3"})}});</script>'
 ]
 
 { #category : 'tests - Configuring - CSS' }
@@ -1006,7 +1006,7 @@ CombinedWebInteractionInterpreterTest >> testWithOnlyWhenServerDo [
 	self
 		assert: html
 		equals:
-			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><script type="text/javascript">$("#button-id3").click(function(event){if(dataFromUserAgent>3){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(dataFromUserAgent))].join("&")})}});$("#button-id6").click(function(event){if(dataFromUserAgent>3){Willow.callServer({"type":"POST","url":"/","data":["4","5="+encodeURIComponent(JSON.stringify(dataFromUserAgent))].join("&")})}});</script>'
+			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><script type="text/javascript">$("#button-id3").click(function(event){if(dataFromUserAgent>3){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(dataFromUserAgent))].join("&"),"dataType":"script"})}});$("#button-id6").click(function(event){if(dataFromUserAgent>3){Willow.callServer({"type":"POST","url":"/","data":["4","5="+encodeURIComponent(JSON.stringify(dataFromUserAgent))].join("&"),"dataType":"script"})}});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -1027,5 +1027,5 @@ CombinedWebInteractionInterpreterTest >> testWithServerDo [
 	self
 		assert: html
 		equals:
-			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><script type="text/javascript">$("#button-id3").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(["firstThing","secondStuff"]))].join("&")})});$("#button-id6").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["4","5="+encodeURIComponent(JSON.stringify(["firstThing","secondStuff"]))].join("&")})});</script>'
+			'<button id="button-id3" type="button">Ok</button><button id="button-id6" type="button">Cancel</button><script type="text/javascript">$("#button-id3").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(["firstThing","secondStuff"]))].join("&"),"dataType":"script"})});$("#button-id6").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["4","5="+encodeURIComponent(JSON.stringify(["firstThing","secondStuff"]))].join("&"),"dataType":"script"})});</script>'
 ]
diff --git a/source/Willow-Core-Tests/Html5ComponentSupplierTest.class.st b/source/Willow-Core-Tests/Html5ComponentSupplierTest.class.st
index bd112951..196c3119 100644
--- a/source/Willow-Core-Tests/Html5ComponentSupplierTest.class.st
+++ b/source/Willow-Core-Tests/Html5ComponentSupplierTest.class.st
@@ -91,7 +91,7 @@ Html5ComponentSupplierTest >> testDelayedViewShowingWhileEvaluatingThenRendering
 
 	self
 		assertRenderingOf: [ :supplier | supplier delayedViewShowing: 'Loading...' whileEvaluating: [  ] thenRendering: 'Done!' ]
-		equals: '<div id="container-id1">Loading...</div><script type="text/javascript">Willow.callServer({"url":"/","data":"2"});</script>'
+		equals: '<div id="container-id1">Loading...</div><script type="text/javascript">Willow.callServer({"dataType":"script","url":"/","data":"2"});</script>'
 ]
 
 { #category : 'tests-Supplying' }
diff --git a/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st b/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
index f854cb26..50ecf1c2 100644
--- a/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
+++ b/source/Willow-Core-Tests/PeriodicallyRenderedWebViewTest.class.st
@@ -96,5 +96,5 @@ PeriodicallyRenderedWebViewTest >> testScriptToRefreshAndRenderContentOn [
 	self
 		assert: html
 		equals:
-		'<div id="id3"></div><script type="text/javascript">$("#id3").html("Count:  2<br/>\x3Cscript type=\"text/javascript\">$.ajax({\"url\":\"/\",\"data\":\"2\"});\x3C/script>");</script>'
+		'<div id="id2"></div><script type="text/javascript">$("#id2").html("Count:  2<br/>\x3Cscript type=\"text/javascript\">$.ajax({\"url\":\"/\",\"data\":\"3\"});\x3C/script>");</script>'
 ]
diff --git a/source/Willow-Core-Tests/WebInteractionInterpreterTest.class.st b/source/Willow-Core-Tests/WebInteractionInterpreterTest.class.st
index 7f95a37a..8d9ad5f8 100644
--- a/source/Willow-Core-Tests/WebInteractionInterpreterTest.class.st
+++ b/source/Willow-Core-Tests/WebInteractionInterpreterTest.class.st
@@ -142,7 +142,7 @@ WebInteractionInterpreterTest >> testCloseAllDialogs [
 	self
 		assert: html
 		equals:
-			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Dialogs' }
@@ -156,7 +156,7 @@ WebInteractionInterpreterTest >> testCloseLastDialog [
 	self
 		assert: html
 		equals:
-			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -170,7 +170,7 @@ WebInteractionInterpreterTest >> testConfirmAsking [
 	self
 		assert: html
 		equals:
-			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){if(confirm("Continue?")){Willow.callServer({"url":"/","data":"1"})}});</script>'
+			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){if(confirm("Continue?")){Willow.callServer({"dataType":"script","url":"/","data":"1"})}});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -267,7 +267,7 @@ WebInteractionInterpreterTest >> testFocus [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -283,7 +283,7 @@ WebInteractionInterpreterTest >> testFocusUsing [
 	self
 		assert: html
 		equals:
-			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").change(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").change(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Instance Creation' }
@@ -308,7 +308,7 @@ WebInteractionInterpreterTest >> testForInstantEvaluation [
 	self
 		assert: html
 		equals:
-			'<input type="text"/><script type="text/javascript">Willow.callServer({"url":"/","data":"1"});</script>'
+			'<input type="text"/><script type="text/javascript">Willow.callServer({"dataType":"script","url":"/","data":"1"});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -350,7 +350,7 @@ WebInteractionInterpreterTest >> testOpen [
 	self
 		assert: html
 		equals:
-			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -374,7 +374,7 @@ WebInteractionInterpreterTest >> testRemove [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - CSS' }
@@ -437,7 +437,7 @@ WebInteractionInterpreterTest >> testRender [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><div id="container-id1">15</div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["2",$(this).serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><div id="container-id1">15</div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["2",$(this).serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -472,7 +472,7 @@ WebInteractionInterpreterTest >> testRenderAll [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><div id="container-id1">15</div><div id="container-id2"></div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><div id="container-id1">15</div><div id="container-id2"></div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -524,7 +524,7 @@ WebInteractionInterpreterTest >> testScrollingIntoView [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -548,7 +548,7 @@ WebInteractionInterpreterTest >> testSerializeChildForm [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).children("form").serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).children("form").serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -572,7 +572,7 @@ WebInteractionInterpreterTest >> testSerializeContainerForm [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).closest("form").find(":input").serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).closest("form").find(":input").serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -598,7 +598,7 @@ WebInteractionInterpreterTest >> testSerializeForm [
 	self
 		assert: html
 		equals:
-			'<form accept-charset="utf-8" method="post" action="/" id="15"></form><a id="16"></a><script type="text/javascript">$("#16").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$("#15").serialize()].join("&")})});</script>'
+			'<form accept-charset="utf-8" method="post" action="/" id="15"></form><a id="16"></a><script type="text/javascript">$("#16").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$("#15").serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -622,7 +622,7 @@ WebInteractionInterpreterTest >> testSerializeIt [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -669,7 +669,7 @@ WebInteractionInterpreterTest >> testSerializeWithHiddenInputs [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).next("input:hidden").addBack().serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["1",$(this).next("input:hidden").addBack().serialize()].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -683,7 +683,7 @@ WebInteractionInterpreterTest >> testServerDo [
 	self
 		assert: html
 		equals:
-			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -709,7 +709,7 @@ WebInteractionInterpreterTest >> testSetValueToThenTriggerChangeOf [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -735,7 +735,7 @@ WebInteractionInterpreterTest >> testSetValueToWithoutTriggeringChangeOf [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -753,7 +753,7 @@ WebInteractionInterpreterTest >> testShowLoadingNotificationDisplayingApplying [
 	self
 		assert: html
 		equals:
-		'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").change(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"1"})});</script>'
+		'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").change(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -769,7 +769,7 @@ WebInteractionInterpreterTest >> testShowLoadingNotificationStyledAsAll [
 	self
 		assert: html
 		equals:
-		'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").change(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"1"})});</script>'
+		'<input id="input-id2" type="text"/><script type="text/javascript">$("#input-id2").change(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -794,7 +794,7 @@ WebInteractionInterpreterTest >> testShowWhileCallingServerToRender [
 	self
 		assert: html
 		equals:
-			'<a id="a-id3">Search!</a><div id="container-id1"></div><script type="text/javascript">$("#a-id3").click(function(event){$("#container-id1").html("Searching...");Willow.callServer({"url":"/","data":"2"})});</script>'
+			'<a id="a-id3">Search!</a><div id="container-id1"></div><script type="text/javascript">$("#a-id3").click(function(event){$("#container-id1").html("Searching...");Willow.callServer({"dataType":"script","url":"/","data":"2"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -820,7 +820,7 @@ WebInteractionInterpreterTest >> testSubmitForm [
 	self
 		assert: html
 		equals:
-			'<form accept-charset="utf-8" method="post" action="/" id="15"></form><a id="16"></a><script type="text/javascript">$("#16").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+			'<form accept-charset="utf-8" method="post" action="/" id="15"></form><a id="16"></a><script type="text/javascript">$("#16").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - Serialization' }
@@ -830,21 +830,19 @@ WebInteractionInterpreterTest >> testSubmitFormStyledAs [
 
 	interpreter := self clickInterpreter.
 
-	html := self
-		renderUsing: [ :canvas | 
-			| anchor |
+	html := self renderUsing: [ :canvas |
+			        | anchor |
 
-			canvas form apply: [ :form | form addClass willow ].
-			anchor := canvas anchor.
-			anchor id: '16'.
-			interpreter submitFormStyledAs: Classification >> #willow.
-			anchor interactUsing: interpreter
-			].
+			        canvas form apply: [ :form | form addClass willow ].
+			        anchor := canvas anchor.
+			        anchor id: '16'.
+			        interpreter submitFormStyledAs: Classification >> #willow.
+			        anchor interactUsing: interpreter
+		        ].
 
 	self
 		assert: html
-		equals:
-			'<form accept-charset="utf-8" method="post" action="/" class="willow"></form><a id="16"></a><script type="text/javascript">$("#16").click(function(event){Willow.callServer({"url":"/","data":"1"})});</script>'
+		equals: '<form accept-charset="utf-8" method="post" action="/" class="willow"></form><a id="16"></a><script type="text/javascript">$("#16").click(function(event){Willow.callServer({"dataType":"script","url":"/","data":"1"})});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -867,7 +865,7 @@ WebInteractionInterpreterTest >> testTemporarilyDisableAndTransformInto [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){var componentToDisable=$("#15");if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"url":"/","data":"1"})}});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){var componentToDisable=$("#15");if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"dataType":"script","url":"/","data":"1"})}});</script>'
 ]
 
 { #category : 'tests - Configuring - DOM' }
@@ -890,7 +888,7 @@ WebInteractionInterpreterTest >> testTemporarilyDisableAndTransformSelfInto [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){var componentToDisable=$(this);if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"url":"/","data":"1"})}});</script>'
+			'<input id="15" type="text"/><script type="text/javascript">$("#15").change(function(event){var componentToDisable=$(this);if(componentToDisable.attr("data-willow-events-disabled")!=="disabled"){componentToDisable.attr("data-willow-events-disabled","disabled").addClass("willow-disabled-component").attr("data-original-html",componentToDisable.html()).attr("disabled",true).html("Loading...");Willow.callServer({"complete":function(){componentToDisable.removeAttr("data-willow-events-disabled").attr("disabled",false).removeClass("willow-disabled-component").html(componentToDisable.attr("data-original-html"))},"dataType":"script","url":"/","data":"1"})}});</script>'
 ]
 
 { #category : 'tests - Configuring - CSS' }
@@ -1031,7 +1029,7 @@ WebInteractionInterpreterTest >> testWithOnlyWhenServerDo [
 	self
 		assert: html
 		equals:
-			'<input id="input-id3" type="text"/><script type="text/javascript">$("#input-id3").click(function(event){if(dataFromUserAgent>3){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(dataFromUserAgent))].join("&")})}});</script>'
+			'<input id="input-id3" type="text"/><script type="text/javascript">$("#input-id3").click(function(event){if(dataFromUserAgent>3){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(dataFromUserAgent))].join("&"),"dataType":"script"})}});</script>'
 ]
 
 { #category : 'tests - Configuring' }
@@ -1045,7 +1043,7 @@ WebInteractionInterpreterTest >> testWithServerDo [
 	self
 		assert: html
 		equals:
-			'<input id="input-id3" type="text"/><script type="text/javascript">$("#input-id3").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(["firstThing","secondStuff"]))].join("&")})});</script>'
+			'<input id="input-id3" type="text"/><script type="text/javascript">$("#input-id3").click(function(event){Willow.callServer({"type":"POST","url":"/","data":["1","2="+encodeURIComponent(JSON.stringify(["firstThing","secondStuff"]))].join("&"),"dataType":"script"})});</script>'
 ]
 
 { #category : 'tests - Instance Creation' }
diff --git a/source/Willow-Core/JSConcatenateBefore.class.st b/source/Willow-Core/JSConcatenateBefore.class.st
index 01cdf971..883d1003 100644
--- a/source/Willow-Core/JSConcatenateBefore.class.st
+++ b/source/Willow-Core/JSConcatenateBefore.class.st
@@ -7,10 +7,9 @@ Class {
 }
 
 { #category : 'printing' }
-JSConcatenateBefore >> javascriptContentOn: aStream [
+JSConcatenateBefore >> javascriptContentOn: aRenderer [
 
-	aStream
-		javascript: self statement;
-		nextPut: $;.
-	super javascriptContentOn: aStream
+	aRenderer render: self statement.
+	aRenderer document separator.
+	super javascriptContentOn: aRenderer
 ]
diff --git a/source/Willow-Core/WillowJavascriptNamespace.class.st b/source/Willow-Core/WillowJavascriptNamespace.class.st
index d62c093b..8dfdcb35 100644
--- a/source/Willow-Core/WillowJavascriptNamespace.class.st
+++ b/source/Willow-Core/WillowJavascriptNamespace.class.st
@@ -22,9 +22,9 @@ WillowJavascriptNamespace >> handleAjaxErrorCallFunction [
 ]
 
 { #category : 'printing' }
-WillowJavascriptNamespace >> javascriptContentOn: aStream [
+WillowJavascriptNamespace >> javascriptContentOn: aRenderer [
 
-	aStream nextPutAll: 'Willow'
+	aRenderer document identifier: 'Willow'
 ]
 
 { #category : 'Accessing' }