diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseResourceProvider.java
similarity index 94%
rename from hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceProvider.java
rename to hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseResourceProvider.java
index 3a58850d5ac..02005f2bc5d 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceProvider.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseResourceProvider.java
@@ -1,9 +1,8 @@
-package ca.uhn.fhir.jpa.entity;
+package ca.uhn.fhir.jpa.dao;
 
 import java.util.HashMap;
 import java.util.List;
 
-import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
 import ca.uhn.fhir.model.api.IQueryParameterType;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.primitive.IdDt;
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java
new file mode 100644
index 00000000000..da785fca6a4
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IndexedParam.java
@@ -0,0 +1,7 @@
+package ca.uhn.fhir.jpa.dao;
+
+public @interface IndexedParam {
+
+	String path();
+
+}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceIndexedSearchParam.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceIndexedSearchParam.java
new file mode 100644
index 00000000000..55d26fe524d
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BaseResourceIndexedSearchParam.java
@@ -0,0 +1,33 @@
+package ca.uhn.fhir.jpa.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+public class BaseResourceIndexedSearchParam implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "RES_ID")
+	private Long myId;
+
+	@ManyToOne(optional=false)
+	@Column(name="RESOURCE_PID", nullable=false)
+	private BaseResourceTable<?> myResource;
+	
+
+}
diff --git a/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/PatientResourceProvider.java b/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/PatientResourceProvider.java
index 6a3f7190090..25f0f978991 100644
--- a/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/PatientResourceProvider.java
+++ b/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/PatientResourceProvider.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import ca.uhn.fhir.jpa.entity.BaseResourceProvider;
+import ca.uhn.fhir.jpa.dao.BaseResourceProvider;
 import ca.uhn.fhir.model.api.IQueryParameterType;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Description;
diff --git a/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/QuestionnaireResourceProvider.java b/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/QuestionnaireResourceProvider.java
index 3c963e3fe9c..2f6c18c717e 100644
--- a/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/QuestionnaireResourceProvider.java
+++ b/hapi-fhir-jpaserver-test/src/main/java/ca/uhn/fhir/jpa/test/QuestionnaireResourceProvider.java
@@ -1,6 +1,6 @@
 package ca.uhn.fhir.jpa.test;
 
-import ca.uhn.fhir.jpa.entity.BaseResourceProvider;
+import ca.uhn.fhir.jpa.dao.BaseResourceProvider;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.dstu.resource.Questionnaire;
 
diff --git a/hapi-tinder-plugin/src/main/resources/vm/jpa_entity.vm b/hapi-tinder-plugin/src/main/resources/vm/jpa_entity.vm
new file mode 100644
index 00000000000..51cc60e5fca
--- /dev/null
+++ b/hapi-tinder-plugin/src/main/resources/vm/jpa_entity.vm
@@ -0,0 +1,45 @@
+#parse ( "/vm/templates.vm" )
+
+package ${packageBase};
+
+@ResourceDef(name="${className}", profile="${profile}", id="${id}")
+public class ${className}ResourceTable extends BaseResourceTable<${className}> {
+
+#foreach ( $param in $searchParams )
+#if( ${param.typeCapitalized} == 'String' )
+	@IndexedParam(path="${param.path}")
+	@Column(length=100)
+	private String ${param.name};
+#elseif( ${param.typeCapitalized} == 'Date' )
+	@IndexedParam(path="${param.path}")
+	@Column()
+	private String ${param.name};
+
+	/**
+	 * <b>Fluent Client</b> search parameter constant for <b>${param.name}</b>
+	 * <p>
+	 * Description: <b>${param.description}</b><br/>
+	 * Type: <b>${param.type}</b><br/>
+	 * Path: <b>${param.path}</b><br/>
+	 * </p>
+	 */
+	public static final ${param.typeCapitalized}Param ${param.fluentConstantName} = new ${param.typeCapitalized}Param(${param.constantName});
+
+#if( ${param.typeCapitalized} == 'Reference' )
+#foreach ( $include in $param.paths )
+	/**
+	 * Constant for fluent queries to be used to add include statements. Specifies
+	 * the path value of "<b>${include.path}</b>".
+	 */
+	public static final Include INCLUDE_${include.includeName} = new Include("${include.path}");
+
+#end	
+#end
+#end
+
+	@Override
+	public Class<${className}> getResourceType() {
+		return ${className}.class;
+	}
+	
+}
\ No newline at end of file
diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml
index 6edce963b29..8b40d04da96 100644
--- a/restful-server-example/pom.xml
+++ b/restful-server-example/pom.xml
@@ -17,7 +17,7 @@
 			<version>0.3</version>
 		</dependency>
 
-		<!-- HAPI-FHIR uses Logback for logging support. The logback library is included automatically by Maven as a part of the hapi-fhir-base dependency, but you also need to include a 
+		<!-- HAPI-FHIR uses Logback for logging support. The logback library is included automatically by Maven as a part of the hapi-fhir-base dependency, but you also need to include a
 			logging library. Logback is used here, but log4j would also be fine. -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
@@ -46,6 +46,8 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
+
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -53,6 +55,7 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
+
 		</plugins>
 	</build>