diff --git a/library/src/configuration/cms_setup.e b/library/src/configuration/cms_setup.e
index 789dc8e..68136c5 100644
--- a/library/src/configuration/cms_setup.e
+++ b/library/src/configuration/cms_setup.e
@@ -29,6 +29,24 @@ feature -- Access
 		deferred
 		end
 
+	modules_enabled: CMS_MODULE_COLLECTION
+			-- List of enabled modules.
+		local
+			l_module: CMS_MODULE
+		do
+			create Result.make (modules.count)
+			across
+				modules as ic
+			loop
+				l_module := ic.item
+				if l_module.is_enabled then
+					Result.extend (l_module)
+				end
+			end
+		ensure
+			only_enabled_modules: across Result as ic all ic.item.is_enabled end
+		end
+
 feature -- Access: Site
 
 	site_id: READABLE_STRING_8
diff --git a/library/src/hooks/cms_hook_block.e b/library/src/hooks/cms_hook_block.e
index 5c949fa..2f1898b 100644
--- a/library/src/hooks/cms_hook_block.e
+++ b/library/src/hooks/cms_hook_block.e
@@ -1,5 +1,7 @@
 note
-	description: "Summary description for {CMS_HOOK_BLOCK}."
+	description: "[
+				Hook providing a way to alter a block.
+		]"
 	date: "$Date$"
 	revision: "$Revision$"
 
diff --git a/library/src/service/cms_service.e b/library/src/service/cms_service.e
index a5a6c48..f1e4a2e 100644
--- a/library/src/service/cms_service.e
+++ b/library/src/service/cms_service.e
@@ -64,21 +64,8 @@ feature {NONE} -- Initialization
 
 	initialize_modules
 			-- Intialize modules and keep only enabled modules.
-		local
-			l_module: CMS_MODULE
-			l_available_modules: CMS_MODULE_COLLECTION
 		do
-			log.write_debug (generator + ".initialize_modules")
-			l_available_modules := setup.modules
-			create modules.make (l_available_modules.count)
-			across
-				l_available_modules as ic
-			loop
-				l_module := ic.item
-				if l_module.is_enabled then
-					modules.extend (l_module)
-				end
-			end
+			modules := setup.modules_enabled
 		ensure
 			only_enabled_modules: across modules as ic all ic.item.is_enabled end
 		end