diff --git a/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
index b5acb4fba..fbe41e005 100644
--- a/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
+++ b/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
@@ -8,7 +8,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.ARTICLE_TEXTS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -16,7 +16,7 @@ create schema CCM_CORE;
     create table CCM_CMS.ARTICLE_TEXTS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -36,7 +36,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.ASSET_TITLES (
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (ASSET_ID, LOCALE)
     );
@@ -44,7 +44,7 @@ create schema CCM_CORE;
     create table CCM_CMS.ASSET_TITLES_AUD (
         REV integer not null,
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -64,7 +64,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.ATTACHMENT_LIST_CAPTIONS (
         LIST_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (LIST_ID, LOCALE)
     );
@@ -72,7 +72,7 @@ create schema CCM_CORE;
     create table CCM_CMS.ATTACHMENT_LIST_CAPTIONS_AUD (
         REV integer not null,
         LIST_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -81,7 +81,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.ATTACHMENT_LIST_DESCRIPTIONS (
         LIST_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (LIST_ID, LOCALE)
     );
@@ -89,7 +89,7 @@ create schema CCM_CORE;
     create table CCM_CMS.ATTACHMENT_LIST_DESCRIPTIONS_AUD (
         REV integer not null,
         LIST_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -153,7 +153,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.BINARY_ASSET_DESCRIPTIONS (
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (ASSET_ID, LOCALE)
     );
@@ -161,7 +161,7 @@ create schema CCM_CORE;
     create table CCM_CMS.BINARY_ASSET_DESCRIPTIONS_AUD (
         REV integer not null,
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -189,7 +189,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.BOOKMARK_DESCRIPTIONS (
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (ASSET_ID, LOCALE)
     );
@@ -197,7 +197,7 @@ create schema CCM_CORE;
     create table CCM_CMS.BOOKMARK_DESCRIPTIONS_AUD (
         REV integer not null,
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -219,7 +219,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.CONTENT_ITEM_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -227,7 +227,7 @@ create schema CCM_CORE;
     create table CCM_CMS.CONTENT_ITEM_DESCRIPTIONS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -236,7 +236,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.CONTENT_ITEM_NAMES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -244,7 +244,7 @@ create schema CCM_CORE;
     create table CCM_CMS.CONTENT_ITEM_NAMES_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -253,7 +253,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.CONTENT_ITEM_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -261,7 +261,7 @@ create schema CCM_CORE;
     create table CCM_CMS.CONTENT_ITEM_TITLES_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -327,14 +327,14 @@ create schema CCM_CORE;
 
     create table CCM_CMS.CONTENT_TYPE_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CMS.CONTENT_TYPE_LABELS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -353,7 +353,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.EVENT_COSTS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -361,7 +361,7 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENT_COSTS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -370,7 +370,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.EVENT_DATES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -378,7 +378,7 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENT_DATES_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -387,7 +387,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.EVENT_LOCATIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -395,7 +395,7 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENT_LOCATIONS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -404,7 +404,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.EVENT_MAIN_CONTRIBUTORS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -412,7 +412,7 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENT_MAIN_CONTRIBUTORS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -421,7 +421,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.EVENT_TEXTS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -429,7 +429,7 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENT_TEXTS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -438,7 +438,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.EVENT_TYPES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -446,7 +446,7 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENT_TYPES_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -454,9 +454,9 @@ create schema CCM_CORE;
     );
 
     create table CCM_CMS.EVENTS (
-        END_DATE date,
+        END_DATE timestamp,
         MAP_LINK varchar(255),
-        START_DATE date not null,
+        START_DATE timestamp not null,
         OBJECT_ID bigint not null,
         primary key (OBJECT_ID)
     );
@@ -464,9 +464,9 @@ create schema CCM_CORE;
     create table CCM_CMS.EVENTS_AUD (
         OBJECT_ID bigint not null,
         REV integer not null,
-        END_DATE date,
+        END_DATE timestamp,
         MAP_LINK varchar(255),
-        START_DATE date,
+        START_DATE timestamp,
         primary key (OBJECT_ID, REV)
     );
 
@@ -569,7 +569,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.LEGAL_METADATA_RIGHTS (
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (ASSET_ID, LOCALE)
     );
@@ -577,7 +577,7 @@ create schema CCM_CORE;
     create table CCM_CMS.LEGAL_METADATA_RIGHTS_AUD (
         REV integer not null,
         ASSET_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -586,28 +586,28 @@ create schema CCM_CORE;
 
     create table CCM_CMS.LIFECYCLE_DEFINITION_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CMS.LIFECYCLE_DEFINITION_LABELS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CMS.LIFECYCLE_PHASE_DEFINITION_DESCRIPTIONS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
 
     create table CCM_CMS.LIFECYCLE_PHASE_DEFINITION_LABELS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -652,7 +652,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.MPA_SECTION_TEXTS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -660,7 +660,7 @@ create schema CCM_CORE;
     create table CCM_CMS.MPA_SECTION_TEXTS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -669,7 +669,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.MPA_SECTION_TITLES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -677,7 +677,7 @@ create schema CCM_CORE;
     create table CCM_CMS.MPA_SECTION_TITLES_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -686,7 +686,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.MPA_SUMMARIES (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -694,7 +694,7 @@ create schema CCM_CORE;
     create table CCM_CMS.MPA_SUMMARIES_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -756,7 +756,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.NEWS_TEXTS (
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (OBJECT_ID, LOCALE)
     );
@@ -764,7 +764,7 @@ create schema CCM_CORE;
     create table CCM_CMS.NEWS_TEXTS_AUD (
         REV integer not null,
         OBJECT_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -788,7 +788,7 @@ create schema CCM_CORE;
 
     create table CCM_CMS.SIDE_NOTE_TEXTS (
         SIDE_NOTE_ID bigint not null,
-        LOCALIZED_VALUE longvarchar,
+        LOCALIZED_VALUE varchar(2147483647),
         LOCALE varchar(255) not null,
         primary key (SIDE_NOTE_ID, LOCALE)
     );
@@ -796,7 +796,7 @@ create schema CCM_CORE;
     create table CCM_CMS.SIDE_NOTE_TEXTS_AUD (
         REV integer not null,
         SIDE_NOTE_ID bigint not null,
-        LOCALIZED_VALUE longvarchar not null,
+        LOCALIZED_VALUE varchar(2147483647) not null,
         LOCALE varchar(255) not null,
         REVTYPE tinyint,
         REVEND integer,
@@ -843,8 +843,6 @@ create schema CCM_CORE;
     alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
         add constraint UK_goj42ghwu4tf1akfb2r6ensns unique (WORKFLOW_TEMPLATE_ID);
 
-
-
     create table CCM_CORE.APPLICATIONS (
         APPLICATION_TYPE varchar(1024) not null,
         PRIMARY_URL varchar(1024) not null,
@@ -1371,9 +1369,9 @@ create schema CCM_CORE;
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
         SETTING_VALUE_DOUBLE double,
+        SETTING_VALUE_LONG bigint,
         SETTING_VALUE_BOOLEAN boolean,
         SETTING_VALUE_BIG_DECIMAL decimal(19,2),
-        SETTING_VALUE_LONG bigint,
         SETTING_VALUE_STRING varchar(1024),
         primary key (SETTING_ID)
     );
@@ -1490,13 +1488,9 @@ create schema CCM_CORE;
         primary key (TASK_ID)
     );
 
-    create table CCM_CORE.WORKFLOW_TEMPLATES (
-        WORKFLOW_ID bigint not null,
-        primary key (WORKFLOW_ID)
-    );
-
     create table CCM_CORE.WORKFLOWS (
         WORKFLOW_ID bigint not null,
+        ABSTRACT_WORKFLOW boolean,
         ACTIVE boolean,
         WORKFLOW_STATE varchar(255),
         TASKS_STATE varchar(255),
@@ -1532,7 +1526,753 @@ create schema CCM_CORE;
 
     alter table CCM_CORE.WORKFLOWS 
         add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID);
-create sequence hibernate_sequence start with 1 increment by 1;
+
+    create sequence hibernate_sequence start with 1 increment by 1;
+
+    alter table CCM_CMS.ARTICLE_TEXTS 
+        add constraint FK1pel1j53h3t3adh9o5cbje2d3 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.ARTICLES;
+
+    alter table CCM_CMS.ARTICLE_TEXTS_AUD 
+        add constraint FKa06qks62tieeba607ykdrv3ry 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ARTICLE_TEXTS_AUD 
+        add constraint FKljfof07259eofkub5g2dx0jlq 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ARTICLES 
+        add constraint FK2pwvn9v2t2pikcw5hn2oq13q 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.ARTICLES_AUD 
+        add constraint FKnevu4il5fu4vy2f5twh50kstr 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.CONTENT_ITEMS_AUD;
+
+    alter table CCM_CMS.ASSET_TITLES 
+        add constraint FKj61sy509dv63u246wlau5f9pa 
+        foreign key (ASSET_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.ASSET_TITLES_AUD 
+        add constraint FK6yuimrre2oowjo0diw6b00nhe 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ASSET_TITLES_AUD 
+        add constraint FKcaockxi21ve0irh06vegc77uu 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ASSETS 
+        add constraint FKlbiojib44ujxv9eee1sjn67qk 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CMS.ASSETS_AUD 
+        add constraint FKi5q560xg9357da8gc5sukqbw8 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CORE.CCM_OBJECTS_AUD;
+
+    alter table CCM_CMS.ATTACHMENT_LIST_CAPTIONS 
+        add constraint FKeqcryerscpnmqpipwyrvd0lae 
+        foreign key (LIST_ID) 
+        references CCM_CMS.ATTACHMENT_LISTS;
+
+    alter table CCM_CMS.ATTACHMENT_LIST_CAPTIONS_AUD 
+        add constraint FK727detagt51wmejywhteq4jfs 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENT_LIST_CAPTIONS_AUD 
+        add constraint FK7589vpkxegxs8y3wqjx37tig3 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENT_LIST_DESCRIPTIONS 
+        add constraint FKixgpo00r1cqq5jw1s7v6fchpn 
+        foreign key (LIST_ID) 
+        references CCM_CMS.ATTACHMENT_LISTS;
+
+    alter table CCM_CMS.ATTACHMENT_LIST_DESCRIPTIONS_AUD 
+        add constraint FKqhqkm6tas9fdmggv4k1vj0nc7 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENT_LIST_DESCRIPTIONS_AUD 
+        add constraint FKqv2o9jffgok4518fb5c85552l 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENT_LISTS 
+        add constraint FKqyj7ifjfyp7kmsj8fiyxn0am3 
+        foreign key (ITEM_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.ATTACHMENT_LISTS_AUD 
+        add constraint FKgdt5p8huh1lhk299hkrytqmqc 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENT_LISTS_AUD 
+        add constraint FKdn502yobchapgcyj1bu00u67a 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENTS 
+        add constraint FKmn0bm137vwr61iy5nb59cjm22 
+        foreign key (ASSET_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.ATTACHMENTS 
+        add constraint FK3mqbt13sbed2ae0esrps4p0oh 
+        foreign key (ATTACHMENT_LIST_ID) 
+        references CCM_CMS.ATTACHMENT_LISTS;
+
+    alter table CCM_CMS.ATTACHMENTS_AUD 
+        add constraint FKl19663g6todb5d1e9lok7fl9e 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.ATTACHMENTS_AUD 
+        add constraint FK4n28sostn1hc8bf43qsp1pyuf 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.AUDIO_ASSETS 
+        add constraint FKg9tos3it7lflk5o90jluonpev 
+        foreign key (LEGAL_METADATA_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.AUDIO_ASSETS 
+        add constraint FKgxpsfjlfsk609c0w2te18y90v 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.BINARY_ASSETS;
+
+    alter table CCM_CMS.AUDIO_ASSETS_AUD 
+        add constraint FKbt11nwbde1en1upceratct6s3 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.BINARY_ASSETS_AUD;
+
+    alter table CCM_CMS.BINARY_ASSET_DESCRIPTIONS 
+        add constraint FK31kl9gu49nvhcku7gfsro6hqq 
+        foreign key (ASSET_ID) 
+        references CCM_CMS.BINARY_ASSETS;
+
+    alter table CCM_CMS.BINARY_ASSET_DESCRIPTIONS_AUD 
+        add constraint FKhehi2pvqliq0s2jhv661lar7g 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.BINARY_ASSET_DESCRIPTIONS_AUD 
+        add constraint FK9f5n81i6j0yopog1hvua2wmxc 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.BINARY_ASSETS 
+        add constraint FKltx0jq1u1aflrd20k1c77m8vh 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.BINARY_ASSETS_AUD 
+        add constraint FK1qfap4mxprjk7gnjdcvdxr5mv 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.ASSETS_AUD;
+
+    alter table CCM_CMS.BOOKMARK_DESCRIPTIONS 
+        add constraint FKmeydpwmlq0wqw3gab4auiyrqg 
+        foreign key (ASSET_ID) 
+        references CCM_CMS.BOOKMARKS;
+
+    alter table CCM_CMS.BOOKMARK_DESCRIPTIONS_AUD 
+        add constraint FKfff2ein3uhgwyyyajamy3hfwy 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.BOOKMARK_DESCRIPTIONS_AUD 
+        add constraint FKtl48flnrkr0upvrc1ksy1o92m 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.BOOKMARKS 
+        add constraint FKksnngecvvxmsxdvri4shby2hy 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.BOOKMARKS_AUD 
+        add constraint FK47cpxaw9vnnes2dbr6h3toirl 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.ASSETS_AUD;
+
+    alter table CCM_CMS.CONTENT_ITEM_DESCRIPTIONS 
+        add constraint FK6mt4tjnenr79o52wcj99tpeu4 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.CONTENT_ITEM_DESCRIPTIONS_AUD 
+        add constraint FK12yrysxv4fxa73ker40e883av 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.CONTENT_ITEM_DESCRIPTIONS_AUD 
+        add constraint FK4pxuq0pf2hrtireo902t21ocx 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.CONTENT_ITEM_NAMES 
+        add constraint FKijrfangf9s3lyncmod651xyg8 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.CONTENT_ITEM_NAMES_AUD 
+        add constraint FKq631ee5ollx5xkliowcrt8wkj 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.CONTENT_ITEM_NAMES_AUD 
+        add constraint FKbjaycalit9pa2u7ae5dwjgtky 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.CONTENT_ITEM_TITLES 
+        add constraint FKbvf67lou4ep94pgi6tur6o2gf 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.CONTENT_ITEM_TITLES_AUD 
+        add constraint FKfbno0rxshoi57y8aehwv3o42j 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.CONTENT_ITEM_TITLES_AUD 
+        add constraint FK4c3exifj1ghwg6htglynlo094 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.CONTENT_ITEMS 
+        add constraint FKg83y3asxi1jr7larwven7ueu0 
+        foreign key (CONTENT_TYPE_ID) 
+        references CCM_CMS.CONTENT_TYPES;
+
+    alter table CCM_CMS.CONTENT_ITEMS 
+        add constraint FKfh1nm46qpw6xcwkmgaqw2iu3h 
+        foreign key (LIFECYCLE_ID) 
+        references CCM_CMS.LIFECYCLES;
+
+    alter table CCM_CMS.CONTENT_ITEMS 
+        add constraint FKl00ldjygr6as8gqbt3j14ke7j 
+        foreign key (WORKFLOW_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CMS.CONTENT_ITEMS 
+        add constraint FK1fr2q5y1wpmrufruja5ivfpuf 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CMS.CONTENT_ITEMS_AUD 
+        add constraint FKsfhj0qok0ksjplvgcaditqekl 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CORE.CCM_OBJECTS_AUD;
+
+    alter table CCM_CMS.CONTENT_SECTION_LIFECYCLE_DEFINITIONS 
+        add constraint FKqnsnk1eju8vrbm7x0wr5od4ll 
+        foreign key (LIFECYCLE_DEFINITION_ID) 
+        references CCM_CMS.LIFECYLE_DEFINITIONS;
+
+    alter table CCM_CMS.CONTENT_SECTION_LIFECYCLE_DEFINITIONS 
+        add constraint FK7daejlunqsnhgky4b92n019a9 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.CONTENT_SECTION_ROLES 
+        add constraint FKkn5nygbmub9wd5lxw3402t82d 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CMS.CONTENT_SECTION_ROLES 
+        add constraint FKgcn76piocmkmvl3b0omv9vkv9 
+        foreign key (SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
+        add constraint FK1t85m4jehnhd6tyx5dtpavr15 
+        foreign key (WORKFLOW_TEMPLATE_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
+        add constraint FK6kuejkcl9hcbkr8q6bdlatt8q 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.CONTENT_SECTIONS 
+        add constraint FKavcn4aakxsb7kt7hmqlx0ecu6 
+        foreign key (ROOT_ASSETS_FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.CONTENT_SECTIONS 
+        add constraint FKd5sahsfsycq3i5icf3122ne8e 
+        foreign key (ROOT_DOCUMENTS_FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.CONTENT_SECTIONS 
+        add constraint FK72jh0axiiru87i61mppvaiv96 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CMS.CONTENT_TYPE_DESCRIPTIONS 
+        add constraint FKknyen2aw844b65grp7uys34cb 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_TYPES;
+
+    alter table CCM_CMS.CONTENT_TYPE_LABELS 
+        add constraint FK3suusqws1xgffyk3yob7m7dge 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_TYPES;
+
+    alter table CCM_CMS.CONTENT_TYPES 
+        add constraint FKriohuo8093its1k5rgoc5yrfc 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.CONTENT_TYPES 
+        add constraint FK8s83we1tuh9r3j57dyos69wfa 
+        foreign key (DEFAULT_LIFECYCLE_ID) 
+        references CCM_CMS.LIFECYLE_DEFINITIONS;
+
+    alter table CCM_CMS.CONTENT_TYPES 
+        add constraint FKpgeccqsr50xwb268ypmfx0r66 
+        foreign key (DEFAULT_WORKFLOW) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CMS.CONTENT_TYPES 
+        add constraint FK96vwsbqfbdg33ujeeawajr0v4 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CMS.EVENT_COSTS 
+        add constraint FKrbmepytotc73h5inefeih6rea 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.EVENTS;
+
+    alter table CCM_CMS.EVENT_COSTS_AUD 
+        add constraint FKocok2fj1oflsi16i9guf8bpc6 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_COSTS_AUD 
+        add constraint FKr17panho66n1ixh8tdms01e2c 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_DATES 
+        add constraint FKfsfsbgoeoi511ll69iy1v7ujs 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.EVENTS;
+
+    alter table CCM_CMS.EVENT_DATES_AUD 
+        add constraint FK70p2ayg7fexrb9jogdu3vlwfb 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_DATES_AUD 
+        add constraint FKklmki82kiy0hwwpfdur2s7l3e 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_LOCATIONS 
+        add constraint FK8snwub57evwh6px3n265tcoiv 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.EVENTS;
+
+    alter table CCM_CMS.EVENT_LOCATIONS_AUD 
+        add constraint FKk5thpb1gaktsk213o53y97hno 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_LOCATIONS_AUD 
+        add constraint FKivwe7h7k4myq4rhuh2wkepd9j 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_MAIN_CONTRIBUTORS 
+        add constraint FKlmq881mxd08hthm5dy4ayjq0e 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.EVENTS;
+
+    alter table CCM_CMS.EVENT_MAIN_CONTRIBUTORS_AUD 
+        add constraint FKqgkj5almojvt913heh1f4kro5 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_MAIN_CONTRIBUTORS_AUD 
+        add constraint FKh8vhg85li7c8yqjrg2plvkgho 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_TEXTS 
+        add constraint FKc46r2g7ry50b9e875dldjhwxp 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.EVENTS;
+
+    alter table CCM_CMS.EVENT_TEXTS_AUD 
+        add constraint FK82mc7uswliij43std6gwyswj3 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_TEXTS_AUD 
+        add constraint FK1s381t783dmpk0fup65mvma0w 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_TYPES 
+        add constraint FKhdbj26ubbhmht44qpin7ony29 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.EVENTS;
+
+    alter table CCM_CMS.EVENT_TYPES_AUD 
+        add constraint FKgby7m27rnb6oeloqycyf4b1kx 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENT_TYPES_AUD 
+        add constraint FKhcpvb5q2geclo5vxk0gt815x8 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.EVENTS 
+        add constraint FKt56odfo39eq13gcj1bbtngoj7 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.EVENTS_AUD 
+        add constraint FK9gofktd490afdwak49x15w6me 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.CONTENT_ITEMS_AUD;
+
+    alter table CCM_CMS.EXTERNAL_AUDIO_ASSETS 
+        add constraint FKrwn3rdmqevi618fthojs0xkkq 
+        foreign key (LEGAL_METADATA_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.EXTERNAL_AUDIO_ASSETS 
+        add constraint FK36xjlvslk0vlekn9lsc7x1c7a 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.BOOKMARKS;
+
+    alter table CCM_CMS.EXTERNAL_AUDIO_ASSETS_AUD 
+        add constraint FKp3jndaw4k35wb3d6hg5ng4xww 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.BOOKMARKS_AUD;
+
+    alter table CCM_CMS.EXTERNAL_VIDEO_ASSETS 
+        add constraint FK82gxr2se97dl902eu4wvhdvh3 
+        foreign key (LEGAL_METADATA_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.EXTERNAL_VIDEO_ASSETS 
+        add constraint FKps8bq22n1fxy8svnsrui3f0t2 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.BOOKMARKS;
+
+    alter table CCM_CMS.EXTERNAL_VIDEO_ASSETS_AUD 
+        add constraint FKilxwg8ppd64hl14tojfmupau9 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.BOOKMARKS_AUD;
+
+    alter table CCM_CMS.FILES 
+        add constraint FKpg74w39tfbbuqhcy21u61q138 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.BINARY_ASSETS;
+
+    alter table CCM_CMS.FILES_AUD 
+        add constraint FKdl876a4twd0gkranwqkdmxnwy 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.BINARY_ASSETS_AUD;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKnof2m7o4f0ufrugeh4g5wt3g9 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKmmb7728dp707dljq282ch47k3 
+        foreign key (FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDERS 
+        add constraint FK2ag06r5ywtuji2pkt68etlg48 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CMS.IMAGES 
+        add constraint FK51ja1101epvl74auenv6sqyev 
+        foreign key (LEGAL_METADATA_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.IMAGES 
+        add constraint FKmdqranhdstkn6m6d73l15amxs 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.BINARY_ASSETS;
+
+    alter table CCM_CMS.IMAGES_AUD 
+        add constraint FK4jsrdpe6d8is0ybx2p7sxivwf 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.BINARY_ASSETS_AUD;
+
+    alter table CCM_CMS.LEGAL_METADATA 
+        add constraint FKnxl7uyv1ks0qabgeienx2t9d1 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.LEGAL_METADATA_AUD 
+        add constraint FKpt3eqil7iij6t5h1lrnjbb5xs 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.ASSETS_AUD;
+
+    alter table CCM_CMS.LEGAL_METADATA_CONTRIBUTORS 
+        add constraint FKf9s3kxi6y5r60wksv5bospmx1 
+        foreign key (LEGAL_METADATA_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.LEGAL_METADATA_CONTRIBUTORS_AUD 
+        add constraint FKc3lonfk7mn3p14ix96k5u74om 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.LEGAL_METADATA_CONTRIBUTORS_AUD 
+        add constraint FKgxxsteesd2em96fj05f0u4men 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.LEGAL_METADATA_RIGHTS 
+        add constraint FKhsy9u7nrh3slmkkri3nba7e1 
+        foreign key (ASSET_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.LEGAL_METADATA_RIGHTS_AUD 
+        add constraint FKe2da3kha2nl6sj0dllhepuxtq 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.LEGAL_METADATA_RIGHTS_AUD 
+        add constraint FKr867xswbxlqq6diyqyqnrh670 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.LIFECYCLE_DEFINITION_DESCRIPTIONS 
+        add constraint FKsdr5aoogu4b9x95m8qsbe4t0y 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.LIFECYLE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYCLE_DEFINITION_LABELS 
+        add constraint FKt4h71sl91ue18b25pdjty7jex 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.LIFECYLE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYCLE_PHASE_DEFINITION_DESCRIPTIONS 
+        add constraint FKafbeck8qm0nflpt9aedn196ou 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.LIFECYCLE_PHASE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYCLE_PHASE_DEFINITION_LABELS 
+        add constraint FKqysn500b0sp7bu8gy2sf2q8b9 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.LIFECYCLE_PHASE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYCLE_PHASE_DEFINITIONS 
+        add constraint FKq5cwomuc9s1f3fsriq9t35407 
+        foreign key (LIFECYCLE_DEFINITION_ID) 
+        references CCM_CMS.LIFECYLE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYCLES 
+        add constraint FK5yx1a2f8g4w95p1ul77sfhow8 
+        foreign key (DEFINITION_ID) 
+        references CCM_CMS.LIFECYLE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYLE_PHASES 
+        add constraint FKpqysexvd82e4xd4uibtdfn8j4 
+        foreign key (DEFINITION_ID) 
+        references CCM_CMS.LIFECYCLE_PHASE_DEFINITIONS;
+
+    alter table CCM_CMS.LIFECYLE_PHASES 
+        add constraint FKlh2b1nokqxhf790lt7lhgoisc 
+        foreign key (LIFECYCLE_ID) 
+        references CCM_CMS.LIFECYCLES;
+
+    alter table CCM_CMS.MPA_SECTION_TEXTS 
+        add constraint FKaruovr4oa07syyhvkixfwc17h 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.MULTIPART_ARTICLE_SECTIONS;
+
+    alter table CCM_CMS.MPA_SECTION_TEXTS_AUD 
+        add constraint FKs4kvqroybq9ldb2rwhr6v8kmt 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MPA_SECTION_TEXTS_AUD 
+        add constraint FKpxvtsycad805c8u0vyh7pcb2c 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MPA_SECTION_TITLES 
+        add constraint FK7qpmrj6yjvad50k5budn5rag4 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.MULTIPART_ARTICLE_SECTIONS;
+
+    alter table CCM_CMS.MPA_SECTION_TITLES_AUD 
+        add constraint FKk64mi5911ybptw4slxh8i0lgb 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MPA_SECTION_TITLES_AUD 
+        add constraint FKq7f0y31r5tk2nesx0lv53d6sb 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MPA_SUMMARIES 
+        add constraint FK5kx5ghrkh6tqa2vms2qabacx8 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.MULTIPART_ARTICLES;
+
+    alter table CCM_CMS.MPA_SUMMARIES_AUD 
+        add constraint FKmmrabpl2gsrdb2udc76x9o6q7 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MPA_SUMMARIES_AUD 
+        add constraint FK3kebu6i1dtwfegp4409hhob4x 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MULTIPART_ARTICLE_SECTIONS 
+        add constraint FK30tkd6xp4i1gg6nrse4di2yxx 
+        foreign key (MULTIPART_ARTICLE_ID) 
+        references CCM_CMS.MULTIPART_ARTICLES;
+
+    alter table CCM_CMS.MULTIPART_ARTICLE_SECTIONS_AUD 
+        add constraint FK8xq6k3a1kmnxv9nh5wae80k6k 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MULTIPART_ARTICLE_SECTIONS_AUD 
+        add constraint FKsudhdaa9hs73447yik8mdy3ts 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MULTIPART_ARTICLES 
+        add constraint FKj7j0ew378cmcta2dfdso4tmey 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.MULTIPART_ARTICLES_AUD 
+        add constraint FKacl2u1cx6tmwfb9cpaxstw39k 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.CONTENT_ITEMS_AUD;
+
+    alter table CCM_CMS.MultiPartArticle_MultiPartArticleSection_AUD 
+        add constraint FK9vexjsvd62ufkgi4g24qiql70 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.MultiPartArticle_MultiPartArticleSection_AUD 
+        add constraint FK4ds2fgwphr74869qkn4e2yia6 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.NEWS 
+        add constraint FKl8jhpvtn0lx9drkhhbbuvqqis 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.NEWS_AUD 
+        add constraint FK7akvtda3f51espb46xtjalcl2 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.CONTENT_ITEMS_AUD;
+
+    alter table CCM_CMS.NEWS_TEXTS 
+        add constraint FK1s5m60rf80iaidktawb3ebmf3 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.NEWS;
+
+    alter table CCM_CMS.NEWS_TEXTS_AUD 
+        add constraint FKrand9sf233sgkgp8wfoen468l 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.NEWS_TEXTS_AUD 
+        add constraint FKotjtrajmmjxussl4pvy2vl7ho 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.RELATED_LINKS 
+        add constraint FKb517dnfj56oby2s34jp1omuim 
+        foreign key (BOOKMARK_ID) 
+        references CCM_CMS.BOOKMARKS;
+
+    alter table CCM_CMS.RELATED_LINKS 
+        add constraint FK7ts8tmnwxi8kry7cer3egujsv 
+        foreign key (TARGET_ITEM) 
+        references CCM_CMS.CONTENT_ITEMS;
+
+    alter table CCM_CMS.RELATED_LINKS 
+        add constraint FK35tv60a9kflo17h6xduvwvgis 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.RELATED_LINKS_AUD 
+        add constraint FKiuwk6mcj3h5gccu2aviq3d8lt 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.ASSETS_AUD;
+
+    alter table CCM_CMS.SIDE_NOTE_TEXTS 
+        add constraint FK4mvpioee23u1qswmn1fekipoh 
+        foreign key (SIDE_NOTE_ID) 
+        references CCM_CMS.SIDE_NOTES;
+
+    alter table CCM_CMS.SIDE_NOTE_TEXTS_AUD 
+        add constraint FKiu4ht1tipeal2csdkvws4fnws 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.SIDE_NOTE_TEXTS_AUD 
+        add constraint FKacekagiqks1cj9otxdmryl934 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CMS.SIDE_NOTES 
+        add constraint FKea6cikleenmkgw5bwus22mfr3 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.ASSETS;
+
+    alter table CCM_CMS.SIDE_NOTES_AUD 
+        add constraint FKl5pkg9mp2ymc2uo4kmlubyp3m 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.ASSETS_AUD;
+
+    alter table CCM_CMS.VIDEO_ASSETS 
+        add constraint FKjuywvv7wq9pyid5b6ivyrc0yk 
+        foreign key (LEGAL_METADATA_ID) 
+        references CCM_CMS.LEGAL_METADATA;
+
+    alter table CCM_CMS.VIDEO_ASSETS 
+        add constraint FKqt2cx1r31kqbqkimdld312i9g 
+        foreign key (OBJECT_ID) 
+        references CCM_CMS.BINARY_ASSETS;
+
+    alter table CCM_CMS.VIDEO_ASSETS_AUD 
+        add constraint FKdrx9uu9a03ju7vqvkjretohpk 
+        foreign key (OBJECT_ID, REV) 
+        references CCM_CMS.BINARY_ASSETS_AUD;
+
+    alter table CCM_CMS.WORKFLOW_TASKS 
+        add constraint FKoon3rwfmg0lhgbj4un4q3otya 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS;
 
     alter table CCM_CORE.APPLICATIONS 
         add constraint FKatcp9ij6mbkx0nfeig1o6n3lm 
@@ -2039,17 +2779,12 @@ create sequence hibernate_sequence start with 1 increment by 1;
         foreign key (WORKFLOW_ID) 
         references CCM_CORE.WORKFLOWS;
 
-    alter table CCM_CORE.WORKFLOW_TEMPLATES 
-        add constraint FK8692vdme4yxnkj1m0k1dw74pk 
-        foreign key (WORKFLOW_ID) 
-        references CCM_CORE.WORKFLOWS;
-
     alter table CCM_CORE.WORKFLOWS 
         add constraint FKrm2yfrs6veoxoy304upq2wc64 
         foreign key (OBJECT_ID) 
         references CCM_CORE.CCM_OBJECTS;
 
     alter table CCM_CORE.WORKFLOWS 
-        add constraint FKeixdxau4jebw682gd49tdbsjy 
+        add constraint FK9ray5beiny6wm2mi0uwyecay2 
         foreign key (TEMPLATE_ID) 
-        references CCM_CORE.WORKFLOW_TEMPLATES;
\ No newline at end of file
+        references CCM_CORE.WORKFLOWS;
\ No newline at end of file
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
index 9bbff0b53..cbff80620 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
index b6eb7c0e6..250e043ad 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
index fe218e65e..db41abd28 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
index 3015464f5..e560999a0 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
@@ -3,15 +3,19 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-140"
                         uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e"
+                        abstract_workflow="false"
                         active="true" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -27,10 +31,6 @@
                              locale="en"
                              localized_value="Fast workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
index 5dc79d79a..b9645feb9 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
@@ -3,15 +3,19 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-140"
                         uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e"
+                        abstract_workflow="false"
                         active="true" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -27,10 +31,6 @@
                              locale="en"
                              localized_value="Standard workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
index 275c99798..b2d399e77 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
index 2e6e6afc9..3b170dfab 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
index 388ca3e40..6fbe96126 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
index 8b8e50539..887afd569 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
@@ -3,12 +3,17 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
+
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
+
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -20,10 +25,6 @@
     <ccm_core.workflow_names workflow_id="-120" 
                              locale="en" 
                              localized_value="Projects Default workflow" />
-
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
     
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
index 9e6b9c06e..25e1877d5 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
@@ -3,12 +3,17 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
+
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
+
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +26,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
index f662ab21f..6d0e8d276 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
@@ -3,12 +3,15 @@
     
     <ccm_core.workflows workflow_id="-100"
                         uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-110"
                         uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
+                        abstract_workflow="true"
                         active="false" />
     <ccm_core.workflows workflow_id="-120"
                         uuid="017c6c19-db78-46f2-b771-dad2814319d3"
+                        abstract_workflow="true"
                         active="false" />
 
     <ccm_core.workflow_names workflow_id="-100" 
@@ -21,10 +24,6 @@
                              locale="en" 
                              localized_value="Projects Default workflow" />
     
-    <ccm_core.workflow_templates workflow_id="-100" />
-    <ccm_core.workflow_templates workflow_id="-110" />
-    <ccm_core.workflow_templates workflow_id="-120" />
-    
     <ccm_core.workflow_tasks task_id="-100100"
                              uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
                              active="false"