diff --git a/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs b/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs
index 1d74baa0d..fe7917bfa 100644
--- a/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs
+++ b/spring-batch-samples/.settings/com.springsource.sts.config.flow.prefs
@@ -1,4 +1,9 @@
-#Mon Nov 22 08:44:57 GMT 2010
+#Wed Jan 05 15:27:41 GMT 2011
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/footballJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="JobModelElement" type\="job">\n<structure end\="1163" endstart\="1157" start\="601" startend\="675"/>\n<bounds height\="228" width\="174" x\="178" y\="19"/>\n</element>\n<element clazz\="StepModelElement" type\="step">\n<structure end\="1413" endstart\="1406" start\="1166" startend\="1247"/>\n<bounds height\="34" width\="143" x\="17" y\="19"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="JobModelElement" type\="job">\n<structure end\="1002" endstart\="996" start\="515" startend\="610"/>\n<bounds height\="118" width\="131" x\="15" y\="17"/>\n</element>\n</graph>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="638" endstart\="632" start\="394" startend\="468"/>\n<bounds height\="118" width\="130" x\="15" y\="17"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/mailJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="JobModelElement" type\="job">\n<structure end\="1182" endstart\="1176" start\="607" startend\="677"/>\n<bounds height\="118" width\="101" x\="15" y\="17"/>\n</element>\n</graph>
 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="JobModelElement" type\="job">\n<structure end\="818" endstart\="812" start\="557" startend\="636"/>\n<bounds height\="128" width\="147" x\="100" y\="19"/>\n</element>\n<element clazz\="StepModelElement" type\="step">\n<structure end\="1427" endstart\="1420" start\="1154" startend\="1223"/>\n<bounds height\="34" width\="65" x\="17" y\="19"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="JobModelElement" type\="job">\n<structure end\="2227" endstart\="2221" start\="554" startend\="650"/>\n<bounds height\="570" width\="176" x\="296" y\="19"/>\n</element>\n<element clazz\="StepModelElement" type\="step">\n<structure end\="2972" endstart\="2965" start\="2230" startend\="2318"/>\n<bounds height\="34" width\="87" x\="104" y\="19"/>\n</element>\n<element clazz\="StepContainerElement" type\="step">\n<structure end\="1222" endstart\="1215" start\="654" startend\="689"/>\n<bounds height\="203" width\="248" x\="15" y\="121"/>\n</element>\n<element clazz\="DecisionContainerElement" type\="decision">\n<structure end\="2145" endstart\="2134" start\="1949" startend\="2015"/>\n<bounds height\="197" width\="248" x\="36" y\="392"/>\n</element>\n</graph>
+//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-samples/src/main/resources/jobs/tradeJob.xml=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element clazz\="JobModelElement" type\="job">\n<structure end\="1180" endstart\="1174" start\="451" startend\="522"/>\n<bounds height\="218" width\="107" x\="15" y\="17"/>\n</element>\n</graph>
 eclipse.preferences.version=1
diff --git a/spring-batch-samples/src/main/resources/business-schema-derby.sql b/spring-batch-samples/src/main/resources/business-schema-derby.sql
index 3ddc496b0..d92fef455 100644
--- a/spring-batch-samples/src/main/resources/business-schema-derby.sql
+++ b/spring-batch-samples/src/main/resources/business-schema-derby.sql
@@ -1,4 +1,5 @@
 -- Autogenerated: do not edit this file
+-- You might need to remove this section the first time you run against a clean database
 DROP TABLE  BATCH_STAGING_SEQ ;
 DROP TABLE  TRADE_SEQ ;
 DROP TABLE  CUSTOMER_SEQ ;
@@ -12,12 +13,9 @@ DROP TABLE  ERROR_LOG ;
 
 -- Autogenerated: do not edit this file
 
