diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index df590b1415e..353e16b103a 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -93,18 +92,13 @@
 			<artifactId>jscience</artifactId>
 		</dependency>
 
-		<!-- FHIR RI is pulled in for UCUM support, but we don't want any of its 
-			dependencies. -->
-		<!-- <dependency> <groupId>me.fhir</groupId> <artifactId>fhir-dstu1</artifactId> 
-			<version>0.0.81.2489</version> <exclusions> <exclusion> <artifactId>Saxon-HE</artifactId> 
-			<groupId>net.sf.saxon</groupId> </exclusion> <exclusion> <artifactId>commons-discovery</artifactId> 
-			<groupId>commons-discovery</groupId> </exclusion> <exclusion> <artifactId>commons-codec</artifactId> 
-			<groupId>commons-codec</groupId> </exclusion> <exclusion> <artifactId>commons-logging</artifactId> 
-			<groupId>commons-logging</groupId> </exclusion> <exclusion> <artifactId>xpp3</artifactId> 
-			<groupId>xpp3</groupId> </exclusion> <exclusion> <artifactId>junit</artifactId> 
-			<groupId>junit</groupId> </exclusion> <exclusion> <artifactId>jdom</artifactId> 
-			<groupId>org.jdom</groupId> </exclusion> <exclusion> <artifactId>gson</artifactId> 
-			<groupId>com.google.code.gson</groupId> </exclusion> </exclusions> </dependency> -->
+		<!-- FHIR RI is pulled in for UCUM support, but we don't want any of its dependencies. -->
+		<!-- <dependency> <groupId>me.fhir</groupId> <artifactId>fhir-dstu1</artifactId> <version>0.0.81.2489</version> <exclusions> <exclusion> <artifactId>Saxon-HE</artifactId> 
+			<groupId>net.sf.saxon</groupId> </exclusion> <exclusion> <artifactId>commons-discovery</artifactId> <groupId>commons-discovery</groupId> </exclusion> <exclusion> 
+			<artifactId>commons-codec</artifactId> <groupId>commons-codec</groupId> </exclusion> <exclusion> <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> 
+			</exclusion> <exclusion> <artifactId>xpp3</artifactId> <groupId>xpp3</groupId> </exclusion> <exclusion> <artifactId>junit</artifactId> <groupId>junit</groupId> </exclusion> 
+			<exclusion> <artifactId>jdom</artifactId> <groupId>org.jdom</groupId> </exclusion> <exclusion> <artifactId>gson</artifactId> <groupId>com.google.code.gson</groupId> 
+			</exclusion> </exclusions> </dependency> -->
 
 
 		<!-- Test Database -->
@@ -126,8 +120,7 @@
 		</dependency>
 
 
-		<!-- <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> 
-			<version>2.3.2</version> </dependency> -->
+		<!-- <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>2.3.2</version> </dependency> -->
 
 		<!-- Spring -->
 		<dependency>
@@ -162,6 +155,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
@@ -226,7 +223,7 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlets</artifactId>
@@ -252,7 +249,7 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 	</dependencies>
 
 
@@ -277,10 +274,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<!--
-					These tests all use a shared database, so it's easier if
-					they run in a predictable order 
-					-->
+					<!-- These tests all use a shared database, so it's easier if they run in a predictable order -->
 					<runOrder>alphabetical</runOrder>
 				</configuration>
 			</plugin>
@@ -346,7 +340,7 @@
 	</build>
 
 	<reporting>
-		<plugins>		
+		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
@@ -373,17 +367,8 @@
 							<target>SCRIPT</target>
 							<skip>${skip-hib4}</skip>
 						</configuration>
-						<!--
-						This needs to be uncommented in order for this plugin to work with
-						Hibernate 4.3+ (as of hibernate4-maven-plugin version 1.0.5)
-						<dependencies>
-							<dependency>
-								<groupId>org.hibernate</groupId>
-								<artifactId>hibernate-core</artifactId>
-								<version>${hibernate_version}</version>
-							</dependency>
-						</dependencies>
-						-->
+						<!-- This needs to be uncommented in order for this plugin to work with Hibernate 4.3+ (as of hibernate4-maven-plugin version 1.0.5) <dependencies> <dependency> 
+							<groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernate_version}</version> </dependency> </dependencies> -->
 						<executions>
 							<execution>
 								<id>o10g</id>
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
index a9479b8b625..8f675b4a2a3 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
@@ -999,6 +999,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 		ResourceMetadataKeyEnum.VERSION.put(res, Long.toString(theEntity.getVersion()));
 		ResourceMetadataKeyEnum.PUBLISHED.put(res, theEntity.getPublished());
 		ResourceMetadataKeyEnum.UPDATED.put(res, theEntity.getUpdated());
+		IDao.RESOURCE_PID.put(res, theEntity.getId());
 
 		if (theEntity.getTitle() != null) {
 			ResourceMetadataKeyEnum.TITLE.put(res, theEntity.getTitle());
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java
index 710d9826694..bc13f422a54 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java
@@ -2,6 +2,7 @@ package ca.uhn.fhir.jpa.dao;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -10,12 +11,15 @@ import javax.persistence.TypedQuery;
 
 import org.apache.commons.lang3.time.DateUtils;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
+import ca.uhn.fhir.jpa.dao.data.ISubscriptionFlaggedResourceDataDao;
 import ca.uhn.fhir.jpa.entity.ResourceTable;
+import ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource;
 import ca.uhn.fhir.jpa.entity.SubscriptionTable;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
@@ -31,6 +35,9 @@ public class FhirResourceDaoSubscriptionDstu2 extends FhirResourceDaoDstu2<Subsc
 
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoSubscriptionDstu2.class);
 
