diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
index eabfd5a9ebd..060034064a9 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
index b095010a37e..46d57d7600f 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
index e2c15e92cd4..424e8590d1a 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES LONGVARBINARY,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
index 05dc4a79e6e..43384bde5d1 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES LONGVARBINARY,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
index 47c13591ca2..9dc5a66027c 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE DATETIME(6) NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 ) ENGINE=InnoDB;
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 ) ENGINE=InnoDB;
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE DATETIME(6) NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql
index b25c387ac4c..757af4b5294 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR2(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR2(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR2(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	MARKED NUMBER(19,0),
 	COMPLETE NUMBER(19,0),
 	LAST_RELEASED_SEQUENCE NUMBER(19,0),
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR2(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR2(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
index fe17bde63c2..1da163a7dd3 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BYTEA,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
index 9012fe12eac..059427ba70d 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES IMAGE,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 );
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE DATETIME NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
index f920c4a837f..161a6631c44 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES IMAGE,
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 ) LOCK DATAROWS;
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION VARCHAR(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	MARKED BIGINT,
 	COMPLETE BIGINT,
 	LAST_RELEASED_SEQUENCE BIGINT,
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 ) LOCK DATAROWS;
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION VARCHAR(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION VARCHAR(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE DATETIME NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
diff --git a/spring-integration-jdbc/src/main/sql/schema.sql.vpp b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
index 950a790bf27..ec3db9380bf 100644
--- a/spring-integration-jdbc/src/main/sql/schema.sql.vpp
+++ b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
@@ -1,8 +1,8 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID CHAR(36),
-	REGION ${VARCHAR}(100),
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION ${VARCHAR}(100) NOT NULL,
 	CREATED_DATE ${TIMESTAMP} NOT NULL,
 	MESSAGE_BYTES ${BLOB},
 	constraint MESSAGE_PK primary key (MESSAGE_ID, REGION)
@@ -11,15 +11,15 @@ CREATE TABLE INT_MESSAGE  (
 CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
-	GROUP_KEY CHAR(36),
-	MESSAGE_ID CHAR(36),
-	REGION ${VARCHAR}(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	REGION ${VARCHAR}(100) NOT NULL,
 	constraint GROUP_TO_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
 )#if(${VOODOO}) ${VOODOO}#end;
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	GROUP_KEY CHAR(36),
-	REGION ${VARCHAR}(100),
+	GROUP_KEY CHAR(36) NOT NULL,
+	REGION ${VARCHAR}(100) NOT NULL,
 	MARKED ${BIGINT},
 	COMPLETE ${BIGINT},
 	LAST_RELEASED_SEQUENCE ${BIGINT},
@@ -29,8 +29,8 @@ CREATE TABLE INT_MESSAGE_GROUP  (
 )#if(${VOODOO}) ${VOODOO}#end;
 
 CREATE TABLE INT_LOCK  (
-	LOCK_KEY CHAR(36),
-	REGION ${VARCHAR}(100),
+	LOCK_KEY CHAR(36) NOT NULL,
+	REGION ${VARCHAR}(100) NOT NULL,
 	CLIENT_ID CHAR(36),
 	CREATED_DATE ${TIMESTAMP} NOT NULL,
 	constraint LOCK_PK primary key (LOCK_KEY, REGION)
@@ -47,11 +47,12 @@ CREATE TABLE INT_CHANNEL_MESSAGE (
 	MESSAGE_SEQUENCE ${BIGINT} NOT NULL #if(${AUTO_INCREMENT})${AUTO_INCREMENT}#end,
 	MESSAGE_BYTES ${BLOB},
 	REGION ${VARCHAR}(100) NOT NULL,
-	constraint INT_CHANNEL_MESSAGE_PK primary key (GROUP_KEY, MESSAGE_ID, REGION)
+	constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE)
 )#if(${VOODOO}) ${VOODOO}#end;
 
-CREATE INDEX INT_CHANNEL_MSG_DATE_IDX ON INT_CHANNEL_MESSAGE (CREATED_DATE, MESSAGE_SEQUENCE);
-CREATE INDEX INT_CHANNEL_MSG_PRIORITY_IDX ON INT_CHANNEL_MESSAGE (MESSAGE_PRIORITY DESC, CREATED_DATE, MESSAGE_SEQUENCE);
+CREATE INDEX INT_CHANNEL_MSG_DELETE_IDX ON INT_CHANNEL_MESSAGE (REGION, GROUP_KEY, MESSAGE_ID);
+-- This is only needed if the message group store property 'priorityEnabled' is true
+-- CREATE UNIQUE INDEX INT_CHANNEL_MSG_PRIORITY_IDX ON INT_CHANNEL_MESSAGE (REGION, GROUP_KEY, MESSAGE_PRIORITY DESC, CREATED_DATE, MESSAGE_SEQUENCE);
 
 
 CREATE TABLE INT_METADATA_STORE  (