diff --git a/examples/simple_ssl/application.e b/examples/simple_ssl/application.e
index e890c187..8490b504 100644
--- a/examples/simple_ssl/application.e
+++ b/examples/simple_ssl/application.e
@@ -1,13 +1,13 @@
 note
-	description : "simple application root class"
-	date        : "$Date$"
-	revision    : "$Revision$"
+	description: "simple application root class"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION
 
 inherit
-	WSF_DEFAULT_SERVICE [APPLICATION_EXECUTION]
+	WSF_STANDALONE_SERVICE [APPLICATION_EXECUTION]
 		redefine
 			initialize
 		end
@@ -19,11 +19,17 @@ feature {NONE} -- Initialization
 
 	initialize
 			-- Initialize current service.
+		local
+			opts: WSF_STANDALONE_SERVICE_OPTIONS
 		do
 				-- Specific to `standalone' connector (the EiffelWeb server).
 				-- See `{WSF_STANDALONE_SERVICE_LAUNCHER}.initialize'
- 			set_service_option ("port", 9090)
- 			import_service_options (create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI}.make_from_file ("simple.ini"))
+			create opts
+			opts.port := 9090
+			opts.socket_recv_timeout := 5 -- seconds
+
+			opts.import_ini_file_options ("simple.ini")
+			import_service_options (opts)
 		end
 
 end
diff --git a/examples/simple_ssl/simple_ssl.ecf b/examples/simple_ssl/simple_ssl.ecf
index bbe9d07e..37317488 100644
--- a/examples/simple_ssl/simple_ssl.ecf
+++ b/examples/simple_ssl/simple_ssl.ecf
@@ -15,7 +15,7 @@
 		<setting name="concurrency" value="scoop"/>
 		<variable name="ssl_enabled" value="true"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf"/>
+		<library name="wsf_standalone" location="..\..\library\server\wsf\connector\standalone-safe.ecf"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="simple" location=".\" recursive="true"/>
diff --git a/library/server/wsf/connector/standalone/wsf_standalone_service.e b/library/server/wsf/connector/standalone/wsf_standalone_service.e
new file mode 100644
index 00000000..5f0c23db
--- /dev/null
+++ b/library/server/wsf/connector/standalone/wsf_standalone_service.e
@@ -0,0 +1,24 @@
+note
+	description: "[
+			Service using standalone connector launcher.
+		]"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_STANDALONE_SERVICE [G -> WSF_EXECUTION create make end]
+
+inherit
+	WSF_LAUNCHABLE_SERVICE
+
+feature {NONE} -- Initialization
+
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			l_launcher: WSF_STANDALONE_SERVICE_LAUNCHER [G]
+		do
+			create l_launcher.make_and_launch (opts)
+		end	
+
+end