diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql
index 09f173746..a8e2ee16b 100644
--- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql
+++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql
@@ -4,10 +4,1298 @@ drop schema if exists CCM_CORE;
 drop sequence if exists HIBERNATE_SEQUENCE;
 
 
-    create schema CCM_CMS;
-
     create schema CCM_CORE;
 
+    create table CCM_CORE.APPLICATIONS (
+        APPLICATION_TYPE varchar(1024) not null,
+        PRIMARY_URL varchar(1024) not null,
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.ATTACHMENTS (
+        ATTACHMENT_ID bigint not null,
+        ATTACHMENT_DATA blob,
+        DESCRIPTION varchar(255),
+        MIME_TYPE varchar(255),
+        TITLE varchar(255),
+        MESSAGE_ID bigint,
+        primary key (ATTACHMENT_ID)
+    );
+
+    create table CCM_CORE.CATEGORIES (
+        ABSTRACT_CATEGORY boolean,
+        CATEGORY_ORDER bigint,
+        ENABLED boolean,
+        NAME varchar(255) not null,
+        UNIQUE_ID varchar(255),
+        VISIBLE boolean,
+        OBJECT_ID bigint not null,
+        PARENT_CATEGORY_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.CATEGORIZATIONS (
+        CATEGORIZATION_ID bigint not null,
+        CATEGORY_ORDER bigint,
+        CATEGORY_INDEX boolean,
+        OBJECT_ORDER bigint,
+        TYPE varchar(255),
+        OBJECT_ID bigint,
+        CATEGORY_ID bigint,
+        primary key (CATEGORIZATION_ID)
+    );
+
+    create table CCM_CORE.CATEGORY_DESCRIPTIONS (
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.CATEGORY_DOMAINS (
+        DOMAIN_KEY varchar(255) not null,
+        RELEASED timestamp,
+        URI varchar(1024),
+        VERSION varchar(255),
+        OBJECT_ID bigint not null,
+        ROOT_CATEGORY_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.CATEGORY_TITLES (
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.CCM_OBJECTS (
+        OBJECT_ID bigint not null,
+        DISPLAY_NAME varchar(255),
+        UUID varchar(255),
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.CCM_OBJECTS_AUD (
+        OBJECT_ID bigint not null,
+        REV integer not null,
+        REVTYPE tinyint,
+        REVEND integer,
+        DISPLAY_NAME varchar(255),
+        primary key (OBJECT_ID, REV)
+    );
+
+    create table CCM_CORE.CCM_REVISIONS (
+        id integer not null,
+        timestamp bigint not null,
+        USER_NAME varchar(255),
+        primary key (id)
+    );
+
+    create table CCM_CORE.CCM_ROLES (
+        ROLE_ID bigint not null,
+        NAME varchar(512) not null,
+        primary key (ROLE_ID)
+    );
+
+    create table CCM_CORE.DIGESTS (
+        FREQUENCY integer,
+        HEADER varchar(4096) not null,
+        NEXT_RUN timestamp,
+        DIGEST_SEPARATOR varchar(128) not null,
+        SIGNATURE varchar(4096) not null,
+        SUBJECT varchar(255) not null,
+        OBJECT_ID bigint not null,
+        FROM_PARTY_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.DOMAIN_DESCRIPTIONS (
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.DOMAIN_OWNERSHIPS (
+        OWNERSHIP_ID bigint not null,
+        CONTEXT varchar(255),
+        DOMAIN_ORDER bigint,
+        OWNER_ORDER bigint,
+        domain_OBJECT_ID bigint not null,
+        owner_OBJECT_ID bigint not null,
+        primary key (OWNERSHIP_ID)
+    );
+
+    create table CCM_CORE.DOMAIN_TITLES (
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
+        COMPONENT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (COMPONENT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_COMPONENTS (
+        ACTIVE boolean,
+        ADMIN_NAME varchar(255),
+        ATTRIBUTE_STRING varchar(255),
+        COMPONENT_ORDER bigint,
+        SELECTED boolean,
+        OBJECT_ID bigint not null,
+        parentComponent_OBJECT_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER (
+        BODY clob,
+        FROM_EMAIL varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS (
+        URL varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS (
+        MULTIPLE boolean,
+        QUERY varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_QUERIES (
+        QUERY_ID varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
+        DATA_QUERY_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (DATA_QUERY_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
+        DATA_QUERY_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (DATA_QUERY_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_FORMSECTIONS (
+        FORMSECTION_ACTION varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_LISTENERS (
+        ATTRIBUTE_STRING varchar(255),
+        CLASS_NAME varchar(255),
+        OBJECT_ID bigint not null,
+        widget_OBJECT_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_METAOBJECTS (
+        CLASS_NAME varchar(255),
+        PRETTY_NAME varchar(255),
+        PRETTY_PLURAL varchar(255),
+        PROPERTIES_FORM varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_OBJECT_TYPES (
+        APP_NAME varchar(255),
+        CLASS_NAME varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
+        OPTION_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OPTION_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_OPTIONS (
+        PARAMETER_VALUE varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
+        PROCESS_LISTENER_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (PROCESS_LISTENER_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
+        PROCESS_LISTENER_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (PROCESS_LISTENER_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS (
+        LISTENER_CLASS varchar(255),
+        PROCESS_LISTENER_ORDER bigint,
+        OBJECT_ID bigint not null,
+        formSection_OBJECT_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER (
+        REMOTE_URL varchar(2048),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS (
+        RECIPIENT varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS (
+        BODY clob,
+        RECIPIENT varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_WIDGETS (
+        DEFAULT_VALUE varchar(255),
+        PARAMETER_MODEL varchar(255),
+        PARAMETER_NAME varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS (
+        RECIPIENT varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.GROUP_MEMBERSHIPS (
+        MEMBERSHIP_ID bigint not null,
+        GROUP_ID bigint,
+        MEMBER_ID bigint,
+        primary key (MEMBERSHIP_ID)
+    );
+
+    create table CCM_CORE.GROUPS (
+        PARTY_ID bigint not null,
+        primary key (PARTY_ID)
+    );
+
+    create table CCM_CORE.HOSTS (
+        HOST_ID bigint not null,
+        SERVER_NAME varchar(512),
+        SERVER_PORT bigint,
+        primary key (HOST_ID)
+    );
+
+    create table CCM_CORE.INITS (
+        INITIALIZER_ID bigint not null,
+        CLASS_NAME varchar(255),
+        REQUIRED_BY_ID bigint,
+        primary key (INITIALIZER_ID)
+    );
+
+    create table CCM_CORE.INSTALLED_MODULES (
+        MODULE_ID integer not null,
+        MODULE_CLASS_NAME varchar(2048),
+        STATUS varchar(255),
+        primary key (MODULE_ID)
+    );
+
+    create table CCM_CORE.LUCENE_DOCUMENTS (
+        DOCUMENT_ID bigint not null,
+        CONTENT clob,
+        CONTENT_SECTION varchar(512),
+        COUNTRY varchar(8),
+        CREATED timestamp,
+        DIRTY bigint,
+        DOCUMENT_LANGUAGE varchar(8),
+        LAST_MODIFIED timestamp,
+        SUMMARY varchar(4096),
+        DOCUMENT_TIMESTAMP timestamp,
+        TITLE varchar(4096),
+        TYPE varchar(255),
+        TYPE_SPECIFIC_INFO varchar(512),
+        CREATED_BY_PARTY_ID bigint,
+        LAST_MODIFIED_BY bigint,
+        primary key (DOCUMENT_ID)
+    );
+
+    create table CCM_CORE.LUCENE_INDEXES (
+        INDEX_ID bigint not null,
+        LUCENE_INDEX_ID bigint,
+        HOST_ID bigint,
+        primary key (INDEX_ID)
+    );
+
+    create table CCM_CORE.MESSAGES (
+        BODY varchar(255),
+        BODY_MIME_TYPE varchar(255),
+        SENT timestamp,
+        SUBJECT varchar(255),
+        OBJECT_ID bigint not null,
+        IN_REPLY_TO_ID bigint,
+        SENDER_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.NOTIFICATIONS (
+        EXPAND_GROUP boolean,
+        EXPUNGE boolean,
+        EXPUNGE_MESSAGE boolean,
+        FULFILL_DATE timestamp,
+        HEADER varchar(4096),
+        MAX_RETRIES bigint,
+        REQUEST_DATE timestamp,
+        SIGNATURE varchar(4096),
+        STATUS varchar(32),
+        OBJECT_ID bigint not null,
+        DIGEST_ID bigint,
+        MESSAGE_ID bigint,
+        RECEIVER_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.ONE_TIME_AUTH_TOKENS (
+        TOKEN_ID bigint not null,
+        PURPOSE varchar(255),
+        TOKEN varchar(255),
+        VALID_UNTIL timestamp,
+        USER_ID bigint,
+        primary key (TOKEN_ID)
+    );
+
+    create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS (
+        COMPONENT_MODEL_ID bigint not null,
+        CLASS_ATTRIBUTE varchar(512),
+        ID_ATTRIBUTE varchar(255),
+        COMPONENT_KEY varchar(255),
+        MODEL_UUID varchar(255) not null,
+        STYLE_ATTRIBUTE varchar(1024),
+        UUID varchar(255) not null,
+        PAGE_MODEL_ID bigint,
+        primary key (COMPONENT_MODEL_ID)
+    );
+
+    create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS (
+        PAGE_MODEL_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (PAGE_MODEL_ID, LOCALE)
+    );
+
+    create table CCM_CORE.PAGE_MODEL_TITLES (
+        PAGE_MODEL_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (PAGE_MODEL_ID, LOCALE)
+    );
+
+    create table CCM_CORE.PAGE_MODELS (
+        PAGE_MODEL_ID bigint not null,
+        MODEL_UUID varchar(255) not null,
+        NAME varchar(255),
+        TYPE varchar(255) not null,
+        UUID varchar(255) not null,
+        VERSION varchar(255) not null,
+        APPLICATION_ID bigint,
+        primary key (PAGE_MODEL_ID)
+    );
+
+    create table CCM_CORE.PARTIES (
+        PARTY_ID bigint not null,
+        NAME varchar(256) not null,
+        primary key (PARTY_ID)
+    );
+
+    create table CCM_CORE.PERMISSIONS (
+        PERMISSION_ID bigint not null,
+        CREATION_DATE timestamp,
+        CREATION_IP varchar(255),
+        GRANTED_PRIVILEGE varchar(255),
+        INHERITED boolean,
+        CREATION_USER_ID bigint,
+        GRANTEE_ID bigint,
+        INHERITED_FROM_ID bigint,
+        OBJECT_ID bigint,
+        primary key (PERMISSION_ID)
+    );
+
+    create table CCM_CORE.PORTALS (
+        TEMPLATE boolean,
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.PORTLETS (
+        CELL_NUMBER bigint,
+        SORT_KEY bigint,
+        OBJECT_ID bigint not null,
+        PORTAL_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.QUEUE_ITEMS (
+        QUEUE_ITEM_ID bigint not null,
+        HEADER varchar(4096),
+        RECEIVER_ADDRESS varchar(512),
+        RETRY_COUNT bigint,
+        SIGNATURE varchar(4096),
+        SUCCESSFUL_SENDED boolean,
+        MESSAGE_ID bigint,
+        RECEIVER_ID bigint,
+        primary key (QUEUE_ITEM_ID)
+    );
+
+    create table CCM_CORE.RESOURCE_DESCRIPTIONS (
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.RESOURCE_TITLES (
+        OBJECT_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS (
+        RESOURCE_TYPE_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (RESOURCE_TYPE_ID, LOCALE)
+    );
+
+    create table CCM_CORE.RESOURCE_TYPES (
+        RESOURCE_TYPE_ID bigint not null,
+        SINGLETON boolean,
+        TITLE varchar(254) not null,
+        EMBEDDED_VIEW boolean,
+        FULL_PAGE_VIEW boolean,
+        WORKSPACE_APP boolean,
+        primary key (RESOURCE_TYPE_ID)
+    );
+
+    create table CCM_CORE.RESOURCES (
+        CREATED timestamp,
+        OBJECT_ID bigint not null,
+        parent_OBJECT_ID bigint,
+        resourceType_RESOURCE_TYPE_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.ROLE_DESCRIPTIONS (
+        ROLE_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (ROLE_ID, LOCALE)
+    );
+
+    create table CCM_CORE.ROLE_MEMBERSHIPS (
+        MEMBERSHIP_ID bigint not null,
+        MEMBER_ID bigint,
+        ROLE_ID bigint,
+        primary key (MEMBERSHIP_ID)
+    );
+
+    create table CCM_CORE.SETTINGS (
+        DTYPE varchar(31) not null,
+        SETTING_ID bigint not null,
+        CONFIGURATION_CLASS varchar(512) not null,
+        NAME varchar(512) not null,
+        SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
+        SETTING_VALUE_DOUBLE double,
+        SETTING_VALUE_LONG bigint,
+        SETTING_VALUE_BOOLEAN boolean,
+        primary key (SETTING_ID)
+    );
+
+    create table CCM_CORE.SETTINGS_ENUM_VALUES (
+        ENUM_ID bigint not null,
+        value varchar(255)
+    );
+
+    create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
+        ENTRY_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (ENTRY_ID, LOCALE)
+    );
+
+    create table CCM_CORE.SETTINGS_STRING_LIST (
+        LIST_ID bigint not null,
+        value varchar(255)
+    );
+
+    create table CCM_CORE.SITE_AWARE_APPLICATIONS (
+        OBJECT_ID bigint not null,
+        SITE_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.SITES (
+        DEFAULT_SITE boolean,
+        DEFAULT_THEME varchar(255),
+        DOMAIN_OF_SITE varchar(255),
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.THEME_DATA_FILES (
+        CREATION_DATE timestamp,
+        FILE_DATA blob,
+        LAST_MODIFIED timestamp,
+        FILE_SIZE bigint,
+        TYPE varchar(255),
+        FILE_ID bigint not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.theme_directories (
+        FILE_ID bigint not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEME_FILES (
+        FILE_ID bigint not null,
+        NAME varchar(255) not null,
+        FILE_PATH varchar(8192) not null,
+        UUID varchar(255) not null,
+        PARENT_DIRECTORY_ID bigint,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEMES (
+        THEME_ID bigint not null,
+        NAME varchar(255),
+        UUID varchar(255),
+        VERSION varchar(255),
+        ROOT_DIRECTORY_ID bigint,
+        primary key (THEME_ID)
+    );
+
+    create table CCM_CORE.THREADS (
+        OBJECT_ID bigint not null,
+        ROOT_ID bigint,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.USER_EMAIL_ADDRESSES (
+        USER_ID bigint not null,
+        EMAIL_ADDRESS varchar(512) not null,
+        BOUNCING boolean,
+        VERIFIED boolean
+    );
+
+    create table CCM_CORE.USERS (
+        BANNED boolean,
+        FAMILY_NAME varchar(512),
+        GIVEN_NAME varchar(512),
+        PASSWORD varchar(2048),
+        PASSWORD_RESET_REQUIRED boolean,
+        EMAIL_ADDRESS varchar(512) not null,
+        BOUNCING boolean,
+        VERIFIED boolean,
+        PARTY_ID bigint not null,
+        primary key (PARTY_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS (
+        DUE_DATE timestamp,
+        DURATION_MINUTES bigint,
+        LOCKED boolean,
+        START_DATE timestamp,
+        TASK_ID bigint not null,
+        LOCKING_USER_ID bigint,
+        NOTIFICATION_SENDER bigint,
+        primary key (TASK_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
+        WORKFLOW_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (WORKFLOW_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_NAMES (
+        WORKFLOW_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (WORKFLOW_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS (
+        TASK_ASSIGNMENT_ID bigint not null,
+        ROLE_ID bigint,
+        TASK_ID bigint,
+        primary key (TASK_ASSIGNMENT_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_COMMENTS (
+        COMMENT_ID bigint not null,
+        COMMENT varchar(2147483647),
+        UUID varchar(255) not null,
+        AUTHOR_ID bigint,
+        TASK_ID bigint,
+        primary key (COMMENT_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES (
+        TASK_DEPENDENCY_ID bigint not null,
+        BLOCKED_TASK_ID bigint,
+        BLOCKING_TASK_ID bigint,
+        primary key (TASK_DEPENDENCY_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS (
+        TASK_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (TASK_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_LABELS (
+        TASK_ID bigint not null,
+        LOCALIZED_VALUE varchar(2147483647),
+        LOCALE varchar(255) not null,
+        primary key (TASK_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASKS (
+        TASK_ID bigint not null,
+        ACTIVE boolean,
+        TASK_STATE varchar(512),
+        UUID varchar(255) not null,
+        WORKFLOW_ID bigint,
+        primary key (TASK_ID)
+    );
+
+    create table CCM_CORE.WORKFLOWS (
+        WORKFLOW_ID bigint not null,
+        abstract_workflow boolean,
+        ACTIVE boolean,
+        WORKFLOW_STATE varchar(255),
+        TASKS_STATE varchar(255),
+        UUID varchar(255) not null,
+        OBJECT_ID bigint,
+        TEMPLATE_ID bigint,
+        primary key (WORKFLOW_ID)
+    );
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY);
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI);
+
+    alter table CCM_CORE.CCM_OBJECTS 
+        add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID);
+
+    alter table CCM_CORE.HOSTS 
+        add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT);
+
+    alter table CCM_CORE.INSTALLED_MODULES 
+        add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME);
+
+    alter table CCM_CORE.SETTINGS 
+        add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME);
+
+    alter table CCM_CORE.SITES 
+        add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE);
+
+    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
+        add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID);
+
+    alter table CCM_CORE.WORKFLOW_TASKS 
+        add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID);
+
+    alter table CCM_CORE.WORKFLOWS 
+        add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID);
+
+    create sequence hibernate_sequence start with 1 increment by 1;
+
+    alter table CCM_CORE.APPLICATIONS 
+        add constraint FKatcp9ij6mbkx0nfeig1o6n3lm 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.ATTACHMENTS 
+        add constraint FK8ju9hm9baceridp803nislkwb 
+        foreign key (MESSAGE_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.CATEGORIES 
+        add constraint FKrj3marx99nheur4fqanm0ylur 
+        foreign key (PARENT_CATEGORY_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORIES 
+        add constraint FKpm291swli2musd0204phta652 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.CATEGORIZATIONS 
+        add constraint FKejp0ubk034nfq60v1po6srkke 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.CATEGORIZATIONS 
+        add constraint FKoyeipswl876wa6mqwbx0uy83h 
+        foreign key (CATEGORY_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORY_DESCRIPTIONS 
+        add constraint FKhiwjlmh5vkbu3v3vng1la1qum 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint FKf25vi73cji01w8fgo6ow1dgg 
+        foreign key (ROOT_CATEGORY_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint FK58xpmnvciohkom1c16oua4xha 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.CATEGORY_TITLES 
+        add constraint FKka9bt9f5br0kji5bcjxcmf6ch 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CCM_OBJECTS_AUD 
+        add constraint FKr00eauutiyvocno8ckx6h9nw6 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CORE.CCM_OBJECTS_AUD 
+        add constraint FKo5s37ctcdny7tmewjwv7705h5 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CORE.DIGESTS 
+        add constraint FKc53g09agnye3w1v4euy3e0gsi 
+        foreign key (FROM_PARTY_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.DIGESTS 
+        add constraint FK845r9ep6xu6nbt1mvxulwybym 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.DOMAIN_DESCRIPTIONS 
+        add constraint FKn4i2dxgn8cqysa62dds6eih6a 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORY_DOMAINS;
+
+    alter table CCM_CORE.DOMAIN_OWNERSHIPS 
+        add constraint FK47nsasr7jrdwlky5gx0u6e9py 
+        foreign key (domain_OBJECT_ID) 
+        references CCM_CORE.CATEGORY_DOMAINS;
+
+    alter table CCM_CORE.DOMAIN_OWNERSHIPS 
+        add constraint FK3u4hq6yqau4m419b1xva3xpwq 
+        foreign key (owner_OBJECT_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CORE.DOMAIN_TITLES 
+        add constraint FK5p526dsdwn94els6lp5w0hdn4 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORY_DOMAINS;
+
+    alter table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS 
+        add constraint FKfh0k9lj3pf4amfc9bbbss0tr1 
+        foreign key (COMPONENT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_COMPONENTS 
+        add constraint FKpcpmvyiix023b4g5n4q8nkfca 
+        foreign key (parentComponent_OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_COMPONENTS 
+        add constraint FKt0e0uv00pp1rwhyaltrytghnm 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER 
+        add constraint FK48khrbud3xhi2gvsvnlttd8tg 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS 
+        add constraint FKbyjjt2ufendvje2obtge2l7et 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS 
+        add constraint FK8oriyta1957u7dvbrqk717944 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_WIDGETS;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_QUERIES 
+        add constraint FKhhaxpeddbtmrnjr5o0fopju3a 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS 
+        add constraint FKsmduu1opoiulkeo2gc8v7lsbn 
+        foreign key (DATA_QUERY_ID) 
+        references CCM_CORE.FORMBUILDER_DATA_QUERIES;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES 
+        add constraint FKju1x82inrw3kguyjuxoetn6gn 
+        foreign key (DATA_QUERY_ID) 
+        references CCM_CORE.FORMBUILDER_DATA_QUERIES;
+
+    alter table CCM_CORE.FORMBUILDER_FORMSECTIONS 
+        add constraint FKnfhsgxp4lvigq2pm33pn4afac 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_LISTENERS 
+        add constraint FK33ilyirwoux28yowafgd5xx0o 
+        foreign key (widget_OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_WIDGETS;
+
+    alter table CCM_CORE.FORMBUILDER_LISTENERS 
+        add constraint FKlqm76746nq5yrt8ganm474uu0 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_METAOBJECTS 
+        add constraint FKf963v6u9mw8pwjmasrw51w8dx 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_OBJECT_TYPES 
+        add constraint FKkv337e83rsecf0h3qy8bu7l9w 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_OPTION_LABELS 
+        add constraint FKatlsylsvln6yse55eof6wwkj6 
+        foreign key (OPTION_ID) 
+        references CCM_CORE.FORMBUILDER_OPTIONS;
+
+    alter table CCM_CORE.FORMBUILDER_OPTIONS 
+        add constraint FKhe5q71wby9g4i56sotc501h11 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS 
+        add constraint FKcv3iu04gxjk9c0pn6tl8rqqv3 
+        foreign key (PROCESS_LISTENER_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES 
+        add constraint FK8rnyb1m6ij3b9hhmhr7klgd4p 
+        foreign key (PROCESS_LISTENER_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS 
+        add constraint FK7uiaeax8qafm82e5k729ms5ku 
+        foreign key (formSection_OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_FORMSECTIONS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS 
+        add constraint FKbdnloo884qk6gn36jwiqv5rlp 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER 
+        add constraint FKpajvu9m6fj1enm67a9gcb5ii9 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS 
+        add constraint FKsn82ktlq0c9ikijyv8k2bfv4f 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS 
+        add constraint FK8kjyu72btjsuaaqh4bvd8npns 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_WIDGETS 
+        add constraint FK1wosr4ujbfckdc50u5fgmrhrk 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS 
+        add constraint FKjie9co03m7ow4ihig5rk7l8oj 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.GROUP_MEMBERSHIPS 
+        add constraint FKq4qnny8ri3eo7eqh4olxco8nk 
+        foreign key (GROUP_ID) 
+        references CCM_CORE.GROUPS;
+
+    alter table CCM_CORE.GROUP_MEMBERSHIPS 
+        add constraint FKc8u86ivkhvoiw6ju8b2p365he 
+        foreign key (MEMBER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.GROUPS 
+        add constraint FK4f61mlqxw0ct6s7wwpi9m0735 
+        foreign key (PARTY_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.INITS 
+        add constraint FK3nvvxk10nmq9nfuko8yklqdgc 
+        foreign key (REQUIRED_BY_ID) 
+        references CCM_CORE.INITS;
+
+    alter table CCM_CORE.LUCENE_DOCUMENTS 
+        add constraint FK942kl4yff8rdiwr0pjk2a9g8 
+        foreign key (CREATED_BY_PARTY_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.LUCENE_DOCUMENTS 
+        add constraint FKc5rs6afx4p9fidabfqsxr5ble 
+        foreign key (LAST_MODIFIED_BY) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.LUCENE_INDEXES 
+        add constraint FK6gu0yrlviqk07dtb3r02iw43f 
+        foreign key (HOST_ID) 
+        references CCM_CORE.HOSTS;
+
+    alter table CCM_CORE.MESSAGES 
+        add constraint FKph10aehmg9f20pn2w4buki97q 
+        foreign key (IN_REPLY_TO_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.MESSAGES 
+        add constraint FKjufsx3c3h538fj35h8hgfnb1p 
+        foreign key (SENDER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.MESSAGES 
+        add constraint FK6w20ao7scwecd9mfwpun2ddqx 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FKqk70c1x1dklhty9ju5t4wukd9 
+        foreign key (DIGEST_ID) 
+        references CCM_CORE.DIGESTS;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FKtt4fjr2p75og79jxxgd8q8mr 
+        foreign key (MESSAGE_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FK2vlnma0ox43j0clx8ead08n5s 
+        foreign key (RECEIVER_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FKf423hhiaw1bexpxeh1pnas7qt 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.ONE_TIME_AUTH_TOKENS 
+        add constraint FKtplfuphkiorfkttaewb4wmfjc 
+        foreign key (USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS 
+        add constraint FKo696ch035fe7rrueol1po13od 
+        foreign key (PAGE_MODEL_ID) 
+        references CCM_CORE.PAGE_MODELS;
+
+    alter table CCM_CORE.PAGE_MODEL_DESCRIPTIONS 
+        add constraint FKcc5d6eqxu1369k8ycyyt6vn3e 
+        foreign key (PAGE_MODEL_ID) 
+        references CCM_CORE.PAGE_MODELS;
+
+    alter table CCM_CORE.PAGE_MODEL_TITLES 
+        add constraint FKj14q9911yhd4js9p6rs21rwjf 
+        foreign key (PAGE_MODEL_ID) 
+        references CCM_CORE.PAGE_MODELS;
+
+    alter table CCM_CORE.PAGE_MODELS 
+        add constraint FKk2lihllrxj89mn3tqv43amafe 
+        foreign key (APPLICATION_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKj9di7pawxgtouxmu2k44bj5c4 
+        foreign key (CREATION_USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKikx3x0kn9fito23g50v6xbr9f 
+        foreign key (GRANTEE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKg56ujjoe0j30pq579rf0l5yc6 
+        foreign key (INHERITED_FROM_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKkamckexjnffnt8lay9nqeawhm 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.PORTALS 
+        add constraint FK5a2hdrbw03mmgr74vj5nxlpvk 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.PORTLETS 
+        add constraint FK9gr5xjt3rx4uhtw7vl6adruol 
+        foreign key (PORTAL_ID) 
+        references CCM_CORE.PORTALS;
+
+    alter table CCM_CORE.PORTLETS 
+        add constraint FKjmx9uebt0gwxkw3xv34niy35f 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.QUEUE_ITEMS 
+        add constraint FKtgkwfruv9kjdybf46l02da088 
+        foreign key (MESSAGE_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.QUEUE_ITEMS 
+        add constraint FKs9aq1hyxstwmvx7fmfifp4x7r 
+        foreign key (RECEIVER_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.RESOURCE_DESCRIPTIONS 
+        add constraint FKk9arvj5u21rv23ce3cav4opqx 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.RESOURCE_TITLES 
+        add constraint FKto4p6n2wklljyf7tmuxtmyfe0 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS 
+        add constraint FKckpihjtv23iahbg3imnpbsr2 
+        foreign key (RESOURCE_TYPE_ID) 
+        references CCM_CORE.RESOURCE_TYPES;
+
+    alter table CCM_CORE.RESOURCES 
+        add constraint FKbo7ibfgodicn9flv2gfo11g5a 
+        foreign key (parent_OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.RESOURCES 
+        add constraint FK262fbwetpjx3k4uuvw24wsiv 
+        foreign key (resourceType_RESOURCE_TYPE_ID) 
+        references CCM_CORE.RESOURCE_TYPES;
+
+    alter table CCM_CORE.RESOURCES 
+        add constraint FKbjdf8pm4frth8r06ev2qjm88f 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.ROLE_DESCRIPTIONS 
+        add constraint FKo09bh4j3k3k0ph3awvjwx31ft 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.ROLE_MEMBERSHIPS 
+        add constraint FK9m88ywi7rcin7b7jrgh53emrq 
+        foreign key (MEMBER_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.ROLE_MEMBERSHIPS 
+        add constraint FKcsyogv5m2rgsrmtgnhgkjhfw7 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.SETTINGS_ENUM_VALUES 
+        add constraint FK8mw4p92s0h3h8bmo8saowu32i 
+        foreign key (ENUM_ID) 
+        references CCM_CORE.SETTINGS;
+
+    alter table CCM_CORE.SETTINGS_L10N_STR_VALUES 
+        add constraint FK5knjq7cisej0qfx5dw1y93rou 
+        foreign key (ENTRY_ID) 
+        references CCM_CORE.SETTINGS;
+
+    alter table CCM_CORE.SETTINGS_STRING_LIST 
+        add constraint FKqeclqa5sf1g53vxs857tpwrus 
+        foreign key (LIST_ID) 
+        references CCM_CORE.SETTINGS;
+
+    alter table CCM_CORE.SITE_AWARE_APPLICATIONS 
+        add constraint FKopo91c29jaunpcusjwlphhxkd 
+        foreign key (SITE_ID) 
+        references CCM_CORE.SITES;
+
+    alter table CCM_CORE.SITE_AWARE_APPLICATIONS 
+        add constraint FKslbu2qagg23dmdu01lun7oh7x 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CORE.SITES 
+        add constraint FKrca95c6p023men53b8ayu26kp 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THREADS 
+        add constraint FKsx08mpwvwnw97uwdgjs76q39g 
+        foreign key (ROOT_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.THREADS 
+        add constraint FKp97b1sy1kop07rtapeh5l9fb2 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.USER_EMAIL_ADDRESSES 
+        add constraint FKr900l79erul95seyyccf04ufc 
+        foreign key (USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.USERS 
+        add constraint FKosh928q71aonu6l1kurb417r 
+        foreign key (PARTY_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS 
+        add constraint FK1pnsq9ur3ylq0ghuj23p4cogs 
+        foreign key (LOCKING_USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS 
+        add constraint FK9ngp088m8xa82swy7yg3qx6vh 
+        foreign key (NOTIFICATION_SENDER) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS 
+        add constraint FKt9ha3no3bj8a50pnw8cnqh2cq 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_DESCRIPTIONS 
+        add constraint FKgx7upkqky82dpxvbs95imfl9l 
+        foreign key (WORKFLOW_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CORE.WORKFLOW_NAMES 
+        add constraint FKkxedy9p48avfk45r0bn4uc09i 
+        foreign key (WORKFLOW_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS 
+        add constraint FKpq4paqtfbi5erhh98wl1ja005 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS 
+        add constraint FK3933ol31co3yn5ee75b2hmhgp 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
+        add constraint FKd2ymdg8nay9pmh2nn2whba0j8 
+        foreign key (AUTHOR_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
+        add constraint FKkfqrf9jdvm7livu5if06w0r5t 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES 
+        add constraint FKy88tppv7ihx0lsn6g64f5lfq 
+        foreign key (BLOCKED_TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES 
+        add constraint FKrj80uilojn73u9a4xgk3vt0cj 
+        foreign key (BLOCKING_TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS 
+        add constraint FKeb7mqbdx3bk7t01vo7kp2hpf 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_LABELS 
+        add constraint FKf715qud6g9xv2xeb8rrpnv4xs 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASKS 
+        add constraint FK1693cbc36e4d8gucg8q7sc57e 
+        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 FK9ray5beiny6wm2mi0uwyecay2 
+        foreign key (TEMPLATE_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    create schema CCM_CMS;
+
     create table CCM_CMS.ARTICLE_TEXTS (
         OBJECT_ID bigint not null,
         LOCALIZED_VALUE varchar(2147483647),
@@ -908,709 +2196,6 @@ drop sequence if exists HIBERNATE_SEQUENCE;
     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,
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.ATTACHMENTS (
-        ATTACHMENT_ID bigint not null,
-        ATTACHMENT_DATA blob,
-        DESCRIPTION varchar(255),
-        MIME_TYPE varchar(255),
-        TITLE varchar(255),
-        MESSAGE_ID bigint,
-        primary key (ATTACHMENT_ID)
-    );
-
-    create table CCM_CORE.CATEGORIES (
-        ABSTRACT_CATEGORY boolean,
-        CATEGORY_ORDER bigint,
-        ENABLED boolean,
-        NAME varchar(255) not null,
-        UNIQUE_ID varchar(255),
-        VISIBLE boolean,
-        OBJECT_ID bigint not null,
-        PARENT_CATEGORY_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.CATEGORIZATIONS (
-        CATEGORIZATION_ID bigint not null,
-        CATEGORY_ORDER bigint,
-        CATEGORY_INDEX boolean,
-        OBJECT_ORDER bigint,
-        TYPE varchar(255),
-        OBJECT_ID bigint,
-        CATEGORY_ID bigint,
-        primary key (CATEGORIZATION_ID)
-    );
-
-    create table CCM_CORE.CATEGORY_DESCRIPTIONS (
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.CATEGORY_DOMAINS (
-        DOMAIN_KEY varchar(255) not null,
-        RELEASED timestamp,
-        URI varchar(1024),
-        VERSION varchar(255),
-        OBJECT_ID bigint not null,
-        ROOT_CATEGORY_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.CATEGORY_TITLES (
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.CCM_OBJECTS (
-        OBJECT_ID bigint not null,
-        DISPLAY_NAME varchar(255),
-        UUID varchar(255),
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.CCM_OBJECTS_AUD (
-        OBJECT_ID bigint not null,
-        REV integer not null,
-        REVTYPE tinyint,
-        REVEND integer,
-        DISPLAY_NAME varchar(255),
-        primary key (OBJECT_ID, REV)
-    );
-
-    create table CCM_CORE.CCM_REVISIONS (
-        id integer not null,
-        timestamp bigint not null,
-        USER_NAME varchar(255),
-        primary key (id)
-    );
-
-    create table CCM_CORE.CCM_ROLES (
-        ROLE_ID bigint not null,
-        NAME varchar(512) not null,
-        primary key (ROLE_ID)
-    );
-
-    create table CCM_CORE.DIGESTS (
-        FREQUENCY integer,
-        HEADER varchar(4096) not null,
-        NEXT_RUN timestamp,
-        DIGEST_SEPARATOR varchar(128) not null,
-        SIGNATURE varchar(4096) not null,
-        SUBJECT varchar(255) not null,
-        OBJECT_ID bigint not null,
-        FROM_PARTY_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.DOMAIN_DESCRIPTIONS (
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.DOMAIN_OWNERSHIPS (
-        OWNERSHIP_ID bigint not null,
-        CONTEXT varchar(255),
-        DOMAIN_ORDER bigint,
-        OWNER_ORDER bigint,
-        domain_OBJECT_ID bigint not null,
-        owner_OBJECT_ID bigint not null,
-        primary key (OWNERSHIP_ID)
-    );
-
-    create table CCM_CORE.DOMAIN_TITLES (
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
-        COMPONENT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (COMPONENT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_COMPONENTS (
-        ACTIVE boolean,
-        ADMIN_NAME varchar(255),
-        ATTRIBUTE_STRING varchar(255),
-        COMPONENT_ORDER bigint,
-        SELECTED boolean,
-        OBJECT_ID bigint not null,
-        parentComponent_OBJECT_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER (
-        BODY clob,
-        FROM_EMAIL varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS (
-        URL varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS (
-        MULTIPLE boolean,
-        QUERY varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_QUERIES (
-        QUERY_ID varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
-        DATA_QUERY_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (DATA_QUERY_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
-        DATA_QUERY_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (DATA_QUERY_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_FORMSECTIONS (
-        FORMSECTION_ACTION varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_LISTENERS (
-        ATTRIBUTE_STRING varchar(255),
-        CLASS_NAME varchar(255),
-        OBJECT_ID bigint not null,
-        widget_OBJECT_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_METAOBJECTS (
-        CLASS_NAME varchar(255),
-        PRETTY_NAME varchar(255),
-        PRETTY_PLURAL varchar(255),
-        PROPERTIES_FORM varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_OBJECT_TYPES (
-        APP_NAME varchar(255),
-        CLASS_NAME varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
-        OPTION_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OPTION_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_OPTIONS (
-        PARAMETER_VALUE varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
-        PROCESS_LISTENER_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (PROCESS_LISTENER_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
-        PROCESS_LISTENER_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (PROCESS_LISTENER_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS (
-        LISTENER_CLASS varchar(255),
-        PROCESS_LISTENER_ORDER bigint,
-        OBJECT_ID bigint not null,
-        formSection_OBJECT_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER (
-        REMOTE_URL varchar(2048),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS (
-        RECIPIENT varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS (
-        BODY clob,
-        RECIPIENT varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_WIDGETS (
-        DEFAULT_VALUE varchar(255),
-        PARAMETER_MODEL varchar(255),
-        PARAMETER_NAME varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS (
-        RECIPIENT varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.GROUP_MEMBERSHIPS (
-        MEMBERSHIP_ID bigint not null,
-        GROUP_ID bigint,
-        MEMBER_ID bigint,
-        primary key (MEMBERSHIP_ID)
-    );
-
-    create table CCM_CORE.GROUPS (
-        PARTY_ID bigint not null,
-        primary key (PARTY_ID)
-    );
-
-    create table CCM_CORE.HOSTS (
-        HOST_ID bigint not null,
-        SERVER_NAME varchar(512),
-        SERVER_PORT bigint,
-        primary key (HOST_ID)
-    );
-
-    create table CCM_CORE.INITS (
-        INITIALIZER_ID bigint not null,
-        CLASS_NAME varchar(255),
-        REQUIRED_BY_ID bigint,
-        primary key (INITIALIZER_ID)
-    );
-
-    create table CCM_CORE.INSTALLED_MODULES (
-        MODULE_ID integer not null,
-        MODULE_CLASS_NAME varchar(2048),
-        STATUS varchar(255),
-        primary key (MODULE_ID)
-    );
-
-    create table CCM_CORE.LUCENE_DOCUMENTS (
-        DOCUMENT_ID bigint not null,
-        CONTENT clob,
-        CONTENT_SECTION varchar(512),
-        COUNTRY varchar(8),
-        CREATED timestamp,
-        DIRTY bigint,
-        DOCUMENT_LANGUAGE varchar(8),
-        LAST_MODIFIED timestamp,
-        SUMMARY varchar(4096),
-        DOCUMENT_TIMESTAMP timestamp,
-        TITLE varchar(4096),
-        TYPE varchar(255),
-        TYPE_SPECIFIC_INFO varchar(512),
-        CREATED_BY_PARTY_ID bigint,
-        LAST_MODIFIED_BY bigint,
-        primary key (DOCUMENT_ID)
-    );
-
-    create table CCM_CORE.LUCENE_INDEXES (
-        INDEX_ID bigint not null,
-        LUCENE_INDEX_ID bigint,
-        HOST_ID bigint,
-        primary key (INDEX_ID)
-    );
-
-    create table CCM_CORE.MESSAGES (
-        BODY varchar(255),
-        BODY_MIME_TYPE varchar(255),
-        SENT timestamp,
-        SUBJECT varchar(255),
-        OBJECT_ID bigint not null,
-        IN_REPLY_TO_ID bigint,
-        SENDER_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.NOTIFICATIONS (
-        EXPAND_GROUP boolean,
-        EXPUNGE boolean,
-        EXPUNGE_MESSAGE boolean,
-        FULFILL_DATE timestamp,
-        HEADER varchar(4096),
-        MAX_RETRIES bigint,
-        REQUEST_DATE timestamp,
-        SIGNATURE varchar(4096),
-        STATUS varchar(32),
-        OBJECT_ID bigint not null,
-        DIGEST_ID bigint,
-        MESSAGE_ID bigint,
-        RECEIVER_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.ONE_TIME_AUTH_TOKENS (
-        TOKEN_ID bigint not null,
-        PURPOSE varchar(255),
-        TOKEN varchar(255),
-        VALID_UNTIL timestamp,
-        USER_ID bigint,
-        primary key (TOKEN_ID)
-    );
-
-    create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS (
-        COMPONENT_MODEL_ID bigint not null,
-        CLASS_ATTRIBUTE varchar(512),
-        ID_ATTRIBUTE varchar(255),
-        COMPONENT_KEY varchar(255),
-        MODEL_UUID varchar(255) not null,
-        STYLE_ATTRIBUTE varchar(1024),
-        UUID varchar(255) not null,
-        PAGE_MODEL_ID bigint,
-        primary key (COMPONENT_MODEL_ID)
-    );
-
-    create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS (
-        PAGE_MODEL_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (PAGE_MODEL_ID, LOCALE)
-    );
-
-    create table CCM_CORE.PAGE_MODEL_TITLES (
-        PAGE_MODEL_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (PAGE_MODEL_ID, LOCALE)
-    );
-
-    create table CCM_CORE.PAGE_MODELS (
-        PAGE_MODEL_ID bigint not null,
-        MODEL_UUID varchar(255) not null,
-        NAME varchar(255),
-        TYPE varchar(255) not null,
-        UUID varchar(255) not null,
-        VERSION varchar(255) not null,
-        APPLICATION_ID bigint,
-        primary key (PAGE_MODEL_ID)
-    );
-
-    create table CCM_CORE.PARTIES (
-        PARTY_ID bigint not null,
-        NAME varchar(256) not null,
-        primary key (PARTY_ID)
-    );
-
-    create table CCM_CORE.PERMISSIONS (
-        PERMISSION_ID bigint not null,
-        CREATION_DATE timestamp,
-        CREATION_IP varchar(255),
-        GRANTED_PRIVILEGE varchar(255),
-        INHERITED boolean,
-        CREATION_USER_ID bigint,
-        GRANTEE_ID bigint,
-        INHERITED_FROM_ID bigint,
-        OBJECT_ID bigint,
-        primary key (PERMISSION_ID)
-    );
-
-    create table CCM_CORE.PORTALS (
-        TEMPLATE boolean,
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.PORTLETS (
-        CELL_NUMBER bigint,
-        SORT_KEY bigint,
-        OBJECT_ID bigint not null,
-        PORTAL_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.QUEUE_ITEMS (
-        QUEUE_ITEM_ID bigint not null,
-        HEADER varchar(4096),
-        RECEIVER_ADDRESS varchar(512),
-        RETRY_COUNT bigint,
-        SIGNATURE varchar(4096),
-        SUCCESSFUL_SENDED boolean,
-        MESSAGE_ID bigint,
-        RECEIVER_ID bigint,
-        primary key (QUEUE_ITEM_ID)
-    );
-
-    create table CCM_CORE.RESOURCE_DESCRIPTIONS (
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.RESOURCE_TITLES (
-        OBJECT_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS (
-        RESOURCE_TYPE_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (RESOURCE_TYPE_ID, LOCALE)
-    );
-
-    create table CCM_CORE.RESOURCE_TYPES (
-        RESOURCE_TYPE_ID bigint not null,
-        SINGLETON boolean,
-        TITLE varchar(254) not null,
-        EMBEDDED_VIEW boolean,
-        FULL_PAGE_VIEW boolean,
-        WORKSPACE_APP boolean,
-        primary key (RESOURCE_TYPE_ID)
-    );
-
-    create table CCM_CORE.RESOURCES (
-        CREATED timestamp,
-        OBJECT_ID bigint not null,
-        parent_OBJECT_ID bigint,
-        resourceType_RESOURCE_TYPE_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.ROLE_DESCRIPTIONS (
-        ROLE_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (ROLE_ID, LOCALE)
-    );
-
-    create table CCM_CORE.ROLE_MEMBERSHIPS (
-        MEMBERSHIP_ID bigint not null,
-        MEMBER_ID bigint,
-        ROLE_ID bigint,
-        primary key (MEMBERSHIP_ID)
-    );
-
-    create table CCM_CORE.SETTINGS (
-        DTYPE varchar(31) not null,
-        SETTING_ID bigint not null,
-        CONFIGURATION_CLASS varchar(512) not null,
-        NAME varchar(512) not null,
-        SETTING_VALUE_DOUBLE double,
-        SETTING_VALUE_LONG bigint,
-        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
-        SETTING_VALUE_STRING varchar(1024),
-        SETTING_VALUE_BOOLEAN boolean,
-        primary key (SETTING_ID)
-    );
-
-    create table CCM_CORE.SETTINGS_ENUM_VALUES (
-        ENUM_ID bigint not null,
-        value varchar(255)
-    );
-
-    create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
-        ENTRY_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (ENTRY_ID, LOCALE)
-    );
-
-    create table CCM_CORE.SETTINGS_STRING_LIST (
-        LIST_ID bigint not null,
-        value varchar(255)
-    );
-
-    create table CCM_CORE.SITE_AWARE_APPLICATIONS (
-        OBJECT_ID bigint not null,
-        SITE_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.SITES (
-        DEFAULT_SITE boolean,
-        DEFAULT_THEME varchar(255),
-        DOMAIN_OF_SITE varchar(255),
-        OBJECT_ID bigint not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.THREADS (
-        OBJECT_ID bigint not null,
-        ROOT_ID bigint,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.USER_EMAIL_ADDRESSES (
-        USER_ID bigint not null,
-        EMAIL_ADDRESS varchar(512) not null,
-        BOUNCING boolean,
-        VERIFIED boolean
-    );
-
-    create table CCM_CORE.USERS (
-        BANNED boolean,
-        FAMILY_NAME varchar(512),
-        GIVEN_NAME varchar(512),
-        PASSWORD varchar(2048),
-        PASSWORD_RESET_REQUIRED boolean,
-        EMAIL_ADDRESS varchar(512) not null,
-        BOUNCING boolean,
-        VERIFIED boolean,
-        PARTY_ID bigint not null,
-        primary key (PARTY_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS (
-        DUE_DATE timestamp,
-        DURATION_MINUTES bigint,
-        LOCKED boolean,
-        START_DATE timestamp,
-        TASK_ID bigint not null,
-        LOCKING_USER_ID bigint,
-        NOTIFICATION_SENDER bigint,
-        primary key (TASK_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
-        WORKFLOW_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (WORKFLOW_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_NAMES (
-        WORKFLOW_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (WORKFLOW_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS (
-        TASK_ASSIGNMENT_ID bigint not null,
-        ROLE_ID bigint,
-        TASK_ID bigint,
-        primary key (TASK_ASSIGNMENT_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_COMMENTS (
-        COMMENT_ID bigint not null,
-        COMMENT varchar(2147483647),
-        UUID varchar(255) not null,
-        AUTHOR_ID bigint,
-        TASK_ID bigint,
-        primary key (COMMENT_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES (
-        TASK_DEPENDENCY_ID bigint not null,
-        BLOCKED_TASK_ID bigint,
-        BLOCKING_TASK_ID bigint,
-        primary key (TASK_DEPENDENCY_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS (
-        TASK_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (TASK_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_LABELS (
-        TASK_ID bigint not null,
-        LOCALIZED_VALUE varchar(2147483647),
-        LOCALE varchar(255) not null,
-        primary key (TASK_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASKS (
-        TASK_ID bigint not null,
-        ACTIVE boolean,
-        TASK_STATE varchar(512),
-        UUID varchar(255) not null,
-        WORKFLOW_ID bigint,
-        primary key (TASK_ID)
-    );
-
-    create table CCM_CORE.WORKFLOWS (
-        WORKFLOW_ID bigint not null,
-        abstract_workflow boolean,
-        ACTIVE boolean,
-        WORKFLOW_STATE varchar(255),
-        TASKS_STATE varchar(255),
-        UUID varchar(255) not null,
-        OBJECT_ID bigint,
-        TEMPLATE_ID bigint,
-        primary key (WORKFLOW_ID)
-    );
-
-    alter table CCM_CORE.CATEGORY_DOMAINS 
-        add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY);
-
-    alter table CCM_CORE.CATEGORY_DOMAINS 
-        add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI);
-
-    alter table CCM_CORE.CCM_OBJECTS 
-        add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID);
-
-    alter table CCM_CORE.HOSTS 
-        add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT);
-
-    alter table CCM_CORE.INSTALLED_MODULES 
-        add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME);
-
-    alter table CCM_CORE.SETTINGS 
-        add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME);
-
-    alter table CCM_CORE.SITES 
-        add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE);
-
-    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
-        add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID);
-
-    alter table CCM_CORE.WORKFLOW_TASKS 
-        add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID);
-
-    alter table CCM_CORE.WORKFLOWS 
-        add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID);
-
     create sequence hibernate_sequence start with 1 increment by 1;
 
     alter table CCM_CMS.ARTICLE_TEXTS 
diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql
index a16b995f5..0be01de90 100644
--- a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql
+++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql
@@ -4,10 +4,1299 @@ drop schema if exists CCM_CORE cascade;
 drop sequence if exists HIBERNATE_SEQUENCE;
 
 
-    create schema CCM_CMS;
+    
 
     create schema CCM_CORE;
 
+    create table CCM_CORE.APPLICATIONS (
+        APPLICATION_TYPE varchar(1024) not null,
+        PRIMARY_URL varchar(1024) not null,
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.ATTACHMENTS (
+        ATTACHMENT_ID int8 not null,
+        ATTACHMENT_DATA oid,
+        DESCRIPTION varchar(255),
+        MIME_TYPE varchar(255),
+        TITLE varchar(255),
+        MESSAGE_ID int8,
+        primary key (ATTACHMENT_ID)
+    );
+
+    create table CCM_CORE.CATEGORIES (
+        ABSTRACT_CATEGORY boolean,
+        CATEGORY_ORDER int8,
+        ENABLED boolean,
+        NAME varchar(255) not null,
+        UNIQUE_ID varchar(255),
+        VISIBLE boolean,
+        OBJECT_ID int8 not null,
+        PARENT_CATEGORY_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.CATEGORIZATIONS (
+        CATEGORIZATION_ID int8 not null,
+        CATEGORY_ORDER int8,
+        CATEGORY_INDEX boolean,
+        OBJECT_ORDER int8,
+        TYPE varchar(255),
+        OBJECT_ID int8,
+        CATEGORY_ID int8,
+        primary key (CATEGORIZATION_ID)
+    );
+
+    create table CCM_CORE.CATEGORY_DESCRIPTIONS (
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.CATEGORY_DOMAINS (
+        DOMAIN_KEY varchar(255) not null,
+        RELEASED timestamp,
+        URI varchar(1024),
+        VERSION varchar(255),
+        OBJECT_ID int8 not null,
+        ROOT_CATEGORY_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.CATEGORY_TITLES (
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.CCM_OBJECTS (
+        OBJECT_ID int8 not null,
+        DISPLAY_NAME varchar(255),
+        UUID varchar(255),
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.CCM_OBJECTS_AUD (
+        OBJECT_ID int8 not null,
+        REV int4 not null,
+        REVTYPE int2,
+        REVEND int4,
+        DISPLAY_NAME varchar(255),
+        primary key (OBJECT_ID, REV)
+    );
+
+    create table CCM_CORE.CCM_REVISIONS (
+        id int4 not null,
+        timestamp int8 not null,
+        USER_NAME varchar(255),
+        primary key (id)
+    );
+
+    create table CCM_CORE.CCM_ROLES (
+        ROLE_ID int8 not null,
+        NAME varchar(512) not null,
+        primary key (ROLE_ID)
+    );
+
+    create table CCM_CORE.DIGESTS (
+        FREQUENCY int4,
+        HEADER varchar(4096) not null,
+        NEXT_RUN timestamp,
+        DIGEST_SEPARATOR varchar(128) not null,
+        SIGNATURE varchar(4096) not null,
+        SUBJECT varchar(255) not null,
+        OBJECT_ID int8 not null,
+        FROM_PARTY_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.DOMAIN_DESCRIPTIONS (
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.DOMAIN_OWNERSHIPS (
+        OWNERSHIP_ID int8 not null,
+        CONTEXT varchar(255),
+        DOMAIN_ORDER int8,
+        OWNER_ORDER int8,
+        domain_OBJECT_ID int8 not null,
+        owner_OBJECT_ID int8 not null,
+        primary key (OWNERSHIP_ID)
+    );
+
+    create table CCM_CORE.DOMAIN_TITLES (
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
+        COMPONENT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (COMPONENT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_COMPONENTS (
+        ACTIVE boolean,
+        ADMIN_NAME varchar(255),
+        ATTRIBUTE_STRING varchar(255),
+        COMPONENT_ORDER int8,
+        SELECTED boolean,
+        OBJECT_ID int8 not null,
+        parentComponent_OBJECT_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER (
+        BODY text,
+        FROM_EMAIL varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS (
+        URL varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS (
+        MULTIPLE boolean,
+        QUERY varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_QUERIES (
+        QUERY_ID varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
+        DATA_QUERY_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (DATA_QUERY_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
+        DATA_QUERY_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (DATA_QUERY_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_FORMSECTIONS (
+        FORMSECTION_ACTION varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_LISTENERS (
+        ATTRIBUTE_STRING varchar(255),
+        CLASS_NAME varchar(255),
+        OBJECT_ID int8 not null,
+        widget_OBJECT_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_METAOBJECTS (
+        CLASS_NAME varchar(255),
+        PRETTY_NAME varchar(255),
+        PRETTY_PLURAL varchar(255),
+        PROPERTIES_FORM varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_OBJECT_TYPES (
+        APP_NAME varchar(255),
+        CLASS_NAME varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
+        OPTION_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OPTION_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_OPTIONS (
+        PARAMETER_VALUE varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
+        PROCESS_LISTENER_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (PROCESS_LISTENER_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
+        PROCESS_LISTENER_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (PROCESS_LISTENER_ID, LOCALE)
+    );
+
+    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS (
+        LISTENER_CLASS varchar(255),
+        PROCESS_LISTENER_ORDER int8,
+        OBJECT_ID int8 not null,
+        formSection_OBJECT_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER (
+        REMOTE_URL varchar(2048),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS (
+        RECIPIENT varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS (
+        BODY text,
+        RECIPIENT varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_WIDGETS (
+        DEFAULT_VALUE varchar(255),
+        PARAMETER_MODEL varchar(255),
+        PARAMETER_NAME varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS (
+        RECIPIENT varchar(255),
+        SUBJECT varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.GROUP_MEMBERSHIPS (
+        MEMBERSHIP_ID int8 not null,
+        GROUP_ID int8,
+        MEMBER_ID int8,
+        primary key (MEMBERSHIP_ID)
+    );
+
+    create table CCM_CORE.GROUPS (
+        PARTY_ID int8 not null,
+        primary key (PARTY_ID)
+    );
+
+    create table CCM_CORE.HOSTS (
+        HOST_ID int8 not null,
+        SERVER_NAME varchar(512),
+        SERVER_PORT int8,
+        primary key (HOST_ID)
+    );
+
+    create table CCM_CORE.INITS (
+        INITIALIZER_ID int8 not null,
+        CLASS_NAME varchar(255),
+        REQUIRED_BY_ID int8,
+        primary key (INITIALIZER_ID)
+    );
+
+    create table CCM_CORE.INSTALLED_MODULES (
+        MODULE_ID int4 not null,
+        MODULE_CLASS_NAME varchar(2048),
+        STATUS varchar(255),
+        primary key (MODULE_ID)
+    );
+
+    create table CCM_CORE.LUCENE_DOCUMENTS (
+        DOCUMENT_ID int8 not null,
+        CONTENT text,
+        CONTENT_SECTION varchar(512),
+        COUNTRY varchar(8),
+        CREATED timestamp,
+        DIRTY int8,
+        DOCUMENT_LANGUAGE varchar(8),
+        LAST_MODIFIED timestamp,
+        SUMMARY varchar(4096),
+        DOCUMENT_TIMESTAMP timestamp,
+        TITLE varchar(4096),
+        TYPE varchar(255),
+        TYPE_SPECIFIC_INFO varchar(512),
+        CREATED_BY_PARTY_ID int8,
+        LAST_MODIFIED_BY int8,
+        primary key (DOCUMENT_ID)
+    );
+
+    create table CCM_CORE.LUCENE_INDEXES (
+        INDEX_ID int8 not null,
+        LUCENE_INDEX_ID int8,
+        HOST_ID int8,
+        primary key (INDEX_ID)
+    );
+
+    create table CCM_CORE.MESSAGES (
+        BODY varchar(255),
+        BODY_MIME_TYPE varchar(255),
+        SENT timestamp,
+        SUBJECT varchar(255),
+        OBJECT_ID int8 not null,
+        IN_REPLY_TO_ID int8,
+        SENDER_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.NOTIFICATIONS (
+        EXPAND_GROUP boolean,
+        EXPUNGE boolean,
+        EXPUNGE_MESSAGE boolean,
+        FULFILL_DATE timestamp,
+        HEADER varchar(4096),
+        MAX_RETRIES int8,
+        REQUEST_DATE timestamp,
+        SIGNATURE varchar(4096),
+        STATUS varchar(32),
+        OBJECT_ID int8 not null,
+        DIGEST_ID int8,
+        MESSAGE_ID int8,
+        RECEIVER_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.ONE_TIME_AUTH_TOKENS (
+        TOKEN_ID int8 not null,
+        PURPOSE varchar(255),
+        TOKEN varchar(255),
+        VALID_UNTIL timestamp,
+        USER_ID int8,
+        primary key (TOKEN_ID)
+    );
+
+    create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS (
+        COMPONENT_MODEL_ID int8 not null,
+        CLASS_ATTRIBUTE varchar(512),
+        ID_ATTRIBUTE varchar(255),
+        COMPONENT_KEY varchar(255),
+        MODEL_UUID varchar(255) not null,
+        STYLE_ATTRIBUTE varchar(1024),
+        UUID varchar(255) not null,
+        PAGE_MODEL_ID int8,
+        primary key (COMPONENT_MODEL_ID)
+    );
+
+    create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS (
+        PAGE_MODEL_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (PAGE_MODEL_ID, LOCALE)
+    );
+
+    create table CCM_CORE.PAGE_MODEL_TITLES (
+        PAGE_MODEL_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (PAGE_MODEL_ID, LOCALE)
+    );
+
+    create table CCM_CORE.PAGE_MODELS (
+        PAGE_MODEL_ID int8 not null,
+        MODEL_UUID varchar(255) not null,
+        NAME varchar(255),
+        TYPE varchar(255) not null,
+        UUID varchar(255) not null,
+        VERSION varchar(255) not null,
+        APPLICATION_ID int8,
+        primary key (PAGE_MODEL_ID)
+    );
+
+    create table CCM_CORE.PARTIES (
+        PARTY_ID int8 not null,
+        NAME varchar(256) not null,
+        primary key (PARTY_ID)
+    );
+
+    create table CCM_CORE.PERMISSIONS (
+        PERMISSION_ID int8 not null,
+        CREATION_DATE timestamp,
+        CREATION_IP varchar(255),
+        GRANTED_PRIVILEGE varchar(255),
+        INHERITED boolean,
+        CREATION_USER_ID int8,
+        GRANTEE_ID int8,
+        INHERITED_FROM_ID int8,
+        OBJECT_ID int8,
+        primary key (PERMISSION_ID)
+    );
+
+    create table CCM_CORE.PORTALS (
+        TEMPLATE boolean,
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.PORTLETS (
+        CELL_NUMBER int8,
+        SORT_KEY int8,
+        OBJECT_ID int8 not null,
+        PORTAL_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.QUEUE_ITEMS (
+        QUEUE_ITEM_ID int8 not null,
+        HEADER varchar(4096),
+        RECEIVER_ADDRESS varchar(512),
+        RETRY_COUNT int8,
+        SIGNATURE varchar(4096),
+        SUCCESSFUL_SENDED boolean,
+        MESSAGE_ID int8,
+        RECEIVER_ID int8,
+        primary key (QUEUE_ITEM_ID)
+    );
+
+    create table CCM_CORE.RESOURCE_DESCRIPTIONS (
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.RESOURCE_TITLES (
+        OBJECT_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (OBJECT_ID, LOCALE)
+    );
+
+    create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS (
+        RESOURCE_TYPE_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (RESOURCE_TYPE_ID, LOCALE)
+    );
+
+    create table CCM_CORE.RESOURCE_TYPES (
+        RESOURCE_TYPE_ID int8 not null,
+        SINGLETON boolean,
+        TITLE varchar(254) not null,
+        EMBEDDED_VIEW boolean,
+        FULL_PAGE_VIEW boolean,
+        WORKSPACE_APP boolean,
+        primary key (RESOURCE_TYPE_ID)
+    );
+
+    create table CCM_CORE.RESOURCES (
+        CREATED timestamp,
+        OBJECT_ID int8 not null,
+        parent_OBJECT_ID int8,
+        resourceType_RESOURCE_TYPE_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.ROLE_DESCRIPTIONS (
+        ROLE_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (ROLE_ID, LOCALE)
+    );
+
+    create table CCM_CORE.ROLE_MEMBERSHIPS (
+        MEMBERSHIP_ID int8 not null,
+        MEMBER_ID int8,
+        ROLE_ID int8,
+        primary key (MEMBERSHIP_ID)
+    );
+
+    create table CCM_CORE.SETTINGS (
+        DTYPE varchar(31) not null,
+        SETTING_ID int8 not null,
+        CONFIGURATION_CLASS varchar(512) not null,
+        NAME varchar(512) not null,
+        SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
+        SETTING_VALUE_DOUBLE float8,
+        SETTING_VALUE_LONG int8,
+        SETTING_VALUE_BOOLEAN boolean,
+        primary key (SETTING_ID)
+    );
+
+    create table CCM_CORE.SETTINGS_ENUM_VALUES (
+        ENUM_ID int8 not null,
+        value varchar(255)
+    );
+
+    create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
+        ENTRY_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (ENTRY_ID, LOCALE)
+    );
+
+    create table CCM_CORE.SETTINGS_STRING_LIST (
+        LIST_ID int8 not null,
+        value varchar(255)
+    );
+
+    create table CCM_CORE.SITE_AWARE_APPLICATIONS (
+        OBJECT_ID int8 not null,
+        SITE_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.SITES (
+        DEFAULT_SITE boolean,
+        DEFAULT_THEME varchar(255),
+        DOMAIN_OF_SITE varchar(255),
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.THEME_DATA_FILES (
+        CREATION_DATE timestamp,
+        FILE_DATA oid,
+        LAST_MODIFIED timestamp,
+        FILE_SIZE int8,
+        TYPE varchar(255),
+        FILE_ID int8 not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.theme_directories (
+        FILE_ID int8 not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEME_FILES (
+        FILE_ID int8 not null,
+        NAME varchar(255) not null,
+        FILE_PATH varchar(8192) not null,
+        UUID varchar(255) not null,
+        PARENT_DIRECTORY_ID int8,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEMES (
+        THEME_ID int8 not null,
+        NAME varchar(255),
+        UUID varchar(255),
+        VERSION varchar(255),
+        ROOT_DIRECTORY_ID int8,
+        primary key (THEME_ID)
+    );
+
+    create table CCM_CORE.THREADS (
+        OBJECT_ID int8 not null,
+        ROOT_ID int8,
+        primary key (OBJECT_ID)
+    );
+
+    create table CCM_CORE.USER_EMAIL_ADDRESSES (
+        USER_ID int8 not null,
+        EMAIL_ADDRESS varchar(512) not null,
+        BOUNCING boolean,
+        VERIFIED boolean
+    );
+
+    create table CCM_CORE.USERS (
+        BANNED boolean,
+        FAMILY_NAME varchar(512),
+        GIVEN_NAME varchar(512),
+        PASSWORD varchar(2048),
+        PASSWORD_RESET_REQUIRED boolean,
+        EMAIL_ADDRESS varchar(512) not null,
+        BOUNCING boolean,
+        VERIFIED boolean,
+        PARTY_ID int8 not null,
+        primary key (PARTY_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS (
+        DUE_DATE timestamp,
+        DURATION_MINUTES int8,
+        LOCKED boolean,
+        START_DATE timestamp,
+        TASK_ID int8 not null,
+        LOCKING_USER_ID int8,
+        NOTIFICATION_SENDER int8,
+        primary key (TASK_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
+        WORKFLOW_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (WORKFLOW_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_NAMES (
+        WORKFLOW_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (WORKFLOW_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS (
+        TASK_ASSIGNMENT_ID int8 not null,
+        ROLE_ID int8,
+        TASK_ID int8,
+        primary key (TASK_ASSIGNMENT_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_COMMENTS (
+        COMMENT_ID int8 not null,
+        COMMENT text,
+        UUID varchar(255) not null,
+        AUTHOR_ID int8,
+        TASK_ID int8,
+        primary key (COMMENT_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES (
+        TASK_DEPENDENCY_ID int8 not null,
+        BLOCKED_TASK_ID int8,
+        BLOCKING_TASK_ID int8,
+        primary key (TASK_DEPENDENCY_ID)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS (
+        TASK_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (TASK_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASK_LABELS (
+        TASK_ID int8 not null,
+        LOCALIZED_VALUE text,
+        LOCALE varchar(255) not null,
+        primary key (TASK_ID, LOCALE)
+    );
+
+    create table CCM_CORE.WORKFLOW_TASKS (
+        TASK_ID int8 not null,
+        ACTIVE boolean,
+        TASK_STATE varchar(512),
+        UUID varchar(255) not null,
+        WORKFLOW_ID int8,
+        primary key (TASK_ID)
+    );
+
+    create table CCM_CORE.WORKFLOWS (
+        WORKFLOW_ID int8 not null,
+        abstract_workflow boolean,
+        ACTIVE boolean,
+        WORKFLOW_STATE varchar(255),
+        TASKS_STATE varchar(255),
+        UUID varchar(255) not null,
+        OBJECT_ID int8,
+        TEMPLATE_ID int8,
+        primary key (WORKFLOW_ID)
+    );
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY);
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI);
+
+    alter table CCM_CORE.CCM_OBJECTS 
+        add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID);
+
+    alter table CCM_CORE.HOSTS 
+        add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT);
+
+    alter table CCM_CORE.INSTALLED_MODULES 
+        add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME);
+
+    alter table CCM_CORE.SETTINGS 
+        add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME);
+
+    alter table CCM_CORE.SITES 
+        add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE);
+
+    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
+        add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID);
+
+    alter table CCM_CORE.WORKFLOW_TASKS 
+        add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID);
+
+    alter table CCM_CORE.WORKFLOWS 
+        add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID);
+
+    create sequence hibernate_sequence start 1 increment 1;
+
+    alter table CCM_CORE.APPLICATIONS 
+        add constraint FKatcp9ij6mbkx0nfeig1o6n3lm 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.ATTACHMENTS 
+        add constraint FK8ju9hm9baceridp803nislkwb 
+        foreign key (MESSAGE_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.CATEGORIES 
+        add constraint FKrj3marx99nheur4fqanm0ylur 
+        foreign key (PARENT_CATEGORY_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORIES 
+        add constraint FKpm291swli2musd0204phta652 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.CATEGORIZATIONS 
+        add constraint FKejp0ubk034nfq60v1po6srkke 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.CATEGORIZATIONS 
+        add constraint FKoyeipswl876wa6mqwbx0uy83h 
+        foreign key (CATEGORY_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORY_DESCRIPTIONS 
+        add constraint FKhiwjlmh5vkbu3v3vng1la1qum 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint FKf25vi73cji01w8fgo6ow1dgg 
+        foreign key (ROOT_CATEGORY_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CATEGORY_DOMAINS 
+        add constraint FK58xpmnvciohkom1c16oua4xha 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.CATEGORY_TITLES 
+        add constraint FKka9bt9f5br0kji5bcjxcmf6ch 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
+    alter table CCM_CORE.CCM_OBJECTS_AUD 
+        add constraint FKr00eauutiyvocno8ckx6h9nw6 
+        foreign key (REV) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CORE.CCM_OBJECTS_AUD 
+        add constraint FKo5s37ctcdny7tmewjwv7705h5 
+        foreign key (REVEND) 
+        references CCM_CORE.CCM_REVISIONS;
+
+    alter table CCM_CORE.DIGESTS 
+        add constraint FKc53g09agnye3w1v4euy3e0gsi 
+        foreign key (FROM_PARTY_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.DIGESTS 
+        add constraint FK845r9ep6xu6nbt1mvxulwybym 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.DOMAIN_DESCRIPTIONS 
+        add constraint FKn4i2dxgn8cqysa62dds6eih6a 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORY_DOMAINS;
+
+    alter table CCM_CORE.DOMAIN_OWNERSHIPS 
+        add constraint FK47nsasr7jrdwlky5gx0u6e9py 
+        foreign key (domain_OBJECT_ID) 
+        references CCM_CORE.CATEGORY_DOMAINS;
+
+    alter table CCM_CORE.DOMAIN_OWNERSHIPS 
+        add constraint FK3u4hq6yqau4m419b1xva3xpwq 
+        foreign key (owner_OBJECT_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CORE.DOMAIN_TITLES 
+        add constraint FK5p526dsdwn94els6lp5w0hdn4 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORY_DOMAINS;
+
+    alter table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS 
+        add constraint FKfh0k9lj3pf4amfc9bbbss0tr1 
+        foreign key (COMPONENT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_COMPONENTS 
+        add constraint FKpcpmvyiix023b4g5n4q8nkfca 
+        foreign key (parentComponent_OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_COMPONENTS 
+        add constraint FKt0e0uv00pp1rwhyaltrytghnm 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER 
+        add constraint FK48khrbud3xhi2gvsvnlttd8tg 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS 
+        add constraint FKbyjjt2ufendvje2obtge2l7et 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS 
+        add constraint FK8oriyta1957u7dvbrqk717944 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_WIDGETS;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_QUERIES 
+        add constraint FKhhaxpeddbtmrnjr5o0fopju3a 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS 
+        add constraint FKsmduu1opoiulkeo2gc8v7lsbn 
+        foreign key (DATA_QUERY_ID) 
+        references CCM_CORE.FORMBUILDER_DATA_QUERIES;
+
+    alter table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES 
+        add constraint FKju1x82inrw3kguyjuxoetn6gn 
+        foreign key (DATA_QUERY_ID) 
+        references CCM_CORE.FORMBUILDER_DATA_QUERIES;
+
+    alter table CCM_CORE.FORMBUILDER_FORMSECTIONS 
+        add constraint FKnfhsgxp4lvigq2pm33pn4afac 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_LISTENERS 
+        add constraint FK33ilyirwoux28yowafgd5xx0o 
+        foreign key (widget_OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_WIDGETS;
+
+    alter table CCM_CORE.FORMBUILDER_LISTENERS 
+        add constraint FKlqm76746nq5yrt8ganm474uu0 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_METAOBJECTS 
+        add constraint FKf963v6u9mw8pwjmasrw51w8dx 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_OBJECT_TYPES 
+        add constraint FKkv337e83rsecf0h3qy8bu7l9w 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_OPTION_LABELS 
+        add constraint FKatlsylsvln6yse55eof6wwkj6 
+        foreign key (OPTION_ID) 
+        references CCM_CORE.FORMBUILDER_OPTIONS;
+
+    alter table CCM_CORE.FORMBUILDER_OPTIONS 
+        add constraint FKhe5q71wby9g4i56sotc501h11 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS 
+        add constraint FKcv3iu04gxjk9c0pn6tl8rqqv3 
+        foreign key (PROCESS_LISTENER_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES 
+        add constraint FK8rnyb1m6ij3b9hhmhr7klgd4p 
+        foreign key (PROCESS_LISTENER_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS 
+        add constraint FK7uiaeax8qafm82e5k729ms5ku 
+        foreign key (formSection_OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_FORMSECTIONS;
+
+    alter table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS 
+        add constraint FKbdnloo884qk6gn36jwiqv5rlp 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER 
+        add constraint FKpajvu9m6fj1enm67a9gcb5ii9 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS 
+        add constraint FKsn82ktlq0c9ikijyv8k2bfv4f 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS 
+        add constraint FK8kjyu72btjsuaaqh4bvd8npns 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.FORMBUILDER_WIDGETS 
+        add constraint FK1wosr4ujbfckdc50u5fgmrhrk 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_COMPONENTS;
+
+    alter table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS 
+        add constraint FKjie9co03m7ow4ihig5rk7l8oj 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.FORMBUILDER_PROCESS_LISTENERS;
+
+    alter table CCM_CORE.GROUP_MEMBERSHIPS 
+        add constraint FKq4qnny8ri3eo7eqh4olxco8nk 
+        foreign key (GROUP_ID) 
+        references CCM_CORE.GROUPS;
+
+    alter table CCM_CORE.GROUP_MEMBERSHIPS 
+        add constraint FKc8u86ivkhvoiw6ju8b2p365he 
+        foreign key (MEMBER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.GROUPS 
+        add constraint FK4f61mlqxw0ct6s7wwpi9m0735 
+        foreign key (PARTY_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.INITS 
+        add constraint FK3nvvxk10nmq9nfuko8yklqdgc 
+        foreign key (REQUIRED_BY_ID) 
+        references CCM_CORE.INITS;
+
+    alter table CCM_CORE.LUCENE_DOCUMENTS 
+        add constraint FK942kl4yff8rdiwr0pjk2a9g8 
+        foreign key (CREATED_BY_PARTY_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.LUCENE_DOCUMENTS 
+        add constraint FKc5rs6afx4p9fidabfqsxr5ble 
+        foreign key (LAST_MODIFIED_BY) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.LUCENE_INDEXES 
+        add constraint FK6gu0yrlviqk07dtb3r02iw43f 
+        foreign key (HOST_ID) 
+        references CCM_CORE.HOSTS;
+
+    alter table CCM_CORE.MESSAGES 
+        add constraint FKph10aehmg9f20pn2w4buki97q 
+        foreign key (IN_REPLY_TO_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.MESSAGES 
+        add constraint FKjufsx3c3h538fj35h8hgfnb1p 
+        foreign key (SENDER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.MESSAGES 
+        add constraint FK6w20ao7scwecd9mfwpun2ddqx 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FKqk70c1x1dklhty9ju5t4wukd9 
+        foreign key (DIGEST_ID) 
+        references CCM_CORE.DIGESTS;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FKtt4fjr2p75og79jxxgd8q8mr 
+        foreign key (MESSAGE_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FK2vlnma0ox43j0clx8ead08n5s 
+        foreign key (RECEIVER_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.NOTIFICATIONS 
+        add constraint FKf423hhiaw1bexpxeh1pnas7qt 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.ONE_TIME_AUTH_TOKENS 
+        add constraint FKtplfuphkiorfkttaewb4wmfjc 
+        foreign key (USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS 
+        add constraint FKo696ch035fe7rrueol1po13od 
+        foreign key (PAGE_MODEL_ID) 
+        references CCM_CORE.PAGE_MODELS;
+
+    alter table CCM_CORE.PAGE_MODEL_DESCRIPTIONS 
+        add constraint FKcc5d6eqxu1369k8ycyyt6vn3e 
+        foreign key (PAGE_MODEL_ID) 
+        references CCM_CORE.PAGE_MODELS;
+
+    alter table CCM_CORE.PAGE_MODEL_TITLES 
+        add constraint FKj14q9911yhd4js9p6rs21rwjf 
+        foreign key (PAGE_MODEL_ID) 
+        references CCM_CORE.PAGE_MODELS;
+
+    alter table CCM_CORE.PAGE_MODELS 
+        add constraint FKk2lihllrxj89mn3tqv43amafe 
+        foreign key (APPLICATION_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKj9di7pawxgtouxmu2k44bj5c4 
+        foreign key (CREATION_USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKikx3x0kn9fito23g50v6xbr9f 
+        foreign key (GRANTEE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKg56ujjoe0j30pq579rf0l5yc6 
+        foreign key (INHERITED_FROM_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.PERMISSIONS 
+        add constraint FKkamckexjnffnt8lay9nqeawhm 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.PORTALS 
+        add constraint FK5a2hdrbw03mmgr74vj5nxlpvk 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.PORTLETS 
+        add constraint FK9gr5xjt3rx4uhtw7vl6adruol 
+        foreign key (PORTAL_ID) 
+        references CCM_CORE.PORTALS;
+
+    alter table CCM_CORE.PORTLETS 
+        add constraint FKjmx9uebt0gwxkw3xv34niy35f 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.QUEUE_ITEMS 
+        add constraint FKtgkwfruv9kjdybf46l02da088 
+        foreign key (MESSAGE_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.QUEUE_ITEMS 
+        add constraint FKs9aq1hyxstwmvx7fmfifp4x7r 
+        foreign key (RECEIVER_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.RESOURCE_DESCRIPTIONS 
+        add constraint FKk9arvj5u21rv23ce3cav4opqx 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.RESOURCE_TITLES 
+        add constraint FKto4p6n2wklljyf7tmuxtmyfe0 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS 
+        add constraint FKckpihjtv23iahbg3imnpbsr2 
+        foreign key (RESOURCE_TYPE_ID) 
+        references CCM_CORE.RESOURCE_TYPES;
+
+    alter table CCM_CORE.RESOURCES 
+        add constraint FKbo7ibfgodicn9flv2gfo11g5a 
+        foreign key (parent_OBJECT_ID) 
+        references CCM_CORE.RESOURCES;
+
+    alter table CCM_CORE.RESOURCES 
+        add constraint FK262fbwetpjx3k4uuvw24wsiv 
+        foreign key (resourceType_RESOURCE_TYPE_ID) 
+        references CCM_CORE.RESOURCE_TYPES;
+
+    alter table CCM_CORE.RESOURCES 
+        add constraint FKbjdf8pm4frth8r06ev2qjm88f 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.ROLE_DESCRIPTIONS 
+        add constraint FKo09bh4j3k3k0ph3awvjwx31ft 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.ROLE_MEMBERSHIPS 
+        add constraint FK9m88ywi7rcin7b7jrgh53emrq 
+        foreign key (MEMBER_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.ROLE_MEMBERSHIPS 
+        add constraint FKcsyogv5m2rgsrmtgnhgkjhfw7 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.SETTINGS_ENUM_VALUES 
+        add constraint FK8mw4p92s0h3h8bmo8saowu32i 
+        foreign key (ENUM_ID) 
+        references CCM_CORE.SETTINGS;
+
+    alter table CCM_CORE.SETTINGS_L10N_STR_VALUES 
+        add constraint FK5knjq7cisej0qfx5dw1y93rou 
+        foreign key (ENTRY_ID) 
+        references CCM_CORE.SETTINGS;
+
+    alter table CCM_CORE.SETTINGS_STRING_LIST 
+        add constraint FKqeclqa5sf1g53vxs857tpwrus 
+        foreign key (LIST_ID) 
+        references CCM_CORE.SETTINGS;
+
+    alter table CCM_CORE.SITE_AWARE_APPLICATIONS 
+        add constraint FKopo91c29jaunpcusjwlphhxkd 
+        foreign key (SITE_ID) 
+        references CCM_CORE.SITES;
+
+    alter table CCM_CORE.SITE_AWARE_APPLICATIONS 
+        add constraint FKslbu2qagg23dmdu01lun7oh7x 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.APPLICATIONS;
+
+    alter table CCM_CORE.SITES 
+        add constraint FKrca95c6p023men53b8ayu26kp 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THREADS 
+        add constraint FKsx08mpwvwnw97uwdgjs76q39g 
+        foreign key (ROOT_ID) 
+        references CCM_CORE.MESSAGES;
+
+    alter table CCM_CORE.THREADS 
+        add constraint FKp97b1sy1kop07rtapeh5l9fb2 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CCM_OBJECTS;
+
+    alter table CCM_CORE.USER_EMAIL_ADDRESSES 
+        add constraint FKr900l79erul95seyyccf04ufc 
+        foreign key (USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.USERS 
+        add constraint FKosh928q71aonu6l1kurb417r 
+        foreign key (PARTY_ID) 
+        references CCM_CORE.PARTIES;
+
+    alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS 
+        add constraint FK1pnsq9ur3ylq0ghuj23p4cogs 
+        foreign key (LOCKING_USER_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS 
+        add constraint FK9ngp088m8xa82swy7yg3qx6vh 
+        foreign key (NOTIFICATION_SENDER) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS 
+        add constraint FKt9ha3no3bj8a50pnw8cnqh2cq 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_DESCRIPTIONS 
+        add constraint FKgx7upkqky82dpxvbs95imfl9l 
+        foreign key (WORKFLOW_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CORE.WORKFLOW_NAMES 
+        add constraint FKkxedy9p48avfk45r0bn4uc09i 
+        foreign key (WORKFLOW_ID) 
+        references CCM_CORE.WORKFLOWS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS 
+        add constraint FKpq4paqtfbi5erhh98wl1ja005 
+        foreign key (ROLE_ID) 
+        references CCM_CORE.CCM_ROLES;
+
+    alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS 
+        add constraint FK3933ol31co3yn5ee75b2hmhgp 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
+        add constraint FKd2ymdg8nay9pmh2nn2whba0j8 
+        foreign key (AUTHOR_ID) 
+        references CCM_CORE.USERS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
+        add constraint FKkfqrf9jdvm7livu5if06w0r5t 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES 
+        add constraint FKy88tppv7ihx0lsn6g64f5lfq 
+        foreign key (BLOCKED_TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES 
+        add constraint FKrj80uilojn73u9a4xgk3vt0cj 
+        foreign key (BLOCKING_TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS 
+        add constraint FKeb7mqbdx3bk7t01vo7kp2hpf 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASK_LABELS 
+        add constraint FKf715qud6g9xv2xeb8rrpnv4xs 
+        foreign key (TASK_ID) 
+        references CCM_CORE.WORKFLOW_TASKS;
+
+    alter table CCM_CORE.WORKFLOW_TASKS 
+        add constraint FK1693cbc36e4d8gucg8q7sc57e 
+        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 FK9ray5beiny6wm2mi0uwyecay2 
+        foreign key (TEMPLATE_ID) 
+        references CCM_CORE.WORKFLOWS;
+    create schema CCM_CMS;
+
     create table CCM_CMS.ARTICLE_TEXTS (
         OBJECT_ID int8 not null,
         LOCALIZED_VALUE text,
@@ -908,709 +2197,6 @@ drop sequence if exists HIBERNATE_SEQUENCE;
     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,
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.ATTACHMENTS (
-        ATTACHMENT_ID int8 not null,
-        ATTACHMENT_DATA oid,
-        DESCRIPTION varchar(255),
-        MIME_TYPE varchar(255),
-        TITLE varchar(255),
-        MESSAGE_ID int8,
-        primary key (ATTACHMENT_ID)
-    );
-
-    create table CCM_CORE.CATEGORIES (
-        ABSTRACT_CATEGORY boolean,
-        CATEGORY_ORDER int8,
-        ENABLED boolean,
-        NAME varchar(255) not null,
-        UNIQUE_ID varchar(255),
-        VISIBLE boolean,
-        OBJECT_ID int8 not null,
-        PARENT_CATEGORY_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.CATEGORIZATIONS (
-        CATEGORIZATION_ID int8 not null,
-        CATEGORY_ORDER int8,
-        CATEGORY_INDEX boolean,
-        OBJECT_ORDER int8,
-        TYPE varchar(255),
-        OBJECT_ID int8,
-        CATEGORY_ID int8,
-        primary key (CATEGORIZATION_ID)
-    );
-
-    create table CCM_CORE.CATEGORY_DESCRIPTIONS (
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.CATEGORY_DOMAINS (
-        DOMAIN_KEY varchar(255) not null,
-        RELEASED timestamp,
-        URI varchar(1024),
-        VERSION varchar(255),
-        OBJECT_ID int8 not null,
-        ROOT_CATEGORY_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.CATEGORY_TITLES (
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.CCM_OBJECTS (
-        OBJECT_ID int8 not null,
-        DISPLAY_NAME varchar(255),
-        UUID varchar(255),
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.CCM_OBJECTS_AUD (
-        OBJECT_ID int8 not null,
-        REV int4 not null,
-        REVTYPE int2,
-        REVEND int4,
-        DISPLAY_NAME varchar(255),
-        primary key (OBJECT_ID, REV)
-    );
-
-    create table CCM_CORE.CCM_REVISIONS (
-        id int4 not null,
-        timestamp int8 not null,
-        USER_NAME varchar(255),
-        primary key (id)
-    );
-
-    create table CCM_CORE.CCM_ROLES (
-        ROLE_ID int8 not null,
-        NAME varchar(512) not null,
-        primary key (ROLE_ID)
-    );
-
-    create table CCM_CORE.DIGESTS (
-        FREQUENCY int4,
-        HEADER varchar(4096) not null,
-        NEXT_RUN timestamp,
-        DIGEST_SEPARATOR varchar(128) not null,
-        SIGNATURE varchar(4096) not null,
-        SUBJECT varchar(255) not null,
-        OBJECT_ID int8 not null,
-        FROM_PARTY_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.DOMAIN_DESCRIPTIONS (
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.DOMAIN_OWNERSHIPS (
-        OWNERSHIP_ID int8 not null,
-        CONTEXT varchar(255),
-        DOMAIN_ORDER int8,
-        OWNER_ORDER int8,
-        domain_OBJECT_ID int8 not null,
-        owner_OBJECT_ID int8 not null,
-        primary key (OWNERSHIP_ID)
-    );
-
-    create table CCM_CORE.DOMAIN_TITLES (
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
-        COMPONENT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (COMPONENT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_COMPONENTS (
-        ACTIVE boolean,
-        ADMIN_NAME varchar(255),
-        ATTRIBUTE_STRING varchar(255),
-        COMPONENT_ORDER int8,
-        SELECTED boolean,
-        OBJECT_ID int8 not null,
-        parentComponent_OBJECT_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_CONFIRM_EMAIL_LISTENER (
-        BODY text,
-        FROM_EMAIL varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_CONFIRM_REDIRECT_LISTENERS (
-        URL varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_DRIVEN_SELECTS (
-        MULTIPLE boolean,
-        QUERY varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_QUERIES (
-        QUERY_ID varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
-        DATA_QUERY_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (DATA_QUERY_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
-        DATA_QUERY_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (DATA_QUERY_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_FORMSECTIONS (
-        FORMSECTION_ACTION varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_LISTENERS (
-        ATTRIBUTE_STRING varchar(255),
-        CLASS_NAME varchar(255),
-        OBJECT_ID int8 not null,
-        widget_OBJECT_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_METAOBJECTS (
-        CLASS_NAME varchar(255),
-        PRETTY_NAME varchar(255),
-        PRETTY_PLURAL varchar(255),
-        PROPERTIES_FORM varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_OBJECT_TYPES (
-        APP_NAME varchar(255),
-        CLASS_NAME varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
-        OPTION_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OPTION_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_OPTIONS (
-        PARAMETER_VALUE varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
-        PROCESS_LISTENER_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (PROCESS_LISTENER_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
-        PROCESS_LISTENER_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (PROCESS_LISTENER_ID, LOCALE)
-    );
-
-    create table CCM_CORE.FORMBUILDER_PROCESS_LISTENERS (
-        LISTENER_CLASS varchar(255),
-        PROCESS_LISTENER_ORDER int8,
-        OBJECT_ID int8 not null,
-        formSection_OBJECT_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_REMOTE_SERVER_POST_LISTENER (
-        REMOTE_URL varchar(2048),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_SIMPLE_EMAIL_LISTENERS (
-        RECIPIENT varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_TEMPLATE_EMAIL_LISTENERS (
-        BODY text,
-        RECIPIENT varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_WIDGETS (
-        DEFAULT_VALUE varchar(255),
-        PARAMETER_MODEL varchar(255),
-        PARAMETER_NAME varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.FORMBUILDER_XML_EMAIL_LISTENERS (
-        RECIPIENT varchar(255),
-        SUBJECT varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.GROUP_MEMBERSHIPS (
-        MEMBERSHIP_ID int8 not null,
-        GROUP_ID int8,
-        MEMBER_ID int8,
-        primary key (MEMBERSHIP_ID)
-    );
-
-    create table CCM_CORE.GROUPS (
-        PARTY_ID int8 not null,
-        primary key (PARTY_ID)
-    );
-
-    create table CCM_CORE.HOSTS (
-        HOST_ID int8 not null,
-        SERVER_NAME varchar(512),
-        SERVER_PORT int8,
-        primary key (HOST_ID)
-    );
-
-    create table CCM_CORE.INITS (
-        INITIALIZER_ID int8 not null,
-        CLASS_NAME varchar(255),
-        REQUIRED_BY_ID int8,
-        primary key (INITIALIZER_ID)
-    );
-
-    create table CCM_CORE.INSTALLED_MODULES (
-        MODULE_ID int4 not null,
-        MODULE_CLASS_NAME varchar(2048),
-        STATUS varchar(255),
-        primary key (MODULE_ID)
-    );
-
-    create table CCM_CORE.LUCENE_DOCUMENTS (
-        DOCUMENT_ID int8 not null,
-        CONTENT text,
-        CONTENT_SECTION varchar(512),
-        COUNTRY varchar(8),
-        CREATED timestamp,
-        DIRTY int8,
-        DOCUMENT_LANGUAGE varchar(8),
-        LAST_MODIFIED timestamp,
-        SUMMARY varchar(4096),
-        DOCUMENT_TIMESTAMP timestamp,
-        TITLE varchar(4096),
-        TYPE varchar(255),
-        TYPE_SPECIFIC_INFO varchar(512),
-        CREATED_BY_PARTY_ID int8,
-        LAST_MODIFIED_BY int8,
-        primary key (DOCUMENT_ID)
-    );
-
-    create table CCM_CORE.LUCENE_INDEXES (
-        INDEX_ID int8 not null,
-        LUCENE_INDEX_ID int8,
-        HOST_ID int8,
-        primary key (INDEX_ID)
-    );
-
-    create table CCM_CORE.MESSAGES (
-        BODY varchar(255),
-        BODY_MIME_TYPE varchar(255),
-        SENT timestamp,
-        SUBJECT varchar(255),
-        OBJECT_ID int8 not null,
-        IN_REPLY_TO_ID int8,
-        SENDER_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.NOTIFICATIONS (
-        EXPAND_GROUP boolean,
-        EXPUNGE boolean,
-        EXPUNGE_MESSAGE boolean,
-        FULFILL_DATE timestamp,
-        HEADER varchar(4096),
-        MAX_RETRIES int8,
-        REQUEST_DATE timestamp,
-        SIGNATURE varchar(4096),
-        STATUS varchar(32),
-        OBJECT_ID int8 not null,
-        DIGEST_ID int8,
-        MESSAGE_ID int8,
-        RECEIVER_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.ONE_TIME_AUTH_TOKENS (
-        TOKEN_ID int8 not null,
-        PURPOSE varchar(255),
-        TOKEN varchar(255),
-        VALID_UNTIL timestamp,
-        USER_ID int8,
-        primary key (TOKEN_ID)
-    );
-
-    create table CCM_CORE.PAGE_MODEL_COMPONENT_MODELS (
-        COMPONENT_MODEL_ID int8 not null,
-        CLASS_ATTRIBUTE varchar(512),
-        ID_ATTRIBUTE varchar(255),
-        COMPONENT_KEY varchar(255),
-        MODEL_UUID varchar(255) not null,
-        STYLE_ATTRIBUTE varchar(1024),
-        UUID varchar(255) not null,
-        PAGE_MODEL_ID int8,
-        primary key (COMPONENT_MODEL_ID)
-    );
-
-    create table CCM_CORE.PAGE_MODEL_DESCRIPTIONS (
-        PAGE_MODEL_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (PAGE_MODEL_ID, LOCALE)
-    );
-
-    create table CCM_CORE.PAGE_MODEL_TITLES (
-        PAGE_MODEL_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (PAGE_MODEL_ID, LOCALE)
-    );
-
-    create table CCM_CORE.PAGE_MODELS (
-        PAGE_MODEL_ID int8 not null,
-        MODEL_UUID varchar(255) not null,
-        NAME varchar(255),
-        TYPE varchar(255) not null,
-        UUID varchar(255) not null,
-        VERSION varchar(255) not null,
-        APPLICATION_ID int8,
-        primary key (PAGE_MODEL_ID)
-    );
-
-    create table CCM_CORE.PARTIES (
-        PARTY_ID int8 not null,
-        NAME varchar(256) not null,
-        primary key (PARTY_ID)
-    );
-
-    create table CCM_CORE.PERMISSIONS (
-        PERMISSION_ID int8 not null,
-        CREATION_DATE timestamp,
-        CREATION_IP varchar(255),
-        GRANTED_PRIVILEGE varchar(255),
-        INHERITED boolean,
-        CREATION_USER_ID int8,
-        GRANTEE_ID int8,
-        INHERITED_FROM_ID int8,
-        OBJECT_ID int8,
-        primary key (PERMISSION_ID)
-    );
-
-    create table CCM_CORE.PORTALS (
-        TEMPLATE boolean,
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.PORTLETS (
-        CELL_NUMBER int8,
-        SORT_KEY int8,
-        OBJECT_ID int8 not null,
-        PORTAL_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.QUEUE_ITEMS (
-        QUEUE_ITEM_ID int8 not null,
-        HEADER varchar(4096),
-        RECEIVER_ADDRESS varchar(512),
-        RETRY_COUNT int8,
-        SIGNATURE varchar(4096),
-        SUCCESSFUL_SENDED boolean,
-        MESSAGE_ID int8,
-        RECEIVER_ID int8,
-        primary key (QUEUE_ITEM_ID)
-    );
-
-    create table CCM_CORE.RESOURCE_DESCRIPTIONS (
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.RESOURCE_TITLES (
-        OBJECT_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (OBJECT_ID, LOCALE)
-    );
-
-    create table CCM_CORE.RESOURCE_TYPE_DESCRIPTIONS (
-        RESOURCE_TYPE_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (RESOURCE_TYPE_ID, LOCALE)
-    );
-
-    create table CCM_CORE.RESOURCE_TYPES (
-        RESOURCE_TYPE_ID int8 not null,
-        SINGLETON boolean,
-        TITLE varchar(254) not null,
-        EMBEDDED_VIEW boolean,
-        FULL_PAGE_VIEW boolean,
-        WORKSPACE_APP boolean,
-        primary key (RESOURCE_TYPE_ID)
-    );
-
-    create table CCM_CORE.RESOURCES (
-        CREATED timestamp,
-        OBJECT_ID int8 not null,
-        parent_OBJECT_ID int8,
-        resourceType_RESOURCE_TYPE_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.ROLE_DESCRIPTIONS (
-        ROLE_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (ROLE_ID, LOCALE)
-    );
-
-    create table CCM_CORE.ROLE_MEMBERSHIPS (
-        MEMBERSHIP_ID int8 not null,
-        MEMBER_ID int8,
-        ROLE_ID int8,
-        primary key (MEMBERSHIP_ID)
-    );
-
-    create table CCM_CORE.SETTINGS (
-        DTYPE varchar(31) not null,
-        SETTING_ID int8 not null,
-        CONFIGURATION_CLASS varchar(512) not null,
-        NAME varchar(512) not null,
-        SETTING_VALUE_DOUBLE float8,
-        SETTING_VALUE_LONG int8,
-        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
-        SETTING_VALUE_STRING varchar(1024),
-        SETTING_VALUE_BOOLEAN boolean,
-        primary key (SETTING_ID)
-    );
-
-    create table CCM_CORE.SETTINGS_ENUM_VALUES (
-        ENUM_ID int8 not null,
-        value varchar(255)
-    );
-
-    create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
-        ENTRY_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (ENTRY_ID, LOCALE)
-    );
-
-    create table CCM_CORE.SETTINGS_STRING_LIST (
-        LIST_ID int8 not null,
-        value varchar(255)
-    );
-
-    create table CCM_CORE.SITE_AWARE_APPLICATIONS (
-        OBJECT_ID int8 not null,
-        SITE_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.SITES (
-        DEFAULT_SITE boolean,
-        DEFAULT_THEME varchar(255),
-        DOMAIN_OF_SITE varchar(255),
-        OBJECT_ID int8 not null,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.THREADS (
-        OBJECT_ID int8 not null,
-        ROOT_ID int8,
-        primary key (OBJECT_ID)
-    );
-
-    create table CCM_CORE.USER_EMAIL_ADDRESSES (
-        USER_ID int8 not null,
-        EMAIL_ADDRESS varchar(512) not null,
-        BOUNCING boolean,
-        VERIFIED boolean
-    );
-
-    create table CCM_CORE.USERS (
-        BANNED boolean,
-        FAMILY_NAME varchar(512),
-        GIVEN_NAME varchar(512),
-        PASSWORD varchar(2048),
-        PASSWORD_RESET_REQUIRED boolean,
-        EMAIL_ADDRESS varchar(512) not null,
-        BOUNCING boolean,
-        VERIFIED boolean,
-        PARTY_ID int8 not null,
-        primary key (PARTY_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_ASSIGNABLE_TASKS (
-        DUE_DATE timestamp,
-        DURATION_MINUTES int8,
-        LOCKED boolean,
-        START_DATE timestamp,
-        TASK_ID int8 not null,
-        LOCKING_USER_ID int8,
-        NOTIFICATION_SENDER int8,
-        primary key (TASK_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
-        WORKFLOW_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (WORKFLOW_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_NAMES (
-        WORKFLOW_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (WORKFLOW_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS (
-        TASK_ASSIGNMENT_ID int8 not null,
-        ROLE_ID int8,
-        TASK_ID int8,
-        primary key (TASK_ASSIGNMENT_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_COMMENTS (
-        COMMENT_ID int8 not null,
-        COMMENT text,
-        UUID varchar(255) not null,
-        AUTHOR_ID int8,
-        TASK_ID int8,
-        primary key (COMMENT_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES (
-        TASK_DEPENDENCY_ID int8 not null,
-        BLOCKED_TASK_ID int8,
-        BLOCKING_TASK_ID int8,
-        primary key (TASK_DEPENDENCY_ID)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_DESCRIPTIONS (
-        TASK_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (TASK_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASK_LABELS (
-        TASK_ID int8 not null,
-        LOCALIZED_VALUE text,
-        LOCALE varchar(255) not null,
-        primary key (TASK_ID, LOCALE)
-    );
-
-    create table CCM_CORE.WORKFLOW_TASKS (
-        TASK_ID int8 not null,
-        ACTIVE boolean,
-        TASK_STATE varchar(512),
-        UUID varchar(255) not null,
-        WORKFLOW_ID int8,
-        primary key (TASK_ID)
-    );
-
-    create table CCM_CORE.WORKFLOWS (
-        WORKFLOW_ID int8 not null,
-        abstract_workflow boolean,
-        ACTIVE boolean,
-        WORKFLOW_STATE varchar(255),
-        TASKS_STATE varchar(255),
-        UUID varchar(255) not null,
-        OBJECT_ID int8,
-        TEMPLATE_ID int8,
-        primary key (WORKFLOW_ID)
-    );
-
-    alter table CCM_CORE.CATEGORY_DOMAINS 
-        add constraint UK_mb1riernf8a88u3mwl0bgfj8y unique (DOMAIN_KEY);
-
-    alter table CCM_CORE.CATEGORY_DOMAINS 
-        add constraint UK_i1xqotjvml7i6ro2jq22fxf5g unique (URI);
-
-    alter table CCM_CORE.CCM_OBJECTS 
-        add constraint UK_1cm71jlagvyvcnkqvxqyit3wx unique (UUID);
-
-    alter table CCM_CORE.HOSTS 
-        add constraint UK9ramlv6uxwt13v0wj7q0tucsx unique (SERVER_NAME, SERVER_PORT);
-
-    alter table CCM_CORE.INSTALLED_MODULES 
-        add constraint UK_11imwgfojyi4hpr18uw9g3jvx unique (MODULE_CLASS_NAME);
-
-    alter table CCM_CORE.SETTINGS 
-        add constraint UK5whinfxdaepqs09e5ia9y71uk unique (CONFIGURATION_CLASS, NAME);
-
-    alter table CCM_CORE.SITES 
-        add constraint UK_kou1h4y4st2m173he44yy8grx unique (DOMAIN_OF_SITE);
-
-    alter table CCM_CORE.WORKFLOW_TASK_COMMENTS 
-        add constraint UK_4nnedf08odyjxalfkg16fmjoi unique (UUID);
-
-    alter table CCM_CORE.WORKFLOW_TASKS 
-        add constraint UK_2u6ruatxij8wfojl8a1eigqqd unique (UUID);
-
-    alter table CCM_CORE.WORKFLOWS 
-        add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID);
-
     create sequence hibernate_sequence start 1 increment 1;
 
     alter table CCM_CMS.ARTICLE_TEXTS 
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index af3789d44..014881841 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -199,10 +199,10 @@
             <version>0.9.11</version>
         </dependency>
         
-        <dependency>
+        <!--<dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.json</artifactId>
-        </dependency>
+        </dependency>-->
         
         <dependency>
             <groupId>org.freemarker</groupId>
diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_19__add_theme_files.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_19__add_theme_files.sql
new file mode 100644
index 000000000..6577b3c8d
--- /dev/null
+++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_19__add_theme_files.sql
@@ -0,0 +1,52 @@
+    create table CCM_CORE.THEME_DATA_FILES (
+        CREATION_DATE timestamp,
+        FILE_DATA blob,
+        LAST_MODIFIED timestamp,
+        FILE_SIZE bigint,
+        TYPE varchar(255),
+        FILE_ID bigint not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.theme_directories (
+        FILE_ID bigint not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEME_FILES (
+        FILE_ID bigint not null,
+        NAME varchar(255) not null,
+        FILE_PATH varchar(8192) not null,
+        UUID varchar(255) not null,
+        PARENT_DIRECTORY_ID bigint,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEMES (
+        THEME_ID bigint not null,
+        NAME varchar(255),
+        UUID varchar(255),
+        VERSION varchar(255),
+        ROOT_DIRECTORY_ID bigint,
+        primary key (THEME_ID)
+    );
+
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_19__add_theme_files.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_19__add_theme_files.sql
new file mode 100644
index 000000000..401a19701
--- /dev/null
+++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_19__add_theme_files.sql
@@ -0,0 +1,39 @@
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
\ No newline at end of file
diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
index d9b43679a..e480c7d24 100644
--- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
@@ -128,7 +128,8 @@ public class CcmObjectRepositoryTest {
                 .getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
-            .addClass(org.libreccm.portation.Portable.class)
+//            .addClass(org.libreccm.portation.Portable.class)
+            .addPackage(org.libreccm.portation.Portable.class.getPackage())
             .addPackage(com.arsdigita.kernel.security.SecurityConfig.class
                 .getPackage())
             .addAsLibraries(getModuleDependencies())
diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql
index 051b92d3a..65b1f5646 100644
--- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql
+++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql
@@ -531,10 +531,10 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
         SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         SETTING_VALUE_DOUBLE double,
         SETTING_VALUE_LONG bigint,
         SETTING_VALUE_BOOLEAN boolean,
-        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         primary key (SETTING_ID)
     );
 
@@ -569,6 +569,39 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         primary key (OBJECT_ID)
     );
 
+    create table CCM_CORE.THEME_DATA_FILES (
+        CREATION_DATE timestamp,
+        FILE_DATA blob,
+        LAST_MODIFIED timestamp,
+        FILE_SIZE bigint,
+        TYPE varchar(255),
+        FILE_ID bigint not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.theme_directories (
+        FILE_ID bigint not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEME_FILES (
+        FILE_ID bigint not null,
+        NAME varchar(255) not null,
+        FILE_PATH varchar(8192) not null,
+        UUID varchar(255) not null,
+        PARENT_DIRECTORY_ID bigint,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEMES (
+        THEME_ID bigint not null,
+        NAME varchar(255),
+        UUID varchar(255),
+        VERSION varchar(255),
+        ROOT_DIRECTORY_ID bigint,
+        primary key (THEME_ID)
+    );
+
     create table CCM_CORE.THREADS (
         OBJECT_ID bigint not null,
         ROOT_ID bigint,
@@ -1140,6 +1173,26 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         foreign key (OBJECT_ID) 
         references CCM_CORE.CCM_OBJECTS;
 
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
     alter table CCM_CORE.THREADS 
         add constraint FKsx08mpwvwnw97uwdgjs76q39g 
         foreign key (ROOT_ID) 
diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql
index 0e42defde..3dc429702 100644
--- a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql
+++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql
@@ -3,7 +3,6 @@ drop schema if exists CCM_CORE cascade;
 drop sequence if exists HIBERNATE_SEQUENCE;
 
 
-
     create schema CCM_CORE;
 
     create table CCM_CORE.APPLICATIONS (
@@ -532,10 +531,10 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
         SETTING_VALUE_STRING varchar(1024),
+        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         SETTING_VALUE_DOUBLE float8,
         SETTING_VALUE_LONG int8,
         SETTING_VALUE_BOOLEAN boolean,
-        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         primary key (SETTING_ID)
     );
 
@@ -570,6 +569,39 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         primary key (OBJECT_ID)
     );
 
+    create table CCM_CORE.THEME_DATA_FILES (
+        CREATION_DATE timestamp,
+        FILE_DATA oid,
+        LAST_MODIFIED timestamp,
+        FILE_SIZE int8,
+        TYPE varchar(255),
+        FILE_ID int8 not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.theme_directories (
+        FILE_ID int8 not null,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEME_FILES (
+        FILE_ID int8 not null,
+        NAME varchar(255) not null,
+        FILE_PATH varchar(8192) not null,
+        UUID varchar(255) not null,
+        PARENT_DIRECTORY_ID int8,
+        primary key (FILE_ID)
+    );
+
+    create table CCM_CORE.THEMES (
+        THEME_ID int8 not null,
+        NAME varchar(255),
+        UUID varchar(255),
+        VERSION varchar(255),
+        ROOT_DIRECTORY_ID int8,
+        primary key (THEME_ID)
+    );
+
     create table CCM_CORE.THREADS (
         OBJECT_ID int8 not null,
         ROOT_ID int8,
@@ -1141,6 +1173,26 @@ drop sequence if exists HIBERNATE_SEQUENCE;
         foreign key (OBJECT_ID) 
         references CCM_CORE.CCM_OBJECTS;
 
+    alter table CCM_CORE.THEME_DATA_FILES 
+        add constraint FK630m2y2p7pp487ofowbefrm89 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.theme_directories 
+        add constraint FKrmgyslvw22j87n4cxau5jvsou 
+        foreign key (FILE_ID) 
+        references CCM_CORE.THEME_FILES;
+
+    alter table CCM_CORE.THEME_FILES 
+        add constraint FKfsycb4bt8d0wye7r3n06ekfeu 
+        foreign key (PARENT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
+    alter table CCM_CORE.THEMES 
+        add constraint FKlat55c5l3fxbykkibrmv7qi4x 
+        foreign key (ROOT_DIRECTORY_ID) 
+        references CCM_CORE.theme_directories;
+
     alter table CCM_CORE.THREADS 
         add constraint FKsx08mpwvwnw97uwdgjs76q39g 
         foreign key (ROOT_ID) 
diff --git a/pom.xml b/pom.xml
index 41f0acd25..1f2a2bbf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -574,11 +574,11 @@
             </dependency>
             <!-- Apache Commons libraries end -->
 
-            <dependency>
+            <!--<dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>javax.json</artifactId>
                 <version>1.1.2</version>
-            </dependency>
+            </dependency>-->
 
             <dependency>
                 <groupId>org.freemarker</groupId>
@@ -699,7 +699,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-transaction-bom</artifactId>
-                <version>1.0.5</version>
+                <version>1.0.3.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>