diff --git a/examples/restbucksCRUD/client/client-safe.ecf b/examples/restbucksCRUD/client/client-safe.ecf
index 32ad3e72..11ce67ad 100644
--- a/examples/restbucksCRUD/client/client-safe.ecf
+++ b/examples/restbucksCRUD/client/client-safe.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true"  void_safety="all">
 		</option>
+		<setting name="console_application" value="true"/>
 		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http_client" location="..\..\..\library\network\http_client\http_client-safe.ecf" readonly="false"/>
diff --git a/examples/restbucksCRUD/client/client.ecf b/examples/restbucksCRUD/client/client.ecf
index 7fdfc635..c8feff93 100644
--- a/examples/restbucksCRUD/client/client.ecf
+++ b/examples/restbucksCRUD/client/client.ecf
@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true"  void_safety="none">
 		</option>
+		<setting name="console_application" value="true"/>
 		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http_client" location="..\..\..\library\network\http_client\http_client.ecf"/>
diff --git a/examples/restbucksCRUD/client/src/restbuck_client.e b/examples/restbucksCRUD/client/src/restbuck_client.e
index 56a82390..2227690f 100644
--- a/examples/restbucksCRUD/client/src/restbuck_client.e
+++ b/examples/restbucksCRUD/client/src/restbuck_client.e
@@ -15,13 +15,13 @@ feature {NONE} -- Initialization
 	make
 			-- Initialize `Current'.
 		local
-			h: LIBCURL_HTTP_CLIENT
+			h: DEFAULT_HTTP_CLIENT
 			sess: HTTP_CLIENT_SESSION
 			resp : detachable HTTP_CLIENT_RESPONSE
 			l_location : detachable READABLE_STRING_8
 			body : STRING
 		do
-			create h.make
+			create h
 			sess := h.new_session ("http://127.0.0.1:9090")
 -- Uncomment the following 2 lines, if you use fiddler2 web debugging tool
 --			sess.set_is_debug (True)
diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf
index 368a69c0..78e1e6aa 100644
--- a/examples/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/restbucksCRUD/restbucks-safe.ecf
@@ -8,7 +8,8 @@
 		</file_rule>
 		<option void_safety="all">
 		</option>
-		<setting name="concurrency" value="scoop"/>
+		<setting name="console_application" value="true"/>
+		<setting name="concurrency" value="none"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="conneg" location="..\..\library\network\protocol\content_negotiation\conneg-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf" readonly="false"/>
diff --git a/examples/restbucksCRUD/server.ini b/examples/restbucksCRUD/server.ini
new file mode 100644
index 00000000..abab4e03
--- /dev/null
+++ b/examples/restbucksCRUD/server.ini
@@ -0,0 +1,2 @@
+port=9090
+verbose=true
diff --git a/examples/restbucksCRUD/src/restbucks_server.e b/examples/restbucksCRUD/src/restbucks_server.e
index 68b2e4c4..c8676516 100644
--- a/examples/restbucksCRUD/src/restbucks_server.e
+++ b/examples/restbucksCRUD/src/restbucks_server.e
@@ -16,11 +16,12 @@ feature {NONE} -- Initialization
 	make
 		do
 			set_service_option ("port", 9090)
+			import_service_options (create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI}.make_from_file ("server.ini"))
 			make_and_launch
 		end
 
 note
-	copyright: "2011-2015, Javier Velilla and others"
+	copyright: "2011-2017, Javier Velilla and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software