diff --git a/samples/.springBeans b/samples/.springBeans
index 0730df05a..9095f24a5 100644
--- a/samples/.springBeans
+++ b/samples/.springBeans
@@ -20,6 +20,7 @@
 		<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
 		<config>src/main/resources/data-source-context-init.xml</config>
 		<config>src/main/resources/jobs/xmlStaxJob.xml</config>
+		<config>src/main/resources/jobs/nflJob.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
diff --git a/samples/src/main/resources/jobs/nflJob.xml b/samples/src/main/resources/jobs/nflJob.xml
index 669ce3833..dd8fd153b 100644
--- a/samples/src/main/resources/jobs/nflJob.xml
+++ b/samples/src/main/resources/jobs/nflJob.xml
@@ -16,7 +16,7 @@
 		<property name="steps">
 			<list>
 				<bean id="playerload"
-					class="org.springframework.batch.execution.step.simple.SimpleStepConfiguration">
+					class="org.springframework.batch.execution.step.SimpleStepConfiguration">
 					<property name="commitInterval" value="100"></property>
 					<property name="startLimit" value="100" />
 					<property name="saveRestartData" value="true" />
@@ -26,13 +26,9 @@
 							class="org.springframework.batch.execution.tasklet.RestartableItemProviderTasklet">
 							<property name="itemProvider">
 								<bean
-									class="org.springframework.batch.sample.item.provider.NflPlayerItemProvider">
+									class="org.springframework.batch.item.provider.InputSourceItemProvider">
 									<property name="inputSource"
 										ref="playerFileInputSource" />
-									<property name="fieldSetMapper">
-										<bean
-											class="org.springframework.batch.sample.mapping.NflPlayerMapper" />
-									</property>
 								</bean>
 							</property>
 							<property name="itemProcessor">
@@ -50,7 +46,7 @@
 					</property>
 				</bean>
 				<bean id="gameLoad"
-					class="org.springframework.batch.execution.step.simple.SimpleStepConfiguration">
+					class="org.springframework.batch.execution.step.SimpleStepConfiguration">
 					<property name="commitInterval" value="100" />
 					<property name="startLimit" value="100" />
 					<property name="saveRestartData" value="true" />
@@ -59,13 +55,9 @@
 							class="org.springframework.batch.execution.tasklet.RestartableItemProviderTasklet">
 							<property name="itemProvider">
 								<bean
-									class="org.springframework.batch.item.provider.FlatFileItemProvider">
-									<property name="source"
+									class="org.springframework.batch.item.provider.InputSourceItemProvider">
+									<property name="inputSource"
 										ref="gameFileInputSource" />
-									<property name="mapper">
-										<bean
-											class="org.springframework.batch.sample.mapping.NflGameMapper" />
-									</property>
 								</bean>
 							</property>
 							<property name="itemProcessor">
@@ -84,7 +76,7 @@
 					</property>
 				</bean>
 				<bean id="playerSummarization"
-					class="org.springframework.batch.execution.step.simple.SimpleStepConfiguration">
+					class="org.springframework.batch.execution.step.SimpleStepConfiguration">
 					<property name="commitInterval" value="100" />
 					<property name="startLimit" value="100" />
 					<property name="saveRestartData" value="true" />
@@ -132,6 +124,10 @@
 					value="ID,lastName,firstName,position,birthYear,debutYear" />
 			</bean>
 		</property>
+		<property name="fieldSetMapper">
+			<bean
+				class="org.springframework.batch.sample.mapping.NflPlayerMapper" />
+		</property>
 	</bean>
 
 	<bean id="gameFileInputSource"
@@ -149,6 +145,10 @@
 					value="id,year,team,week,opponent,completes,attempts,passingYards,passingTd,interceptions,rushes,rushYards,receptions,receptionYards,totalTd" />
 			</bean>
 		</property>
+		<property name="fieldSetMapper">
+			<bean
+				class="org.springframework.batch.sample.mapping.NflGameMapper" />
+		</property>
 	</bean>
 
 	<bean id="playerSummarizationSource"