+	@Autowired
+	private ISubscriptionFlaggedResourceDataDao mySubscriptionFlaggedResourceDataDao;
+	
 	private void createSubscriptionTable(ResourceTable theEntity, Subscription theSubscription) {
 		SubscriptionTable subscriptionEntity = new SubscriptionTable();
 		subscriptionEntity.setSubscriptionResource(theEntity);
@@ -88,6 +95,12 @@ public class FhirResourceDaoSubscriptionDstu2 extends FhirResourceDaoDstu2<Subsc
 		
 		ourLog.info("Found {} new results for Subscription {}", results.size(), subscription.getId().getIdPart());
 		
+		List<SubscriptionFlaggedResource> flags = new ArrayList<SubscriptionFlaggedResource>();
+		for (IBaseResource next : results.getResources(0, results.size())) {
+			SubscriptionFlaggedResource nextFlag = new SubscriptionFlaggedResource();
+			nextFlag.setResource();
+		}
+		
 	}
 
 	@Override
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IDao.java
index cac3eca1687..052faf30a08 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IDao.java
@@ -1,5 +1,8 @@
 package ca.uhn.fhir.jpa.dao;
 
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
+
 /*
  * #%L
  * HAPI FHIR JPA Server
@@ -22,6 +25,21 @@ package ca.uhn.fhir.jpa.dao;
 
 public interface IDao {
 
-	void registerDaoListener(IDaoListener theListener);
+	public static final ResourceMetadataKeyEnum<Long> RESOURCE_PID = new ResourceMetadataKeyEnum<Long>("RESOURCE_PID") {
 
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public Long get(IResource theResource) {
+			return (Long) theResource.getResourceMetadata().get(RESOURCE_PID);
+		}
+
+		@Override
+		public void put(IResource theResource, Long theObject) {
+			theResource.getResourceMetadata().put(RESOURCE_PID, theObject);
+		}
+	};
+
+	void registerDaoListener(IDaoListener theListener);
+	
 }
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionFlaggedResourceDataDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionFlaggedResourceDataDao.java
new file mode 100644
index 00000000000..c6b1abc2ee5
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISubscriptionFlaggedResourceDataDao.java
@@ -0,0 +1,9 @@
+package ca.uhn.fhir.jpa.dao.data;
+
+import org.springframework.data.repository.CrudRepository;
+
+import ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource;
+
+public interface ISubscriptionFlaggedResourceDataDao extends CrudRepository<SubscriptionFlaggedResource, Long> {
+
+}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionFlaggedResource.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionFlaggedResource.java
index 73a7ae2f679..e9523dee549 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionFlaggedResource.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionFlaggedResource.java
@@ -1,16 +1,14 @@
 package ca.uhn.fhir.jpa.entity;
 
-import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 @Entity
 @Table(name = "HFJ_SUBSCRIPTION_FLAG_RES")
@@ -22,8 +20,28 @@ public class SubscriptionFlaggedResource {
 	@Column(name = "PID", insertable = false, updatable = false)
 	private Long myId;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name = "CREATED", nullable = false)
-	private Date myCreated;
+	@ManyToOne
+	@JoinColumn(name="RES_ID")
+	private ResourceTable myResource;
+	
+	@ManyToOne()
+	@JoinColumn(name="SUBSCRIPTION_ID")
+	private SubscriptionTable mySubscription;
 
+	public ResourceTable getResource() {
+		return myResource;
+	}
+
+	public SubscriptionTable getSubscription() {
+		return mySubscription;
+	}
+
+	public void setResource(ResourceTable theResource) {
+		myResource = theResource;
+	}
+
+	public void setSubscription(SubscriptionTable theSubscription) {
+		mySubscription = theSubscription;
+	}
+	
 }
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java
index 9ac60c9f6c6..baedc9e52f5 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/SubscriptionTable.java
@@ -13,6 +13,7 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
@@ -65,6 +66,9 @@ public class SubscriptionTable {
 	@JoinColumn(name = "RES_ID", insertable = true, updatable = false, referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_SUBSCRIPTION_RESOURCE_ID") )
 	private ResourceTable mySubscriptionResource;
 
+	@OneToMany(orphanRemoval=true, mappedBy="mySubscription")
+	private SubscriptionFlaggedResource myFlaggedResources;
+
 	public long getCheckInterval() {
 		return myCheckInterval;
 	}
diff --git a/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans.vm b/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans.vm
index bb0fa08afcd..88bd044d3f2 100644
--- a/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans.vm
+++ b/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans.vm
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:jpa="http://www.springframework.org/schema/data/jpa"
 	default-autowire="no" default-lazy-init="false"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
@@ -8,6 +9,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
 	"
 	>
 
@@ -21,6 +23,13 @@
 	</bean>
 
 #if ( ${versionCapitalized} == 'Dstu2' )
+	<jpa:repositories />
+	<bean id="mySubscriptionFlaggedResourceDataDao" class="ca.uhn.fhir.jpa.dao.ISubscriptionFlaggedResourceDataDao" />
+
+	<task:annotation-driven executor="myExecutor" scheduler="myScheduler"/>
+	<task:executor id="myExecutor" pool-size="5"/>
+	<task:scheduler id="myScheduler" pool-size="10"/>
+
 	<bean id="myJpaValidationSupport${versionCapitalized}" class="ca.uhn.fhir.jpa.dao.JpaValidationSupport${versionCapitalized}"/>
 #end
 
diff --git a/pom.xml b/pom.xml
index 743cd97ebba..5645da54d42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -503,6 +503,11 @@
 				<artifactId>spring-core</artifactId>
 				<version>${spring_version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-jpa</artifactId>
+				<version>1.9.0.RELEASE</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-orm</artifactId>