diff --git a/spring-batch-core/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql
index 2617dbd0d..4d4743a26 100644
--- a/spring-batch-core/src/main/resources/schema-db2.sql
+++ b/spring-batch-core/src/main/resources/schema-db2.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,  
 	VERSION BIGINT ,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) ,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql
index 6386fc4fb..758fe251f 100644
--- a/spring-batch-core/src/main/resources/schema-derby.sql
+++ b/spring-batch-core/src/main/resources/schema-derby.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,  
 	VERSION BIGINT ,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) ,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql
index 0c2b4866f..bfb994d4f 100644
--- a/spring-batch-core/src/main/resources/schema-hsqldb.sql
+++ b/spring-batch-core/src/main/resources/schema-hsqldb.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,  
 	VERSION BIGINT ,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) ,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql
index dd3f6fe8a..6f34c3646 100644
--- a/spring-batch-core/src/main/resources/schema-mysql.sql
+++ b/spring-batch-core/src/main/resources/schema-mysql.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,  
 	VERSION BIGINT ,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) ,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ENGINE=InnoDB;
 
diff --git a/spring-batch-core/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql
index 50634b4ac..2d992a431 100644
--- a/spring-batch-core/src/main/resources/schema-oracle10g.sql
+++ b/spring-batch-core/src/main/resources/schema-oracle10g.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID NUMBER(19,0)  NOT NULL PRIMARY KEY ,  
 	VERSION NUMBER(19,0) ,  
 	JOB_NAME VARCHAR2(100) NOT NULL, 
-	JOB_KEY VARCHAR2(2500) ,
+	JOB_KEY VARCHAR2(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql
index 70f6d2c37..cfbdd8c09 100644
--- a/spring-batch-core/src/main/resources/schema-postgresql.sql
+++ b/spring-batch-core/src/main/resources/schema-postgresql.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,  
 	VERSION BIGINT ,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) ,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/resources/schema-sqlserver.sql b/spring-batch-core/src/main/resources/schema-sqlserver.sql
index 2d1312234..f3404afbc 100644
--- a/spring-batch-core/src/main/resources/schema-sqlserver.sql
+++ b/spring-batch-core/src/main/resources/schema-sqlserver.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,  
 	VERSION BIGINT ,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) ,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/resources/schema-sybase.sql b/spring-batch-core/src/main/resources/schema-sybase.sql
index dda071b92..fbeec3749 100644
--- a/spring-batch-core/src/main/resources/schema-sybase.sql
+++ b/spring-batch-core/src/main/resources/schema-sybase.sql
@@ -4,7 +4,7 @@ CREATE TABLE BATCH_JOB_INSTANCE  (
 	JOB_INSTANCE_ID BIGINT  NOT NULL PRIMARY KEY ,  
 	VERSION BIGINT NULL,  
 	JOB_NAME VARCHAR(100) NOT NULL, 
-	JOB_KEY VARCHAR(2500) NULL,
+	JOB_KEY VARCHAR(32) NOT NULL,
 	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
 ) ;
 
diff --git a/spring-batch-core/src/main/sql/schema.sql.vpp b/spring-batch-core/src/main/sql/schema.sql.vpp
index 18eeeb849..c59d22f0a 100644
--- a/spring-batch-core/src/main/sql/schema.sql.vpp
+++ b/spring-batch-core/src/main/sql/schema.sql.vpp
@@ -1,7 +1,79 @@
 -- Autogenerated: do not edit this file
 
-#parse("${includes}/tables-main.sql.vpp")
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED},  
+	VERSION ${BIGINT} $!{NULL},  
+	JOB_NAME ${VARCHAR}(100) NOT NULL, 
+	JOB_KEY ${VARCHAR}(32) NOT NULL,
+	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
+) $!{VOODOO};
 
-#parse("${includes}/tables-context.sql.vpp")
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED},
+	VERSION ${BIGINT}  $!{NULL},  
+	JOB_INSTANCE_ID ${BIGINT} NOT NULL,
+	CREATE_TIME ${TIMESTAMP} NOT NULL,
+	START_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL}, 
+	END_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL},
+	STATUS ${VARCHAR}(10) $!{NULL},
+	EXIT_CODE ${VARCHAR}(20) $!{NULL},
+	EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL},
+	LAST_UPDATED ${TIMESTAMP},
+	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) $!{VOODOO};
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID ${BIGINT} NOT NULL ,
+	TYPE_CD ${VARCHAR}(6) NOT NULL ,
+	KEY_NAME ${VARCHAR}(100) NOT NULL , 
+	STRING_VAL ${VARCHAR}(250) $!{NULL}, 
+	DATE_VAL ${TIMESTAMP} DEFAULT NULL $!{NULL},
+	LONG_VAL ${BIGINT} $!{NULL},
+	DOUBLE_VAL ${DOUBLE} $!{NULL},
+	constraint JOB_INST_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) $!{VOODOO};
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED},
+	VERSION ${BIGINT} NOT NULL,  
+	STEP_NAME ${VARCHAR}(100) NOT NULL,
+	JOB_EXECUTION_ID ${BIGINT} NOT NULL,
+	START_TIME ${TIMESTAMP} NOT NULL , 
+	END_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL},  
+	STATUS ${VARCHAR}(10) $!{NULL},
+	COMMIT_COUNT ${BIGINT} $!{NULL}, 
+	READ_COUNT ${BIGINT} $!{NULL},
+	FILTER_COUNT ${BIGINT} $!{NULL},
+	WRITE_COUNT ${BIGINT} $!{NULL},
+	READ_SKIP_COUNT ${BIGINT} $!{NULL},
+	WRITE_SKIP_COUNT ${BIGINT} $!{NULL},
+	PROCESS_SKIP_COUNT ${BIGINT} $!{NULL},
+	ROLLBACK_COUNT ${BIGINT} $!{NULL}, 
+	EXIT_CODE ${VARCHAR}(20) $!{NULL},
+	EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL},
+	LAST_UPDATED ${TIMESTAMP},
+	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) $!{VOODOO};
 
