diff --git a/cms/cms-safe.ecf b/cms/cms-safe.ecf
index 2c2d41f..56aac47 100644
--- a/cms/cms-safe.ecf
+++ b/cms/cms-safe.ecf
@@ -10,7 +10,7 @@
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="layout" location=".\layout\layout-safe.ecf"/>
-		<library name="model" location=".\model\model-safe.ecf" readonly="false"/>
+		<library name="model" location=".\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
 
diff --git a/cms/model/model-safe.ecf b/cms/model/cms_model-safe.ecf
similarity index 81%
rename from cms/model/model-safe.ecf
rename to cms/model/cms_model-safe.ecf
index cc50b08..18d774b 100644
--- a/cms/model/model-safe.ecf
+++ b/cms/model/cms_model-safe.ecf
@@ -1,6 +1,6 @@
 <?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="model" uuid="57C6F407-E894-4554-8A59-C8D1F3BBC5D7" library_target="model">
-	<target name="model">
+<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">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
@@ -8,7 +8,7 @@
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<cluster name="model" location=".\src" recursive="true">
+		<cluster name="cms_model" location=".\src" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/.svn$</exclude>
diff --git a/cms/persistence/implementation/mysql/persistence_mysql-safe.ecf b/cms/persistence/implementation/mysql/persistence_mysql-safe.ecf
index 9d99a01..a8595a3 100644
--- a/cms/persistence/implementation/mysql/persistence_mysql-safe.ecf
+++ b/cms/persistence/implementation/mysql/persistence_mysql-safe.ecf
@@ -13,7 +13,7 @@
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 
 		<library name="layout" location="..\..\..\layout\layout-safe.ecf"/>
-		<library name="model" location="..\..\..\model\model-safe.ecf"/>
+		<library name="model" location="..\..\..\model\cms_model-safe.ecf"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
 		<library name="mysql" location="$ISE_LIBRARY\library\store\dbms\rdbms\mysql\mysql-safe.ecf"/>
 		<library name="store" location="$ISE_LIBRARY\library\store\store-safe.ecf" readonly="false"/>
diff --git a/cms/persistence/implementation/mysql/src/provider/user_data_provider.e b/cms/persistence/implementation/mysql/src/provider/user_data_provider.e
index 8660b8e..488d39a 100644
--- a/cms/persistence/implementation/mysql/src/provider/user_data_provider.e
+++ b/cms/persistence/implementation/mysql/src/provider/user_data_provider.e
@@ -215,7 +215,7 @@ feature -- Basic operations: User Profiles
 	save_profile (a_user_id: INTEGER_64; a_user_profile: CMS_USER_PROFILE)
 			-- Save a profile item with (a_key and a_value) to the given user `user_id'.
 		local
-			l_cursor: TABLE_ITERATION_CURSOR [READABLE_STRING_8, READABLE_STRING_8]
+			l_cursor: TABLE_ITERATION_CURSOR [READABLE_STRING_8, READABLE_STRING_GENERAL]
 		do
 			error_handler.reset
 			log.write_information (generator + ".save_profile")
@@ -224,7 +224,7 @@ feature -- Basic operations: User Profiles
 			until
 				l_cursor.after
 			loop
-				save_profile_item (a_user_id, l_cursor.key, l_cursor.item)
+				save_profile_item (a_user_id, l_cursor.key.as_string_32, l_cursor.item)
 				l_cursor.forth
 			end
 
diff --git a/cms/persistence/implementation/mysql/tests/tests.ecf b/cms/persistence/implementation/mysql/tests/tests.ecf
index abe2c75..c526aeb 100644
--- a/cms/persistence/implementation/mysql/tests/tests.ecf
+++ b/cms/persistence/implementation/mysql/tests/tests.ecf
@@ -7,7 +7,7 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="model" location="..\..\..\..\model\model-safe.ecf"/>
+		<library name="model" location="..\..\..\..\model\cms_model-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="persitence_mysql" location="..\persistence_mysql-safe.ecf" readonly="false"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
diff --git a/cms/persistence/implementation/sqlite/persistence_sqlite-safe.ecf b/cms/persistence/implementation/sqlite/persistence_sqlite-safe.ecf
index 90af783..9e6d263 100644
--- a/cms/persistence/implementation/sqlite/persistence_sqlite-safe.ecf
+++ b/cms/persistence/implementation/sqlite/persistence_sqlite-safe.ecf
@@ -11,6 +11,7 @@
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="layout" location="..\..\..\layout\layout-safe.ecf"/>
+		<library name="model" location="..\..\..\model\cms_model-safe.ecf"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
 		<library name="mysql" location="$ISE_LIBRARY\library\store\dbms\rdbms\mysql\mysql-safe.ecf"/>
 		<library name="odbc" location="$ISE_LIBRARY\library\store\dbms\rdbms\odbc\odbc-safe.ecf"/>
diff --git a/examples/roc_api/modules/demo/cms_demo_module-safe.ecf b/examples/roc_api/modules/demo/cms_demo_module-safe.ecf
index e1b0524..bb9ae6d 100644
--- a/examples/roc_api/modules/demo/cms_demo_module-safe.ecf
+++ b/examples/roc_api/modules/demo/cms_demo_module-safe.ecf
@@ -12,7 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="cms" location="..\..\..\..\cms\cms-safe.ecf" readonly="false"/>
-		<library name="cms_model" location="..\..\..\..\cms\model\model-safe.ecf" readonly="false"/>
+		<library name="cms_model" location="..\..\..\..\cms\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>