diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
index abf92592ffa..e83ed5ebd9b 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
@@ -1095,8 +1095,8 @@ public class SearchBuilder {
 			if (cmpValue != ParamPrefixEnum.NOT_EQUAL) {
 				lowPred = builder.ge(path.as(BigDecimal.class), low);
 				highPred = builder.le(path.as(BigDecimal.class), high);
-				ourLog.info("Searching for {} <= val <= {}", low, high);
 				num = builder.and(lowPred, highPred);
+				ourLog.trace("Searching for {} <= val <= {}", low, high);
 			} else {
 				// Prefix was "ne", so reverse it!
 				lowPred = builder.lt(path.as(BigDecimal.class), low);
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java
index 56a81ec88be..135fd7635ec 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermCodeSystem.java
@@ -50,5 +50,8 @@ public class TermCodeSystem implements Serializable {
 	@OneToOne()
 	@JoinColumn(name="RES_ID", referencedColumnName="RES_ID", nullable=false, updatable=false)
 	private ResourceTable myResource;
+	
+	@Column(name="RES_VERSION_ID", nullable=false, updatable=false)
+	private Long myResourceVersionId;
 
 }
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java
new file mode 100644
index 00000000000..66b877453f8
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptParentChildLink.java
@@ -0,0 +1,57 @@
+package ca.uhn.fhir.jpa.entity;
+
+/*
+ * #%L
+ * HAPI FHIR JPA Server
+ * %%
+ * Copyright (C) 2014 - 2016 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="TRM_CONCEPT")
+public class TermConceptParentChildLink implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	@Id()
+	@SequenceGenerator(name="SEQ_CONCEPT_PC_PID", sequenceName="SEQ_CONCEPT_PC_PID")
+	@GeneratedValue()
+	@Column(name="PID")
+	private Long myPid;
+
+	@ManyToOne
+	@JoinColumn(name="PARENT_PID", nullable=false)
+	private TermConcept myParent;
+	
+	@ManyToOne
+	@JoinColumn(name="CHILD_PID", nullable=false)
+	private TermConcept myChild;
+
+	@ManyToOne
+	@JoinColumn(name="CODESYSTEM_PID", nullable=false)
+	private TermCodeSystem myCodeSystem;
+	
+}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ITerminologySvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ITerminologySvc.java
new file mode 100644
index 00000000000..26d7bfccd24
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/ITerminologySvc.java
@@ -0,0 +1,5 @@
+package ca.uhn.fhir.jpa.term;
+
+public interface ITerminologySvc {
+
+}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologySvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologySvcImpl.java
new file mode 100644
index 00000000000..ffd0dc7652f
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologySvcImpl.java
@@ -0,0 +1,7 @@
+package ca.uhn.fhir.jpa.term;
+
+public class TerminologySvcImpl implements ITerminologySvc {
+
+	
+	
+}
diff --git a/pom.xml b/pom.xml
index 847c6b7df7b..ec807d63b4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,7 +404,7 @@
 			<dependency>
 				<groupId>org.apache.maven.doxia</groupId>
 				<artifactId>doxia-module-markdown</artifactId>
-				<version>1.7</version>
+				<version>1.6</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.scm</groupId>
@@ -1263,7 +1263,7 @@
 					<dependency>
 						<groupId>org.apache.maven.doxia</groupId>
 						<artifactId>doxia-module-markdown</artifactId>
-						<version>1.7</version>
+						<version>1.6</version>
 					</dependency>
 					<dependency>
 						<groupId>lt.velykis.maven.skins</groupId>
@@ -1369,6 +1369,9 @@
 	<profiles>
 		<profile>
 			<id>DIST</id>
+			<modules>
+				<module>hapi-fhir-osgi-core</module>
+			</modules>
 		</profile>
 		<profile>
 			<id>ROOT</id>
@@ -1474,7 +1477,6 @@
 				<module>hapi-fhir-cli</module>
 				<module>hapi-fhir-dist</module>
 				<module>examples</module>
-				<module>hapi-fhir-osgi-core</module>
 				<module>hapi-fhir-base-example-embedded-ws</module>
 			</modules>
 		</profile>