diff --git a/.gitmodules b/.gitmodules
index 1f6d949..6bc1b98 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "hayamiki_lib"]
 	path = hayamiki_lib
 	url = ssh://git@gitlab.calexium.com:33022/calexium/hayamiki_lib.git
+[submodule "densaku_lib"]
+	path = densaku_lib
+	url = git@gitlab.anubis-language.com:totoro/densaku_lib.git
diff --git a/densaku_lib b/densaku_lib
new file mode 160000
index 0000000..5c7cd86
--- /dev/null
+++ b/densaku_lib
@@ -0,0 +1 @@
+Subproject commit 5c7cd864b6cc8232c2e719fe3a1e3740288cc0e2
diff --git a/hayamiki_generator.aproj b/hayamiki_generator.aproj
index 372b9f2..2de0ed8 100644
--- a/hayamiki_generator.aproj
+++ b/hayamiki_generator.aproj
@@ -121,6 +121,34 @@
     <Compile Include="hayamiki_lib\controller\hk_controller.anubis" />
     <Compile Include="hayamiki_lib\controller\hk_delete.anubis" />
     <Compile Include="hayamiki_lib\hk_generator.anubis" />
+    <Compile Include="hayamiki_lib\model\app.anubis" />
+    <Compile Include="hayamiki_lib\model\columns.anubis" />
+    <Compile Include="hayamiki_lib\model\database.anubis" />
+    <Compile Include="hayamiki_lib\model\display.anubis" />
+    <Compile Include="hayamiki_lib\model\fields.anubis" />
+    <Compile Include="hayamiki_lib\model\help.anubis" />
+    <Compile Include="hayamiki_lib\model\icons.anubis" />
+    <Compile Include="hayamiki_lib\model\model.anubis" />
+    <Compile Include="hayamiki_lib\model\tables.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_app.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_app_name.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_database.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_datetime_field_attr.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_display.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_edit_view.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_help_text.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_icon.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_int_choice.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_int_choices.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_list_view.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_model.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_model_attr.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_model_column.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_model_field.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_table.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_text_choice.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_text_choices.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_text_field_attr.anubis" />
     <Compile Include="hayamiki_lib\types\hayamiki.anubis" />
     <Compile Include="hayamiki_lib\types\model\app.anubis" />
     <Compile Include="hayamiki_lib\types\model\columns.anubis" />
@@ -681,6 +709,9 @@
     <Folder Include="calexium_lib\web\widgets" />
     <Folder Include="hayamiki_lib" />
     <Folder Include="hayamiki_lib\controller" />
+    <Folder Include="hayamiki_lib\model" />
+    <Folder Include="hayamiki_lib\model\types" />
+    <Folder Include="hayamiki_lib\model\types\generated" />
     <Folder Include="hayamiki_lib\types" />
     <Folder Include="hayamiki_lib\types\model" />
     <Folder Include="hayamiki_lib\types\view" />
diff --git a/hayamiki_generator.ide b/hayamiki_generator.ide
index fb597a4..2d1374a 100644
--- a/hayamiki_generator.ide
+++ b/hayamiki_generator.ide
@@ -4,6 +4,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # SharpDevelop 1.0.12.108
 Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator", "hayamiki_generator.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45"
 EndProject
+Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_ds_types", "hayamiki_ds_types.aproj", "{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,5 +20,9 @@ Global
 		7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.Build.0 = Release|Any CPU
 		7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06BE5572-9B4A-4F41-A01E-84C730A8F4E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/hayamiki_lib b/hayamiki_lib
index cd8a0a4..0f97a53 160000
--- a/hayamiki_lib
+++ b/hayamiki_lib
@@ -1 +1 @@
-Subproject commit cd8a0a45283d63e8a75a1fd799b6af3eea579d21
+Subproject commit 0f97a53e954d365d416021a78dad323610d54da5
diff --git a/src/generation/columns.anubis b/src/generation/columns.anubis
index be6a596..b14a93d 100644
--- a/src/generation/columns.anubis
+++ b/src/generation/columns.anubis
@@ -8,8 +8,8 @@
 
 read system/string.anubis
 read tools/list.anubis
-read hayamiki_lib/types/model/columns.anubis
-read hayamiki_lib/types/model/fields.anubis
+read hayamiki_lib/model/columns.anubis
+read hayamiki_lib/model/fields.anubis
 
 read fields.anubis
 
diff --git a/src/generation/fields.anubis b/src/generation/fields.anubis
index 34476a1..bcc430b 100644
--- a/src/generation/fields.anubis
+++ b/src/generation/fields.anubis
@@ -9,8 +9,8 @@
 read system/string.anubis
 read tools/basis.anubis
 
-read hayamiki_lib/types/model/fields.anubis
-read hayamiki_lib/types/model/columns.anubis
+read hayamiki_lib/model/fields.anubis
+read hayamiki_lib/model/columns.anubis
 
 read model.anubis
 
diff --git a/src/generation/html.anubis b/src/generation/html.anubis
index dff109e..1dcf92c 100644
--- a/src/generation/html.anubis
+++ b/src/generation/html.anubis
@@ -8,8 +8,9 @@
 
 read system/string.anubis
 read tools/basis.anubis
-
+read calexium_lib/web/CXM_making_a_web_site.anubis
 read hayamiki_lib/types/hayamiki.anubis
+
 read icons.anubis
 read columns.anubis
 
@@ -46,9 +47,9 @@ public define String
     HK_Model_Column column,
     String          data_name,
     String          general_type_name,
-    String          action_name
+    WEB_Action_Name action_name
   )=
-  "link_id_action(to_String("+data_name+".id), "+to_String(column, data_name, general_type_name)+", \""+action_name+"\")".
+  "link_id_action(to_String("+data_name+".id), "+to_String(column, data_name, general_type_name)+", \""+format_web_action_name(action_name)+"\")".
 
 
 public define String
@@ -58,13 +59,13 @@ public define String
     String                column_name,
     String                data_name,
     String                general_type_name,
-    String                action_name
+    WEB_Action_Name       action_name
   )=
   if get_column_type_from_name(columns, column_name) is
   {
     failure          then "column name "+column_name+"doesn't exist",
     success(column)  then 
-      if action_name = "" then
+      if action_name = no_action then
         to_HTML_cell_link(column, data_name, general_type_name)
       else
         to_HTML_cell_link_id_action(column, data_name, general_type_name, action_name)
@@ -119,7 +120,7 @@ public define String
                               },
   with action_name = if list_view is 
                       {
-                        list_view_all       then ""
+                        list_view_all       then no_action,
                         list_view(_, _, an) then an
                       },
 
diff --git a/src/generation/icons.anubis b/src/generation/icons.anubis
index 4731cb0..394910a 100644
--- a/src/generation/icons.anubis
+++ b/src/generation/icons.anubis
@@ -8,8 +8,8 @@
 
 read calexium_lib/web/widgets/icons_set.anubis
 
-read hayamiki_lib/types/model/columns.anubis
-read hayamiki_lib/types/model/icons.anubis
+read hayamiki_lib/model/columns.anubis
+read hayamiki_lib/model/icons.anubis
 
 public define String
 /** to_String return the String of the given model of the column 'col'
--
libgit2 0.21.4