-CREATE TABLE CUSTOMER_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
-INSERT INTO CUSTOMER_SEQ (ID) values (5);
-CREATE TABLE BATCH_STAGING_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
-INSERT INTO BATCH_STAGING_SEQ (ID) values (0);
-CREATE TABLE TRADE_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
-INSERT INTO TRADE_SEQ (ID) values (0);
+CREATE TABLE CUSTOMER_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY (start with 5), DUMMY VARCHAR(1));
+CREATE TABLE BATCH_STAGING_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY (start with 0), DUMMY VARCHAR(1));
+CREATE TABLE TRADE_SEQ (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY (start with 0), DUMMY VARCHAR(1));
 
 CREATE TABLE BATCH_STAGING  (
 	ID BIGINT  NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,  
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 539b7e490..5aafdf080 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -93,6 +93,7 @@
 				GAMES.player_id group by GAMES.player_id, GAMES.year_no
 			</value>
 		</property>
+		<property name="verifyCursorPosition" value="${batch.verify.cursor.position}"/>
 	</bean>
 
 	<aop:config>
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml b/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
index d81c9ff30..d0e0b69a5 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
@@ -14,7 +14,7 @@
 	<bean id="itemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<property name="dataSource" ref="dataSource"/>
 		<property name="sql" value="select ID, NAME, CREDIT from CUSTOMER"/>
-		<property name="verifyCursorPosition" value="${batch.jdbc.verifyCursorPosition}"/>
+		<property name="verifyCursorPosition" value="${batch.verify.cursor.position}"/>
 		<property name="rowMapper">
 			<bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper"/>
 		</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/mailJob.xml b/spring-batch-samples/src/main/resources/jobs/mailJob.xml
index 949125e79..f29f3e1e6 100644
--- a/spring-batch-samples/src/main/resources/jobs/mailJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/mailJob.xml
@@ -28,6 +28,7 @@
 			</bean>
 		</property>
 		<property name="dataSource" ref="dataSource" />
+		<property name="verifyCursorPosition" value="${batch.verify.cursor.position}"/>
 	</bean>
 
 	<bean id="itemWriter" class="org.springframework.batch.item.mail.SimpleMailMessageItemWriter">
diff --git a/spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml b/spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml
index 45331fef1..feb0e50ca 100644
--- a/spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml
@@ -88,7 +88,7 @@
 			</value>
 		</property>
 		<property name="dataSource" ref="dataSource" />
-		<property name="verifyCursorPosition" value="${batch.jdbc.verifyCursorPosition}"/>
+		<property name="verifyCursorPosition" value="${batch.verify.cursor.position}"/>
 		<property name="rowMapper">
 			<bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper" />
 		</property>
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index 97265f729..61e55b994 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -123,6 +123,7 @@
 		<property name="rowMapper">
 			<bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
 		</property>
+		<property name="verifyCursorPosition" value="${batch.verify.cursor.position}"/>
 	</bean>
 
 	<bean id="errorLogTasklet" class="org.springframework.batch.sample.common.ErrorLogTasklet" scope="step">
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 024852894..c8dc38d00 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -51,6 +51,7 @@
 		<property name="rowMapper">
 			<bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
 		</property>
+		<property name="verifyCursorPosition" value="${batch.verify.cursor.position}"/>
 	</bean>
 
 	<bean id="customerSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
diff --git a/spring-batch-samples/src/main/sql/derby.vpp b/spring-batch-samples/src/main/sql/derby.vpp
index c5c1bd4f9..087cfeeae 100644
--- a/spring-batch-samples/src/main/sql/derby.vpp
+++ b/spring-batch-samples/src/main/sql/derby.vpp
@@ -1,3 +1,2 @@
-#macro (sequence $name $value)CREATE TABLE ${name} (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, DUMMY VARCHAR(1));
-INSERT INTO ${name} (ID) values (${value});
+#macro (sequence $name $value)CREATE TABLE ${name} (ID BIGINT  PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY (start with ${value}), DUMMY VARCHAR(1));
 #end