diff --git a/cms.ecf b/cms.ecf
index 705d1b8..2038d39 100644
--- a/cms.ecf
+++ b/cms.ecf
@@ -7,21 +7,20 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf" readonly="false"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="layout" location=".\library\layout\layout.ecf"/>
 		<library name="model" location=".\library\model\cms_model.ecf" readonly="false"/>
-		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf" readonly="false"/>
-		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
-
-		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
-		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
 		<library name="persistence_mysql" location=".\library\persistence\implementation\mysql\persistence_mysql.ecf" readonly="false"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
+		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="src" location=".\library\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
diff --git a/library/layout/layout.ecf b/library/layout/layout.ecf
index 8f75b8f..447d64e 100644
--- a/library/layout/layout.ecf
+++ b/library/layout/layout.ecf
@@ -2,7 +2,7 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="layout" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" library_target="layout">
 	<target name="layout">
 		<root all_classes="true"/>
-		<option warning="true">
+		<option warning="true" void_safety="none">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
diff --git a/library/model/cms_model.ecf b/library/model/cms_model.ecf
index 14c81f5..77c32a2 100644
--- a/library/model/cms_model.ecf
+++ b/library/model/cms_model.ecf
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="cms_model" uuid="57C6F407-E894-4554-8A59-C8D1F3BBC5D7" library_target="cms_model">
 	<target name="cms_model">
-		<root all_classes="True"/>
-		<option warning="true">
+		<root all_classes="true"/>
+		<option warning="true" void_safety="none">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="cms_model" location=".\src" recursive="true">
+		<cluster name="cms_model" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
-				<exclude>/.svn$</exclude>
 				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
 			</file_rule>
 		</cluster>
 	</target>
diff --git a/library/persistence/implementation/mysql/persistence_mysql.ecf b/library/persistence/implementation/mysql/persistence_mysql.ecf
index 983c020..ad05e10 100644
--- a/library/persistence/implementation/mysql/persistence_mysql.ecf
+++ b/library/persistence/implementation/mysql/persistence_mysql.ecf
@@ -2,23 +2,28 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="persistence_mysql" uuid="DC757CBD-D8C4-44D6-A07F-C1148D8D233E" library_target="persistence_mysql">
 	<target name="persistence_mysql">
 		<root all_classes="true"/>
-		<option warning="true" void_safety="all">
+		<option warning="true" void_safety="none">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
-
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="layout" location="..\..\..\layout\layout.ecf"/>
-		<library name="model" location="..\..\..\model\cms_model.ecf"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging.ecf"/>
+		<library name="model" location="..\..\..\model\cms_model.ecf"/>
 		<library name="mysql" location="$ISE_LIBRARY\library\store\dbms\rdbms\mysql\mysql.ecf"/>
 		<library name="store" location="$ISE_LIBRARY\library\store\store.ecf" readonly="false"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<cluster name="common" location="..\common\" recursive="true">
+			<file_rule>
+				<exclude>/database/database_connection_odbc.e</exclude>
+			</file_rule>
+		</cluster>
+		<cluster name="interface" location="..\..\interface\" recursive="true"/>
 		<cluster name="persistence_mysql" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
@@ -26,12 +31,5 @@
 				<exclude>/.svn$</exclude>
 			</file_rule>
 		</cluster>
-		<cluster name="interface" location="..\..\interface\" recursive="true"/>
-		<cluster name="common" location="..\common\" recursive="true">
-			<file_rule>
-				<exclude>/database/database_connection_odbc.e</exclude>
-			</file_rule>
-		</cluster>			
-
 	</target>
 </system>
diff --git a/library/src/configuration/cms_default_setup.e b/library/src/configuration/cms_default_setup.e
index 7a9cb48..c5c3c85 100644
--- a/library/src/configuration/cms_default_setup.e
+++ b/library/src/configuration/cms_default_setup.e
@@ -77,14 +77,13 @@ feature -- Access
 			-- <Precursor>
 		do
 				-- Enable change the mode
-			Result := (create {CMS_JSON_CONFIGURATION}).is_html_mode(layout.application_config_path)
+			Result := (create {CMS_JSON_CONFIGURATION}).is_html_mode (layout.application_config_path)
 		end
 
 	is_web: BOOLEAN
 			-- <Precursor>
 		do
-			Result := (create {CMS_JSON_CONFIGURATION}).is_web_mode(layout.application_config_path)
-
+			Result := (create {CMS_JSON_CONFIGURATION}).is_web_mode (layout.application_config_path)
 		end
 
 	build_auth_engine
@@ -111,7 +110,7 @@ feature -- Compute location
 			debug ("refactor_fixme")
 				fixme ("Check if we really need it")
 			end
-			-- Check how to get this path from the CMS_THEME information.
+				-- Check how to get this path from the CMS_THEME information.
 			theme_assets_location := theme_location.extended ("assets")
 		end
 
diff --git a/library/src/kernel/content/cms_content_block.e b/library/src/kernel/content/cms_content_block.e
index 2298d4e..7d43464 100644
--- a/library/src/kernel/content/cms_content_block.e
+++ b/library/src/kernel/content/cms_content_block.e
@@ -1,8 +1,7 @@
 note
-	description: "Summary description for {CMS_CONTENT_BLOCK}."
-	author: ""
-	date: "$Date: 2014-10-30 12:55:33 -0300 (ju. 30 de oct. de 2014) $"
-	revision: "$Revision: 96018 $"
+	description: "CMS_BLOCK implemented with a `content' associated with a specific `format'."
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	CMS_CONTENT_BLOCK
diff --git a/library/src/kernel/content/cms_menu_block.e b/library/src/kernel/content/cms_menu_block.e
index b348add..d3a5cf3 100644
--- a/library/src/kernel/content/cms_menu_block.e
+++ b/library/src/kernel/content/cms_menu_block.e
@@ -1,6 +1,6 @@
 note
 	description: "Summary description for {CMS_MENU_BLOCK}."
-	date: "$Date: 2014-08-28 08:21:49 -0300 (ju. 28 de ago. de 2014) $"
+	date: "$Date: 2014-11-14 20:11:17 +0100 (ven., 14 nov. 2014) $"
 
 class
 	CMS_MENU_BLOCK
diff --git a/library/src/kernel/content/cms_smarty_template_block.e b/library/src/kernel/content/cms_smarty_template_block.e
index 9d4a78d..a433512 100644
--- a/library/src/kernel/content/cms_smarty_template_block.e
+++ b/library/src/kernel/content/cms_smarty_template_block.e
@@ -2,8 +2,8 @@ note
 	description: "[
 			CMS block with smarty template file content.
 		]"
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2014-11-14 20:11:17 +0100 (ven., 14 nov. 2014) $"
+	revision: "$Revision: 96092 $"
 
 class
 	CMS_SMARTY_TEMPLATE_BLOCK