-#parse("${includes}/sequences.sql.vpp")
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID ${BIGINT} NOT NULL PRIMARY KEY,
+	SHORT_CONTEXT ${VARCHAR}(2500) NOT NULL,
+	SERIALIZED_CONTEXT ${CLOB} $!{NULL}, 
+	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) $!{VOODOO};
+
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+	JOB_EXECUTION_ID ${BIGINT} NOT NULL PRIMARY KEY,
+	SHORT_CONTEXT ${VARCHAR}(2500) NOT NULL,
+	SERIALIZED_CONTEXT ${CLOB} $!{NULL}, 
+	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) $!{VOODOO};
+
+#sequence( "BATCH_STEP_EXECUTION_SEQ" )
+#sequence( "BATCH_JOB_EXECUTION_SEQ" )
+#sequence( "BATCH_JOB_SEQ" )
diff --git a/spring-batch-core/src/main/sql/sequences.sql.vpp b/spring-batch-core/src/main/sql/sequences.sql.vpp
deleted file mode 100644
index 73216cd7c..000000000
--- a/spring-batch-core/src/main/sql/sequences.sql.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#sequence( "BATCH_STEP_EXECUTION_SEQ" )
-#sequence( "BATCH_JOB_EXECUTION_SEQ" )
-#sequence( "BATCH_JOB_SEQ" )
diff --git a/spring-batch-core/src/main/sql/tables-context.sql.vpp b/spring-batch-core/src/main/sql/tables-context.sql.vpp
deleted file mode 100644
index 69b3403ab..000000000
--- a/spring-batch-core/src/main/sql/tables-context.sql.vpp
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID ${BIGINT} NOT NULL PRIMARY KEY,
-	SHORT_CONTEXT ${VARCHAR}(2500) NOT NULL,
-	SERIALIZED_CONTEXT ${CLOB} $!{NULL}, 
-	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) $!{VOODOO};
-
-CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
-	JOB_EXECUTION_ID ${BIGINT} NOT NULL PRIMARY KEY,
-	SHORT_CONTEXT ${VARCHAR}(2500) NOT NULL,
-	SERIALIZED_CONTEXT ${CLOB} $!{NULL}, 
-	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) $!{VOODOO};
diff --git a/spring-batch-core/src/main/sql/tables-main.sql.vpp b/spring-batch-core/src/main/sql/tables-main.sql.vpp
deleted file mode 100644
index 37139756d..000000000
--- a/spring-batch-core/src/main/sql/tables-main.sql.vpp
+++ /dev/null
@@ -1,57 +0,0 @@
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED},  
-	VERSION ${BIGINT} $!{NULL},  
-	JOB_NAME ${VARCHAR}(100) NOT NULL, 
-	JOB_KEY ${VARCHAR}(2500) $!{NULL},
-	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
-) $!{VOODOO};
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED},
-	VERSION ${BIGINT}  $!{NULL},  
-	JOB_INSTANCE_ID ${BIGINT} NOT NULL,
-	CREATE_TIME ${TIMESTAMP} NOT NULL,
-	START_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL}, 
-	END_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL},
-	STATUS ${VARCHAR}(10) $!{NULL},
-	EXIT_CODE ${VARCHAR}(20) $!{NULL},
-	EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL},
-	LAST_UPDATED ${TIMESTAMP},
-	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) $!{VOODOO};
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID ${BIGINT} NOT NULL ,
-	TYPE_CD ${VARCHAR}(6) NOT NULL ,
-	KEY_NAME ${VARCHAR}(100) NOT NULL , 
-	STRING_VAL ${VARCHAR}(250) $!{NULL}, 
-	DATE_VAL ${TIMESTAMP} DEFAULT NULL $!{NULL},
-	LONG_VAL ${BIGINT} $!{NULL},
-	DOUBLE_VAL ${DOUBLE} $!{NULL},
-	constraint JOB_INST_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) $!{VOODOO};
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID ${BIGINT} $!{IDENTITY} NOT NULL PRIMARY KEY $!{GENERATED},
-	VERSION ${BIGINT} NOT NULL,  
-	STEP_NAME ${VARCHAR}(100) NOT NULL,
-	JOB_EXECUTION_ID ${BIGINT} NOT NULL,
-	START_TIME ${TIMESTAMP} NOT NULL , 
-	END_TIME ${TIMESTAMP} DEFAULT NULL $!{NULL},  
-	STATUS ${VARCHAR}(10) $!{NULL},
-	COMMIT_COUNT ${BIGINT} $!{NULL}, 
-	READ_COUNT ${BIGINT} $!{NULL},
-	FILTER_COUNT ${BIGINT} $!{NULL},
-	WRITE_COUNT ${BIGINT} $!{NULL},
-	READ_SKIP_COUNT ${BIGINT} $!{NULL},
-	WRITE_SKIP_COUNT ${BIGINT} $!{NULL},
-	PROCESS_SKIP_COUNT ${BIGINT} $!{NULL},
-	ROLLBACK_COUNT ${BIGINT} $!{NULL}, 
-	EXIT_CODE ${VARCHAR}(20) $!{NULL},
-	EXIT_MESSAGE ${VARCHAR}(2500) $!{NULL},
-	LAST_UPDATED ${TIMESTAMP},
-	constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) $!{VOODOO};