Lots of bugfixes, and narrative generator is started

hapi-fhir-base/.classpath

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/site/example/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/site/example/java"/>
 	<classpathentry kind="var" path="M2_REPO/javax/json/javax.json-api/1.0/javax.json-api-1.0.jar" sourcepath="M2_REPO/javax/json/javax.json-api/1.0/javax.json-api-1.0-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar" sourcepath="M2_REPO/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-sources.jar">
 		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-javadoc.jar!/"/>
+			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
@@ -29,6 +29,7 @@
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1-javadoc.jar!/"/>
@@ -36,6 +37,11 @@
 	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/"/>
@@ -43,6 +49,7 @@
 	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.16.1-GA/javassist-3.16.1-GA.jar" sourcepath="M2_REPO/org/javassist/javassist/3.16.1-GA/javassist-3.16.1-GA-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar" sourcepath="M2_REPO/org/glassfish/javax.json/1.0.4/javax.json-1.0.4-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/9.1.1.v20140108/jetty-continuation-9.1.1.v20140108.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-continuation/9.1.1.v20140108/jetty-continuation-9.1.1.v20140108-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.1.1.v20140108/jetty-http-9.1.1.v20140108.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.1.1.v20140108/jetty-http-9.1.1.v20140108-sources.jar"/>
@@ -76,12 +83,14 @@
 	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/directory-naming/naming-core/0.8/naming-core-0.8.jar"/>
 	<classpathentry kind="var" path="M2_REPO/directory-naming/naming-java/0.8/naming-java-0.8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ognl/ognl/3.0.6/ognl-3.0.6.jar" sourcepath="M2_REPO/ognl/ognl/3.0.6/ognl-3.0.6-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/thymeleaf/thymeleaf/2.1.2.RELEASE/thymeleaf-2.1.2.RELEASE.jar" sourcepath="M2_REPO/org/thymeleaf/thymeleaf/2.1.2.RELEASE/thymeleaf-2.1.2.RELEASE-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/"/>
@@ -92,6 +101,6 @@
 			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/xmlunit/xmlunit/1.5/xmlunit-1.5-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

hapi-fhir-base/build.xml

@@ -0,0 +1,110 @@
+<project name="MyProject" basedir=".">
+	<target name="urchin">
+        <echo>Adding Google analytics in target/site for &lt;body&gt;</echo>
+        <replace dir="target/site" summary="true">
+            <include name="**/*.html"></include>
+            <replacefilter token="#build#" value="${label}"/>
+            <replacefilter token="#version#" value="${version}"/>
+            <replacetoken><![CDATA[</body>]]></replacetoken>
+            <replacevalue><![CDATA[
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('send', 'pageview');
+
+</script>
+                </body >
+                ]]></replacevalue>
+        </replace>
+			<echo>Adding Google analytics in target/site for &lt;BODY&gt;</echo>
+        <replace dir="target/site" summary="true">
+            <include name="**/*.html"></include>
+            <replacetoken><![CDATA[</BODY>]]></replacetoken>
+            <replacevalue><![CDATA[
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('send', 'pageview');
+
+</script>
+                </BODY >
+                ]]></replacevalue>
+        </replace>
+      <echo>Adding Google analytics in target/site for &lt;FRAMESET&gt;</echo>
+        <replace dir="target/site" summary="true">
+            <include name="**/*.html"></include>
+            <replacetoken><![CDATA[</HEAD>
+<FRAMESET]]></replacetoken>
+            <replacevalue><![CDATA[
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('send', 'pageview');
+
+</script>
+                </HEAD >
+                <FRAMESET]]></replacevalue>
+        </replace>
+      <echo>Adding Google analytics in target/site for &lt;frameset&gt;</echo>
+        <replace dir="target/site" summary="true">
+            <include name="**/*.html"></include>
+            <replacetoken><![CDATA[</head>
+    <frameset]]></replacetoken>
+            <replacevalue><![CDATA[
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('send', 'pageview');
+
+</script>
+                </head >
+    <frameset]]></replacevalue>
+        </replace>        
+      <echo>Adding social plugins for HAPI</echo>
+		  <replace dir="target/site/" summary="true">
+            <include name="**/*.html"></include>
+            <replacetoken><![CDATA[SOCIALPLUGINSHEREFHIR]]></replacetoken>
+            <replacevalue><![CDATA[
+            	<table cellpadding="0" cellspacing="0" border="0"><tr>
+            	<td><div class="g-plusone" data-annotation="inline" data-width="300" data-href="http://hl7api.sourceforge.net/"></div></td>
+            	<td><div class="fb-like" data-href="http://hl7api.sourceforge.net/" data-send="false" data-layout="button_count" data-width="450" data-show-faces="true"></div></td>
+            	</tr></table>
+
+            	</p><p>
+            	<!-- Place this tag after the last +1 button tag. -->
+            	<script type="text/javascript">
+            	  (function() {
+            	    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+            	    po.src = 'https://apis.google.com/js/plusone.js';
+            	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+            	  })();
+            	</script>
+            	<div id="fb-root"></div>
+            	<script>(function(d, s, id) {
+            	  var js, fjs = d.getElementsByTagName(s)[0];
+            	  if (d.getElementById(id)) return;
+            	  js = d.createElement(s); js.id = id;
+            	  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+            	  fjs.parentNode.insertBefore(js, fjs);
+            	}(document, 'script', 'facebook-jssdk'));</script>
+				]]></replacevalue>
+     </replace>
+ 
+    </target>
+</project>

hapi-fhir-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"
+<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">
-	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>
@@ -12,19 +11,21 @@
 	<groupId>ca.uhn.hapi.fhir</groupId>
 	<artifactId>hapi-fhir-base</artifactId>
 	<packaging>jar</packaging>
+	<url>http://hl7api.sourceforge.net/hapi-fhir/</url>
 
 	<name>HAPI FHIR Base Library</name>
 
+	<distributionManagement>
+		<site>
+			<id>hl7api.sf.net</id>
+			<url>scp://shell.sourceforge.net/home/project-web/hl7api/htdocs/hapi-fhir</url>
+		</site>
+	</distributionManagement>
+
 	<dependencies>
 
 		<!-- JSON -->
-		<!-- 
+		<!-- <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.2.4</version> </dependency> -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.2.4</version>
-		</dependency>
-		 -->
 		<dependency>
 			<groupId>javax.json</groupId>
 			<artifactId>javax.json-api</artifactId>
@@ -43,8 +44,14 @@
 			<version>4.2.0</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> 
+		<!-- <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> <version>3.1.3</version> </dependency> -->
-			<version>3.1.3</version> </dependency> -->
+
+<dependency>
+    <groupId>org.thymeleaf</groupId>
+    <artifactId>thymeleaf</artifactId>
+    <version>2.1.2.RELEASE</version>
+	<optional>true</optional>
+</dependency>
 
 		<!-- General -->
 		<dependency>
@@ -183,8 +190,6 @@
 				<artifactId>maven-site-plugin</artifactId>
 				<version>3.3</version>
 			</plugin>
-			<!-- 
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
@@ -210,7 +215,6 @@
 				<artifactId>maven-jxr-plugin</artifactId>
 				<version>2.3</version>
 			</plugin>
-			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -235,6 +239,123 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<phase>post-site</phase>
+						<configuration>
+							<target>
+								<echo>Adding Google analytics in target/site for &lt;body&gt;</echo>
+								<replace dir="target/site" summary="true">
+									<include name="**/*.html"></include>
+									<replacefilter token="#build#" value="${label}" />
+									<replacefilter token="#version#" value="${version}" />
+									<replacetoken><![CDATA[</body>]]></replacetoken>
+									<replacevalue><![CDATA[
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('send', 'pageview');
+
+</script>
+                </body >
+                ]]></replacevalue>
+								</replace>
+								<echo>Adding Google analytics in target/site for &lt;BODY&gt;</echo>
+								<replace dir="target/site" summary="true">
+									<include name="**/*.html"></include>
+									<replacetoken><![CDATA[</BODY>]]></replacetoken>
+									<replacevalue><![CDATA[
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-1395874-5', 'sourceforge.net');
+  ga('send', 'pageview');
+
+</script>
+                </BODY >
+                ]]></replacevalue>
+								</replace>
+								<echo>Adding social plugins for HAPI</echo>
+								<replace dir="target/site/" summary="true">
+									<include name="**/*.html"></include>
+									<replacetoken><![CDATA[SOCIALPLUGINSHEREFHIR]]></replacetoken>
+									<replacevalue><![CDATA[
+            	<table cellpadding="0" cellspacing="0" border="0"><tr>
+            	<td><div class="g-plusone" data-annotation="inline" data-width="300" data-href="http://hl7api.sourceforge.net/"></div></td>
+            	<td><div class="fb-like" data-href="http://hl7api.sourceforge.net/" data-send="false" data-layout="button_count" data-width="450" data-show-faces="true"></div></td>
+            	</tr></table>
+
+            	</p><p>
+            	<!-- Place this tag after the last +1 button tag. -->
+            	<script type="text/javascript">
+            	  (function() {
+            	    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+            	    po.src = 'https://apis.google.com/js/plusone.js';
+            	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+            	  })();
+            	</script>
+            	<div id="fb-root"></div>
+            	<script>(function(d, s, id) {
+            	  var js, fjs = d.getElementsByTagName(s)[0];
+            	  if (d.getElementById(id)) return;
+            	  js = d.createElement(s); js.id = id;
+            	  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+            	  fjs.parentNode.insertBefore(js, fjs);
+            	}(document, 'script', 'facebook-jssdk'));</script>
+				]]></replacevalue>
+								</replace>
+
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<inherited>true</inherited>
+				<configuration>
+					<minmemory>128m</minmemory>
+					<maxmemory>1g</maxmemory>
+					<linksource>true</linksource>
+					<verbose>false</verbose>
+					<debug>false</debug>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java

@@ -10,26 +10,30 @@ import java.util.Map;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.dstu.resource.Patient;
+import ca.uhn.fhir.narrative.INarrativeGenerator;
 import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.parser.JsonParser;
 import ca.uhn.fhir.parser.XmlParser;
 import ca.uhn.fhir.rest.client.IRestfulClientFactory;
 import ca.uhn.fhir.rest.client.RestfulClientFactory;
+import ca.uhn.fhir.rest.client.api.IRestfulClient;
 
 public class FhirContext {
 
 	private volatile Map<Class<? extends IElement>, BaseRuntimeElementDefinition<?>> myClassToElementDefinition = Collections.emptyMap();
 	private volatile Map<String, RuntimeResourceDefinition> myIdToResourceDefinition = Collections.emptyMap();
 	private volatile Map<String, RuntimeResourceDefinition> myNameToElementDefinition = Collections.emptyMap();
+	private INarrativeGenerator myNarrativeGenerator;
+	private IRestfulClientFactory myRestfulClientFactory;
 	private volatile RuntimeChildUndeclaredExtensionDefinition myRuntimeChildUndeclaredExtensionDefinition;
 
+	public FhirContext() {
+	}
+
 	public FhirContext(Class<? extends IResource> theResourceType) {
 		this(toCollection(theResourceType));
 	}
 
-	public FhirContext() {
-	}
-	
 	public FhirContext(Class<?>... theResourceTypes) {
 		this(toCollection(theResourceTypes));
 	}
@@ -42,6 +46,10 @@ public class FhirContext {
 		return myClassToElementDefinition.get(theElementType);
 	}
 
+	public INarrativeGenerator getNarrativeGenerator() {
+		return myNarrativeGenerator;
+	}
+
 	public RuntimeResourceDefinition getResourceDefinition(Class<? extends IResource> theResourceType) {
 		RuntimeResourceDefinition retVal = (RuntimeResourceDefinition) myClassToElementDefinition.get(theResourceType);
 		if (retVal == null) {
@@ -81,6 +89,13 @@ public class FhirContext {
 		return myIdToResourceDefinition.values();
 	}
 
+	public IRestfulClientFactory getRestfulClientFactory() {
+		if (myRestfulClientFactory==null) {
+			myRestfulClientFactory = new RestfulClientFactory(this);
+		}
+		return myRestfulClientFactory;
+	}
+
 	public RuntimeChildUndeclaredExtensionDefinition getRuntimeChildUndeclaredExtensionDefinition() {
 		return myRuntimeChildUndeclaredExtensionDefinition;
 	}
@@ -89,14 +104,29 @@ public class FhirContext {
 		return new JsonParser(this);
 	}
 
-	public IRestfulClientFactory newRestfulClientFactory() {
+	/**
-		return new RestfulClientFactory(this);
+	 * Instantiates a new client instance
+	 * 
+	 * @param theClientType
+	 *            The client type, which is an interface type to be instantiated
+	 * @param theServerBase
+	 *            The URL of the base for the restful FHIR server to connect to
+	 * @return A newly created client
+	 * @throws ConfigurationException
+	 *             If the interface type is not an interface
+	 */
+	public <T extends IRestfulClient> T newRestfulClient(Class<T> theClientType, String theServerBase) {
+		return getRestfulClientFactory().newClient(theClientType, theServerBase);
 	}
 
 	public IParser newXmlParser() {
 		return new XmlParser(this);
 	}
 	
+	public void setNarrativeGenerator(INarrativeGenerator theNarrativeGenerator) {
+		myNarrativeGenerator = theNarrativeGenerator;
+	}
+	
 	private RuntimeResourceDefinition scanResourceType(Class<? extends IResource> theResourceType) {
 		ArrayList<Class<? extends IResource>> resourceTypes = new ArrayList<Class<? extends IResource>>();
 		resourceTypes.add(theResourceType);

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -36,6 +36,7 @@ import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.api.annotation.Extension;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.ContainedDt;
+import ca.uhn.fhir.model.dstu.composite.NarrativeDt;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
@@ -221,7 +222,7 @@ class ModelScanner {
 		RuntimeResourceBlockDefinition resourceDef = new RuntimeResourceBlockDefinition(resourceName, theClass);
 		myClassToElementDefinitions.put(theClass, resourceDef);
 
-		scanCompositeElementForChildren(theClass, resourceDef, null);
+		scanCompositeElementForChildren(theClass, resourceDef);
 	}
 
 	private String scanCodeTable(Class<? extends ICodeEnum> theCodeType, CodeTableDef theCodeTableDefinition) {
@@ -233,11 +234,11 @@ class ModelScanner {
 
 		RuntimeCompositeDatatypeDefinition resourceDef = new RuntimeCompositeDatatypeDefinition(theDatatypeDefinition, theClass);
 		myClassToElementDefinitions.put(theClass, resourceDef);
-		scanCompositeElementForChildren(theClass, resourceDef, null);
+		scanCompositeElementForChildren(theClass, resourceDef);
 	}
 
 	@SuppressWarnings("unchecked")
-	private void scanCompositeElementForChildren(Class<? extends ICompositeElement> theClass, BaseRuntimeElementCompositeDefinition<?> theDefinition, Integer theIdentifierOrder) {
+	private void scanCompositeElementForChildren(Class<? extends ICompositeElement> theClass, BaseRuntimeElementCompositeDefinition<?> theDefinition) {
 		Set<String> elementNames = new HashSet<String>();
 		TreeMap<Integer, BaseRuntimeDeclaredChildDefinition> orderToElementDef = new TreeMap<Integer, BaseRuntimeDeclaredChildDefinition>();
 		TreeMap<Integer, BaseRuntimeDeclaredChildDefinition> orderToExtensionDef = new TreeMap<Integer, BaseRuntimeDeclaredChildDefinition>();
@@ -302,7 +303,13 @@ class ModelScanner {
 			Description descriptionAnnotation = next.getAnnotation(Description.class);
 
 			String elementName = childAnnotation.name();
-			int order = childAnnotation.order() + baseElementOrder;
+			int order = childAnnotation.order();
+			if (order < 0 && order != Child.ORDER_UNKNOWN) {
+				throw new ConfigurationException("Invalid order '" + order +"' on @Child for field '" + next.getName()+ "' on target type: " + theClass);
+			}
+			if (order != Child.ORDER_UNKNOWN) {
+				order = order + baseElementOrder;
+			}
 			int min = childAnnotation.min();
 			int max = childAnnotation.max();
 			TreeMap<Integer, BaseRuntimeDeclaredChildDefinition> orderMap = theOrderToElementDef;
@@ -370,7 +377,7 @@ class ModelScanner {
 				List<Class<? extends IResource>> refTypesList = new ArrayList<Class<? extends IResource>>();
 				for (Class<? extends IElement> nextType : childAnnotation.type()) {
 					if (IResource.class.isAssignableFrom(nextType) == false) {
-						throw new ConfigurationException("Field '" + next.getName() + "' in class '" + next.getDeclaringClass().getSimpleName() + "' is of type " + ResourceReferenceDt.class + " but contains a non-resource type: " + nextType.getCanonicalName());
+						throw new ConfigurationException("Field '" + next.getName() + "' in class '" + next.getDeclaringClass().getCanonicalName() + "' is of type " + ResourceReferenceDt.class + " but contains a non-resource type: " + nextType.getCanonicalName());
 					}
 					refTypesList.add((Class<? extends IResource>) nextType);
 					addScanAlso(nextType);
@@ -410,6 +417,8 @@ class ModelScanner {
 					if (nextElementType.equals(BoundCodeableConceptDt.class)) {
 						IValueSetEnumBinder<Enum<?>> binder = getBoundCodeBinder(next);
 						def = new RuntimeChildCompositeBoundDatatypeDefinition(next, elementName, childAnnotation, descriptionAnnotation, nextDatatype, binder);
+					} else if (NarrativeDt.class.getSimpleName().equals(nextElementType.getSimpleName())) {
+						def = new RuntimeChildNarrativeDefinition(next, elementName, childAnnotation, descriptionAnnotation, nextDatatype);
 					} else {
 						def = new RuntimeChildCompositeDatatypeDefinition(next, elementName, childAnnotation, descriptionAnnotation, nextDatatype);
 					}
@@ -495,7 +504,7 @@ class ModelScanner {
 		myClassToElementDefinitions.put(theClass, resourceDef);
 		myNameToResourceDefinitions.put(resourceName, resourceDef);
 
-		scanCompositeElementForChildren(theClass, resourceDef, resourceDefinition.identifierOrder());
+		scanCompositeElementForChildren(theClass, resourceDef);
 
 		myIdToResourceDefinition.put(resourceId, resourceDef);
 		return resourceName;

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java

@@ -103,5 +103,9 @@ public class RuntimeChildChoiceDefinition extends BaseRuntimeDeclaredChildDefini
 		return myDatatypeToElementDefinition.get(theDatatype);
 	}
 
+	public Set<Class<? extends IElement>> getValidChildTypes() {
+		return Collections.unmodifiableSet((myDatatypeToElementDefinition.keySet()));
+	}
+
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java

@@ -0,0 +1,16 @@
+package ca.uhn.fhir.context;
+
+import java.lang.reflect.Field;
+
+import ca.uhn.fhir.model.api.IDatatype;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+
+public class RuntimeChildNarrativeDefinition extends RuntimeChildCompositeDatatypeDefinition {
+
+	public RuntimeChildNarrativeDefinition(Field theField, String theElementName, Child theChildAnnotation, Description theDescriptionAnnotation, Class<? extends IDatatype> theDatatype) {
+		super(theField, theElementName, theChildAnnotation,theDescriptionAnnotation, theDatatype);
+	}
+
+
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import ca.uhn.fhir.model.primitive.IdDt;
 
-public abstract class BaseElement implements IElement, ISupportsUndeclaredExtensions {
+public abstract class BaseElement implements IIdentifiableElement, ISupportsUndeclaredExtensions {
 
 	private IdDt myId;
 	private List<UndeclaredExtension> myUndeclaredExtensions;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseResourceReference.java

@@ -61,7 +61,12 @@ public abstract class BaseResourceReference extends BaseElement {
 		HttpClient httpClient = theClient.getHttpClient();
 		FhirContext context = theClient.getFhirContext();
 
-		HttpGet get = new HttpGet(getResourceUrl());
+		String resourceUrl = getResourceUrl();
+		if (!resourceUrl.startsWith("http")) {
+			resourceUrl = theClient.getServerBase() + resourceUrl;
+		}
+		
+		HttpGet get = new HttpGet(resourceUrl);
 		HttpResponse response = httpClient.execute(get);
 		try {
 			// TODO: choose appropriate parser based on response CT

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java

@@ -8,7 +8,7 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.util.ElementUtil;
 
-public class Bundle extends BaseBundle implements IElement {
+public class Bundle extends BaseBundle /*implements IElement*/ {
 	
 	//@formatter:off
 	/* ****************************************************

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.model.api;
 
 import java.util.List;
 
-public interface ICompositeElement extends IElement {
+public interface ICompositeElement extends IIdentifiableElement {
 
 	/**
 	 * Returns a list containing all child elements 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java

@@ -1,5 +1,5 @@
 package ca.uhn.fhir.model.api;
 
-public interface IDatatype extends IElement {
+public interface IDatatype extends IIdentifiableElement {
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java

@@ -1,14 +1,11 @@
 package ca.uhn.fhir.model.api;
 
-import ca.uhn.fhir.model.primitive.IdDt;
 
 
 public interface IElement {
 
 	boolean isEmpty();
 	
-	public void setId(IdDt theId);
 	
-	public IdDt getId();
 	
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java

@@ -0,0 +1,12 @@
+package ca.uhn.fhir.model.api;
+
+import ca.uhn.fhir.model.primitive.IdDt;
+
+public interface IIdentifiableElement extends IElement {
+
+	public void setId(IdDt theId);
+
+	public IdDt getId();
+	
+	
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java

@@ -24,7 +24,7 @@ public @interface Child {
 
 	String name();
 	
-	int order();
+	int order() default ORDER_UNKNOWN;
 
 	int min() default 0;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java

@@ -19,7 +19,6 @@ public @interface Extension {
 	 * this option for extension defintions that you have added locally (i.e.
 	 * within your own organization)
 	 * </p>
-	 * <p>
 	 * 
 	 * <p>
 	 * If set to <b><code>false</code></b>, the resource is taken to be a remote

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java

@@ -9,14 +9,13 @@ import java.lang.annotation.Target;
 @Target(value= {ElementType.TYPE})
 public @interface ResourceDef {
 
-	int ORDER_NOT_SPECIFIED = -1;
+	/**
-
+	 * The name of the resource (e.g. "Patient" or "DiagnosticReport")
+	 */
 	String name();
 
 	String id() default "";
 	
 	String profile() default "";
 	
-	int identifierOrder() default ORDER_NOT_SPECIFIED;
-	
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java

@@ -16,33 +16,18 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
+import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>Address</b> Datatype
@@ -164,7 +149,6 @@ public class AddressDt
 		myUse = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>use</b> (home | work | temp | old - purpose of this address)
 	 *
@@ -207,7 +191,6 @@ public class AddressDt
 		myText = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>text</b> (Text representation of the address)
 	 *
@@ -216,8 +199,9 @@ public class AddressDt
      * A full text representation of the address
      * </p> 
 	 */
-	public void setText( String theString) {
+	public AddressDt setText( String theString) {
 		myText = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -265,18 +249,36 @@ public class AddressDt
 	}
 
 	/**
-	 * Adds a new value for <b>line</b> (Street name, number, direction & P.O. Box etc)
+	 * Gets the first repetition for <b>line</b> (Street name, number, direction & P.O. Box etc),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information
      * </p> 
 	 */
-	public void addLine( String theString) {
+	public StringDt getLineFirstRep() {
+		if (getLine().isEmpty()) {
+			return addLine();
+		}
+		return getLine().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>line</b> (Street name, number, direction & P.O. Box etc)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * This component contains the house number, apartment number, street name, street direction, P.O. Box number, delivery hints, and similar address information
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public AddressDt addLine( String theString) {
 		if (myLine == null) {
 			myLine = new java.util.ArrayList<StringDt>();
 		}
 		myLine.add(new StringDt(theString));
+		return this; 
 	}
 
  
@@ -309,7 +311,6 @@ public class AddressDt
 		myCity = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>city</b> (Name of city, town etc.)
 	 *
@@ -318,8 +319,9 @@ public class AddressDt
      * The name of the city, town, village or other community or delivery center.
      * </p> 
 	 */
-	public void setCity( String theString) {
+	public AddressDt setCity( String theString) {
 		myCity = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -352,7 +354,6 @@ public class AddressDt
 		myState = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>state</b> (Sub-unit of country (abreviations ok))
 	 *
@@ -361,8 +362,9 @@ public class AddressDt
      * Sub-unit of a country with limited sovereignty in a federally organized country. A code may be used if codes are in common use (i.e. US 2 letter state codes).
      * </p> 
 	 */
-	public void setState( String theString) {
+	public AddressDt setState( String theString) {
 		myState = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -395,7 +397,6 @@ public class AddressDt
 		myZip = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>zip</b> (Postal code for area)
 	 *
@@ -404,8 +405,9 @@ public class AddressDt
      * A postal code designating a region defined by the postal service.
      * </p> 
 	 */
-	public void setZip( String theString) {
+	public AddressDt setZip( String theString) {
 		myZip = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -438,7 +440,6 @@ public class AddressDt
 		myCountry = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>country</b> (Country (can be ISO 3166 3 letter code))
 	 *
@@ -447,8 +448,9 @@ public class AddressDt
      * Country - a nation as commonly understood or generally accepted
      * </p> 
 	 */
-	public void setCountry( String theString) {
+	public AddressDt setCountry( String theString) {
 		myCountry = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -485,5 +487,4 @@ public class AddressDt
 
 
 
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java

@@ -16,30 +16,16 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
 import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
@@ -157,7 +143,6 @@ public class AttachmentDt
 		myContentType = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>contentType</b> (Mime type of the content, with charset etc.)
 	 *
@@ -166,8 +151,9 @@ public class AttachmentDt
      * Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate
      * </p> 
 	 */
-	public void setContentType( String theCode) {
+	public AttachmentDt setContentType( String theCode) {
 		myContentType = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -200,7 +186,6 @@ public class AttachmentDt
 		myLanguage = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>language</b> (Human language of the content (BCP-47))
 	 *
@@ -209,8 +194,9 @@ public class AttachmentDt
      * The human language of the content. The value can be any valid value according to BCP 47
      * </p> 
 	 */
-	public void setLanguage( String theCode) {
+	public AttachmentDt setLanguage( String theCode) {
 		myLanguage = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -243,7 +229,6 @@ public class AttachmentDt
 		myData = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>data</b> (Data inline, base64ed)
 	 *
@@ -252,8 +237,9 @@ public class AttachmentDt
      * The actual data of the attachment - a sequence of bytes. In XML, represented using base64
      * </p> 
 	 */
-	public void setData( byte[] theBytes) {
+	public AttachmentDt setData( byte[] theBytes) {
 		myData = new Base64BinaryDt(theBytes); 
+		return this; 
 	}
 
  
@@ -286,7 +272,6 @@ public class AttachmentDt
 		myUrl = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>url</b> (Uri where the data can be found)
 	 *
@@ -295,8 +280,9 @@ public class AttachmentDt
      * An alternative location where the data can be accessed
      * </p> 
 	 */
-	public void setUrl( String theUri) {
+	public AttachmentDt setUrl( String theUri) {
 		myUrl = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -329,7 +315,6 @@ public class AttachmentDt
 		mySize = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>size</b> (Number of bytes of content (if url provided))
 	 *
@@ -338,8 +323,9 @@ public class AttachmentDt
      * The number of bytes of data that make up this attachment.
      * </p> 
 	 */
-	public void setSize( Integer theInteger) {
+	public AttachmentDt setSize( Integer theInteger) {
 		mySize = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -372,7 +358,6 @@ public class AttachmentDt
 		myHash = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>hash</b> (Hash of the data (sha-1, base64ed ))
 	 *
@@ -381,8 +366,9 @@ public class AttachmentDt
      * The calculated hash of the data using SHA-1. Represented using base64
      * </p> 
 	 */
-	public void setHash( byte[] theBytes) {
+	public AttachmentDt setHash( byte[] theBytes) {
 		myHash = new Base64BinaryDt(theBytes); 
+		return this; 
 	}
 
  
@@ -415,7 +401,6 @@ public class AttachmentDt
 		myTitle = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>title</b> (Label to display in place of the data)
 	 *
@@ -424,8 +409,9 @@ public class AttachmentDt
      * A label or set of text to display in place of the data
      * </p> 
 	 */
-	public void setTitle( String theString) {
+	public AttachmentDt setTitle( String theString) {
 		myTitle = new StringDt(theString); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java

@@ -16,33 +16,15 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>CodeableConcept</b> Datatype
@@ -136,6 +118,21 @@ public class CodeableConceptDt
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>coding</b> (Code defined by a terminology system),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A reference to a code defined by a terminology system
+     * </p> 
+	 */
+	public CodingDt getCodingFirstRep() {
+		if (getCoding().isEmpty()) {
+			return addCoding();
+		}
+		return getCoding().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>text</b> (Plain text representation of the concept).
@@ -166,7 +163,6 @@ public class CodeableConceptDt
 		myText = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>text</b> (Plain text representation of the concept)
 	 *
@@ -175,8 +171,9 @@ public class CodeableConceptDt
      * A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user
      * </p> 
 	 */
-	public void setText( String theString) {
+	public CodeableConceptDt setText( String theString) {
 		myText = new StringDt(theString); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java

@@ -16,31 +16,17 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.IQueryParameterType;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
 import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 
@@ -166,7 +152,6 @@ public class CodingDt
 		mySystem = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>system</b> (Identity of the terminology system)
 	 *
@@ -175,8 +160,9 @@ public class CodingDt
      * The identification of the code system that defines the meaning of the symbol in the code.
      * </p> 
 	 */
-	public void setSystem( String theUri) {
+	public CodingDt setSystem( String theUri) {
 		mySystem = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -209,7 +195,6 @@ public class CodingDt
 		myVersion = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>version</b> (Version of the system - if relevant)
 	 *
@@ -218,8 +203,9 @@ public class CodingDt
      * The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and When the meaning is not guaranteed to be consistent, the version SHOULD be exchanged
      * </p> 
 	 */
-	public void setVersion( String theString) {
+	public CodingDt setVersion( String theString) {
 		myVersion = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -252,7 +238,6 @@ public class CodingDt
 		myCode = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>code</b> (Symbol in syntax defined by the system)
 	 *
@@ -261,8 +246,9 @@ public class CodingDt
      * A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)
      * </p> 
 	 */
-	public void setCode( String theCode) {
+	public CodingDt setCode( String theCode) {
 		myCode = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -295,7 +281,6 @@ public class CodingDt
 		myDisplay = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>display</b> (Representation defined by the system)
 	 *
@@ -304,8 +289,9 @@ public class CodingDt
      * A representation of the meaning of the code in the system, following the rules of the system.
      * </p> 
 	 */
-	public void setDisplay( String theString) {
+	public CodingDt setDisplay( String theString) {
 		myDisplay = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -338,7 +324,6 @@ public class CodingDt
 		myPrimary = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>primary</b> (If this code was chosen directly by the user)
 	 *
@@ -347,8 +332,9 @@ public class CodingDt
      * Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays)
      * </p> 
 	 */
-	public void setPrimary( Boolean theBoolean) {
+	public CodingDt setPrimary( Boolean theBoolean) {
 		myPrimary = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -383,7 +369,6 @@ public class CodingDt
 
   
 
-
 	/**
 	 * Returns true if <code>this</code> Coding has the same {@link CodingDt#getCode() Code}
 	 * and {@link CodingDt#getSystem() system} (as compared by simple equals comparison).

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java

@@ -16,33 +16,19 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
 import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>Contact</b> Datatype
@@ -136,7 +122,6 @@ public class ContactDt
 		mySystem = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>system</b> (phone | fax | email | url)
 	 *
@@ -179,7 +164,6 @@ public class ContactDt
 		myValue = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>value</b> (The actual contact details)
 	 *
@@ -188,8 +172,9 @@ public class ContactDt
      * The actual contact details, in a form that is meaningful to the designated communication system (i.e. phone number or email address).
      * </p> 
 	 */
-	public void setValue( String theString) {
+	public ContactDt setValue( String theString) {
 		myValue = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -222,7 +207,6 @@ public class ContactDt
 		myUse = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>use</b> (home | work | temp | old | mobile - purpose of this address)
 	 *
@@ -269,5 +253,4 @@ public class ContactDt
 
 
 
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContainedDt.java

@@ -3,14 +3,14 @@ package ca.uhn.fhir.model.dstu.composite;
 import java.util.ArrayList;
 import java.util.List;
 
-import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.primitive.IdDt;
 
 @DatatypeDef(name = "duration")
-public class ContainedDt implements IElement {
+public class ContainedDt implements IDatatype {
 
 	@Child(name = "resource", type = IResource.class, order = 0, min = 0, max = Child.MAX_UNLIMITED)
 	private List<IResource> myContainedResources;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java

@@ -16,33 +16,19 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
+import ca.uhn.fhir.util.DatatypeUtil;
 
 /**
  * HAPI/FHIR <b>HumanName</b> Datatype
@@ -157,7 +143,6 @@ public class HumanNameDt
 		myUse = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>use</b> (usual | official | temp | nickname | anonymous | old | maiden)
 	 *
@@ -200,7 +185,6 @@ public class HumanNameDt
 		myText = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>text</b> (Text representation of the full name)
 	 *
@@ -209,8 +193,9 @@ public class HumanNameDt
      * A full text representation of the name
      * </p> 
 	 */
-	public void setText( String theString) {
+	public HumanNameDt setText( String theString) {
 		myText = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -258,18 +243,36 @@ public class HumanNameDt
 	}
 
 	/**
-	 * Adds a new value for <b>family</b> (Family name (often called 'Surname'))
+	 * Gets the first repetition for <b>family</b> (Family name (often called 'Surname')),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father.
      * </p> 
 	 */
-	public void addFamily( String theString) {
+	public StringDt getFamilyFirstRep() {
+		if (getFamily().isEmpty()) {
+			return addFamily();
+		}
+		return getFamily().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>family</b> (Family name (often called 'Surname'))
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The part of a name that links to the genealogy. In some cultures (e.g. Eritrea) the family name of a son is the first name of his father.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public HumanNameDt addFamily( String theString) {
 		if (myFamily == null) {
 			myFamily = new java.util.ArrayList<StringDt>();
 		}
 		myFamily.add(new StringDt(theString));
+		return this; 
 	}
 
  
@@ -317,18 +320,36 @@ public class HumanNameDt
 	}
 
 	/**
-	 * Adds a new value for <b>given</b> (Given names (not always 'first'). Includes middle names)
+	 * Gets the first repetition for <b>given</b> (Given names (not always 'first'). Includes middle names),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * Given name
      * </p> 
 	 */
-	public void addGiven( String theString) {
+	public StringDt getGivenFirstRep() {
+		if (getGiven().isEmpty()) {
+			return addGiven();
+		}
+		return getGiven().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>given</b> (Given names (not always 'first'). Includes middle names)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Given name
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public HumanNameDt addGiven( String theString) {
 		if (myGiven == null) {
 			myGiven = new java.util.ArrayList<StringDt>();
 		}
 		myGiven.add(new StringDt(theString));
+		return this; 
 	}
 
  
@@ -376,18 +397,36 @@ public class HumanNameDt
 	}
 
 	/**
-	 * Adds a new value for <b>prefix</b> (Parts that come before the name)
+	 * Gets the first repetition for <b>prefix</b> (Parts that come before the name),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name
      * </p> 
 	 */
-	public void addPrefix( String theString) {
+	public StringDt getPrefixFirstRep() {
+		if (getPrefix().isEmpty()) {
+			return addPrefix();
+		}
+		return getPrefix().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>prefix</b> (Parts that come before the name)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the start of the name
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public HumanNameDt addPrefix( String theString) {
 		if (myPrefix == null) {
 			myPrefix = new java.util.ArrayList<StringDt>();
 		}
 		myPrefix.add(new StringDt(theString));
+		return this; 
 	}
 
  
@@ -435,18 +474,36 @@ public class HumanNameDt
 	}
 
 	/**
-	 * Adds a new value for <b>suffix</b> (Parts that come after the name)
+	 * Gets the first repetition for <b>suffix</b> (Parts that come after the name),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name
      * </p> 
 	 */
-	public void addSuffix( String theString) {
+	public StringDt getSuffixFirstRep() {
+		if (getSuffix().isEmpty()) {
+			return addSuffix();
+		}
+		return getSuffix().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>suffix</b> (Parts that come after the name)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Part of the name that is acquired as a title due to academic, legal, employment or nobility status, etc. and that appears at the end of the name
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public HumanNameDt addSuffix( String theString) {
 		if (mySuffix == null) {
 			mySuffix = new java.util.ArrayList<StringDt>();
 		}
 		mySuffix.add(new StringDt(theString));
+		return this; 
 	}
 
  
@@ -481,7 +538,41 @@ public class HumanNameDt
 
   
 
+	/**
+	 * Returns all repetitions of {@link #getFamily() family name} as a space separated string
+	 * 
+	 * @see DatatypeUtil#joinStringsSpaceSeparated(List)
+	 */
+	public String getFamilyAsSingleString() {
+		return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getFamily());
+	}
 
+	/**
+	 * Returns all repetitions of {@link #getGiven() given name} as a space separated string
+	 * 
+	 * @see DatatypeUtil#joinStringsSpaceSeparated(List)
+	 */
+	public String getGivenAsSingleString() {
+		return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getGiven());
+	}
+
+	/**
+	 * Returns all repetitions of {@link #getPrefix() prefix name} as a space separated string
+	 * 
+	 * @see DatatypeUtil#joinStringsSpaceSeparated(List)
+	 */
+	public String getPrefixAsSingleString() {
+		return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getPrefix());
+	}
+
+	/**
+	 * Returns all repetitions of {@link #Suffix() suffix} as a space separated string
+	 * 
+	 * @see DatatypeUtil#joinStringsSpaceSeparated(List)
+	 */
+	public String getSuffixAsSingleString() {
+		return ca.uhn.fhir.util.DatatypeUtil.joinStringsSpaceSeparated(getSuffix());
+	}
 
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java

@@ -16,31 +16,18 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.IQueryParameterType;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 
@@ -166,7 +153,6 @@ public class IdentifierDt
 		myUse = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>use</b> (usual | official | temp | secondary (If known))
 	 *
@@ -209,7 +195,6 @@ public class IdentifierDt
 		myLabel = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>label</b> (Description of identifier)
 	 *
@@ -218,8 +203,9 @@ public class IdentifierDt
      * A text string for the identifier that can be displayed to a human so they can recognize the identifier
      * </p> 
 	 */
-	public void setLabel( String theString) {
+	public IdentifierDt setLabel( String theString) {
 		myLabel = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -252,7 +238,6 @@ public class IdentifierDt
 		mySystem = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>system</b> (The namespace for the identifier)
 	 *
@@ -261,8 +246,9 @@ public class IdentifierDt
      * Establishes the namespace in which set of possible id values is unique.
      * </p> 
 	 */
-	public void setSystem( String theUri) {
+	public IdentifierDt setSystem( String theUri) {
 		mySystem = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -295,7 +281,6 @@ public class IdentifierDt
 		myValue = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>value</b> (The value that is unique)
 	 *
@@ -304,8 +289,9 @@ public class IdentifierDt
      * The portion of the identifier typically displayed to the user and which is unique within the context of the system.
      * </p> 
 	 */
-	public void setValue( String theString) {
+	public IdentifierDt setValue( String theString) {
 		myValue = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -339,7 +325,6 @@ public class IdentifierDt
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>assigner</b> (Organization that issued id (may be just text)).
 	 * creating it if it does
@@ -371,7 +356,6 @@ public class IdentifierDt
 
   
 
-
 	/**
 	 * Returns true if <code>this</code> identifier has the same {@link IdentifierDt#getValue() value}
 	 * and {@link IdentifierDt#getSystem() system} (as compared by simple equals comparison).

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/NarrativeDt.java

@@ -51,6 +51,15 @@ public class NarrativeDt extends BaseElement implements ICompositeDatatype {
 	@Child(name="div", type=XhtmlDt.class, order=1, min=1, max=1)	
 	private XhtmlDt myDiv;
 	
+	public NarrativeDt() {
+		// nothing
+	}
+	
+	public NarrativeDt(XhtmlDt theDiv, NarrativeStatusEnum theStatus) {
+		setDiv(theDiv);
+		setStatus(theStatus);
+	}
+
 	@Override
 	public boolean isEmpty() {
 		return ca.uhn.fhir.util.ElementUtil.isEmpty(  myStatus, myDiv );

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java

@@ -16,33 +16,17 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>Period</b> Datatype
@@ -122,7 +106,6 @@ public class PeriodDt
 		myStart = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>start</b> (Starting time with inclusive boundary)
 	 *
@@ -131,8 +114,9 @@ public class PeriodDt
      * The start of the period. The boundary is inclusive.
      * </p> 
 	 */
-	public void setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public PeriodDt setStart( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myStart = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -143,8 +127,9 @@ public class PeriodDt
      * The start of the period. The boundary is inclusive.
      * </p> 
 	 */
-	public void setStartWithSecondsPrecision( Date theDate) {
+	public PeriodDt setStartWithSecondsPrecision( Date theDate) {
 		myStart = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -177,7 +162,6 @@ public class PeriodDt
 		myEnd = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>end</b> (End time with inclusive boundary, if not ongoing)
 	 *
@@ -186,8 +170,9 @@ public class PeriodDt
      * The end of the period. If the end of the period is missing, it means that the period is ongoing
      * </p> 
 	 */
-	public void setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public PeriodDt setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myEnd = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -198,8 +183,9 @@ public class PeriodDt
      * The end of the period. If the end of the period is missing, it means that the period is ongoing
      * </p> 
 	 */
-	public void setEndWithSecondsPrecision( Date theDate) {
+	public PeriodDt setEndWithSecondsPrecision( Date theDate) {
 		myEnd = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java

@@ -16,31 +16,18 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
 import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 
@@ -143,7 +130,6 @@ public class QuantityDt
 		myValue = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>value</b> (Numerical value (with implicit precision))
 	 *
@@ -152,8 +138,9 @@ public class QuantityDt
      * The value of the measured amount. The value includes an implicit precision in the presentation of the value
      * </p> 
 	 */
-	public void setValue( long theValue) {
+	public QuantityDt setValue( long theValue) {
 		myValue = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -164,8 +151,9 @@ public class QuantityDt
      * The value of the measured amount. The value includes an implicit precision in the presentation of the value
      * </p> 
 	 */
-	public void setValue( double theValue) {
+	public QuantityDt setValue( double theValue) {
 		myValue = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -176,8 +164,9 @@ public class QuantityDt
      * The value of the measured amount. The value includes an implicit precision in the presentation of the value
      * </p> 
 	 */
-	public void setValue( java.math.BigDecimal theValue) {
+	public QuantityDt setValue( java.math.BigDecimal theValue) {
 		myValue = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -210,7 +199,6 @@ public class QuantityDt
 		myComparator = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>comparator</b> (< | <= | >= | > - how to understand the value)
 	 *
@@ -253,7 +241,6 @@ public class QuantityDt
 		myUnits = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>units</b> (Unit representation)
 	 *
@@ -262,8 +249,9 @@ public class QuantityDt
      * A human-readable form of the units
      * </p> 
 	 */
-	public void setUnits( String theString) {
+	public QuantityDt setUnits( String theString) {
 		myUnits = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -296,7 +284,6 @@ public class QuantityDt
 		mySystem = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>system</b> (System that defines coded unit form)
 	 *
@@ -305,8 +292,9 @@ public class QuantityDt
      * The identification of the system that provides the coded form of the unit
      * </p> 
 	 */
-	public void setSystem( String theUri) {
+	public QuantityDt setSystem( String theUri) {
 		mySystem = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -339,7 +327,6 @@ public class QuantityDt
 		myCode = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>code</b> (Coded form of the unit)
 	 *
@@ -348,8 +335,9 @@ public class QuantityDt
      * A computer processable form of the units in some unit representation system
      * </p> 
 	 */
-	public void setCode( String theCode) {
+	public QuantityDt setCode( String theCode) {
 		myCode = new CodeDt(theCode); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java

@@ -16,33 +16,14 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>Range</b> Datatype
@@ -123,7 +104,6 @@ public class RangeDt
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>high</b> (High limit).
 	 * creating it if it does
@@ -157,5 +137,4 @@ public class RangeDt
 
 
 
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java

@@ -16,33 +16,14 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>Ratio</b> Datatype
@@ -123,7 +104,6 @@ public class RatioDt
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>denominator</b> (Denominator value).
 	 * creating it if it does
@@ -157,5 +137,4 @@ public class RatioDt
 
 
 
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java

@@ -16,33 +16,15 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseResourceReference;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>ResourceReference</b> Datatype
@@ -122,7 +104,6 @@ public class ResourceReferenceDt
 		myReference = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>reference</b> (Relative, internal or absolute URL reference)
 	 *
@@ -131,8 +112,9 @@ public class ResourceReferenceDt
      * A reference to a location at which the other resource is found. The reference may a relative reference, in which case it is relative to the service base URL, or an absolute URL that resolves to the location where the resource is found. The reference may be version specific or not. If the reference is not to a FHIR RESTful server, then it should be assumed to be version specific. Internal fragment references (start with '#') refer to contained resources
      * </p> 
 	 */
-	public void setReference( String theString) {
+	public ResourceReferenceDt setReference( String theString) {
 		myReference = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -165,7 +147,6 @@ public class ResourceReferenceDt
 		myDisplay = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>display</b> (Text alternative for the resource)
 	 *
@@ -174,8 +155,9 @@ public class ResourceReferenceDt
      * Plain text narrative that identifies the resource in addition to the resource reference
      * </p> 
 	 */
-	public void setDisplay( String theString) {
+	public ResourceReferenceDt setDisplay( String theString) {
 		myDisplay = new StringDt(theString); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java

@@ -16,33 +16,17 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
 import ca.uhn.fhir.model.primitive.DecimalDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>SampledData</b> Datatype
@@ -158,7 +142,6 @@ public class SampledDataDt
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>period</b> (Number of milliseconds between samples).
 	 * creating it if it does
@@ -188,7 +171,6 @@ public class SampledDataDt
 		myPeriod = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>period</b> (Number of milliseconds between samples)
 	 *
@@ -197,8 +179,9 @@ public class SampledDataDt
      * The length of time between sampling times, measured in milliseconds
      * </p> 
 	 */
-	public void setPeriod( long theValue) {
+	public SampledDataDt setPeriod( long theValue) {
 		myPeriod = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -209,8 +192,9 @@ public class SampledDataDt
      * The length of time between sampling times, measured in milliseconds
      * </p> 
 	 */
-	public void setPeriod( double theValue) {
+	public SampledDataDt setPeriod( double theValue) {
 		myPeriod = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -221,8 +205,9 @@ public class SampledDataDt
      * The length of time between sampling times, measured in milliseconds
      * </p> 
 	 */
-	public void setPeriod( java.math.BigDecimal theValue) {
+	public SampledDataDt setPeriod( java.math.BigDecimal theValue) {
 		myPeriod = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -255,7 +240,6 @@ public class SampledDataDt
 		myFactor = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>factor</b> (Multiply data by this before adding to origin)
 	 *
@@ -264,8 +248,9 @@ public class SampledDataDt
      * A correction factor that is applied to the sampled data points before they are added to the origin
      * </p> 
 	 */
-	public void setFactor( long theValue) {
+	public SampledDataDt setFactor( long theValue) {
 		myFactor = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -276,8 +261,9 @@ public class SampledDataDt
      * A correction factor that is applied to the sampled data points before they are added to the origin
      * </p> 
 	 */
-	public void setFactor( double theValue) {
+	public SampledDataDt setFactor( double theValue) {
 		myFactor = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -288,8 +274,9 @@ public class SampledDataDt
      * A correction factor that is applied to the sampled data points before they are added to the origin
      * </p> 
 	 */
-	public void setFactor( java.math.BigDecimal theValue) {
+	public SampledDataDt setFactor( java.math.BigDecimal theValue) {
 		myFactor = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -322,7 +309,6 @@ public class SampledDataDt
 		myLowerLimit = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>lowerLimit</b> (Lower limit of detection)
 	 *
@@ -331,8 +317,9 @@ public class SampledDataDt
      * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)
      * </p> 
 	 */
-	public void setLowerLimit( long theValue) {
+	public SampledDataDt setLowerLimit( long theValue) {
 		myLowerLimit = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -343,8 +330,9 @@ public class SampledDataDt
      * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)
      * </p> 
 	 */
-	public void setLowerLimit( double theValue) {
+	public SampledDataDt setLowerLimit( double theValue) {
 		myLowerLimit = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -355,8 +343,9 @@ public class SampledDataDt
      * The lower limit of detection of the measured points. This is needed if any of the data points have the value \"L\" (lower than detection limit)
      * </p> 
 	 */
-	public void setLowerLimit( java.math.BigDecimal theValue) {
+	public SampledDataDt setLowerLimit( java.math.BigDecimal theValue) {
 		myLowerLimit = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -389,7 +378,6 @@ public class SampledDataDt
 		myUpperLimit = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>upperLimit</b> (Upper limit of detection)
 	 *
@@ -398,8 +386,9 @@ public class SampledDataDt
      * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)
      * </p> 
 	 */
-	public void setUpperLimit( long theValue) {
+	public SampledDataDt setUpperLimit( long theValue) {
 		myUpperLimit = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -410,8 +399,9 @@ public class SampledDataDt
      * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)
      * </p> 
 	 */
-	public void setUpperLimit( double theValue) {
+	public SampledDataDt setUpperLimit( double theValue) {
 		myUpperLimit = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -422,8 +412,9 @@ public class SampledDataDt
      * The upper limit of detection of the measured points. This is needed if any of the data points have the value \"U\" (higher than detection limit)
      * </p> 
 	 */
-	public void setUpperLimit( java.math.BigDecimal theValue) {
+	public SampledDataDt setUpperLimit( java.math.BigDecimal theValue) {
 		myUpperLimit = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -456,7 +447,6 @@ public class SampledDataDt
 		myDimensions = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>dimensions</b> (Number of sample points at each time point)
 	 *
@@ -465,8 +455,9 @@ public class SampledDataDt
      * The number of sample points at each time point. If this value is greater than one, then the dimensions will be interlaced - all the sample points for a point in time will be recorded at once
      * </p> 
 	 */
-	public void setDimensions( Integer theInteger) {
+	public SampledDataDt setDimensions( Integer theInteger) {
 		myDimensions = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -499,7 +490,6 @@ public class SampledDataDt
 		myData = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>data</b> (Decimal values with spaces, or \"E\" | \"U\" | \"L\")
 	 *
@@ -508,8 +498,9 @@ public class SampledDataDt
      * A series of data points which are decimal values separated by a single space (character u20). The special values \"E\" (error), \"L\" (below detection limit) and \"U\" (above detection limit) can also be used in place of a decimal value
      * </p> 
 	 */
-	public void setData( String theString) {
+	public SampledDataDt setData( String theString) {
 		myData = new StringDt(theString); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java

@@ -16,33 +16,25 @@
 
 package ca.uhn.fhir.model.dstu.composite;
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.api.ICompositeDatatype;
-import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum;
+import ca.uhn.fhir.model.api.IResourceBlock;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import ca.uhn.fhir.model.api.annotation.Description;
 import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
-import ca.uhn.fhir.model.dstu.valueset.NameUseEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
 import ca.uhn.fhir.model.primitive.DecimalDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 /**
  * HAPI/FHIR <b>Schedule</b> Datatype
@@ -136,6 +128,21 @@ public class ScheduleDt
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>event</b> (When the event occurs),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies specific time periods when the event should occur
+     * </p> 
+	 */
+	public PeriodDt getEventFirstRep() {
+		if (getEvent().isEmpty()) {
+			return addEvent();
+		}
+		return getEvent().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>repeat</b> (Only if there is none or one event).
@@ -167,7 +174,6 @@ public class ScheduleDt
 	}
 
   
-  
 	/**
 	 * Block class for child element: <b>Schedule.repeat</b> (Only if there is none or one event)
 	 *
@@ -266,7 +272,6 @@ public class ScheduleDt
 		myFrequency = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>frequency</b> (Event occurs frequency times per duration)
 	 *
@@ -275,8 +280,9 @@ public class ScheduleDt
      * Indicates how often the event should occur.
      * </p> 
 	 */
-	public void setFrequency( Integer theInteger) {
+	public Repeat setFrequency( Integer theInteger) {
 		myFrequency = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -309,7 +315,6 @@ public class ScheduleDt
 		myWhen = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>when</b> (HS | WAKE | AC | ACM | ACD | ACV | PC | PCM | PCD | PCV - common life events)
 	 *
@@ -352,7 +357,6 @@ public class ScheduleDt
 		myDuration = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>duration</b> (Repeating or event-related duration)
 	 *
@@ -361,8 +365,9 @@ public class ScheduleDt
      * How long each repetition should last
      * </p> 
 	 */
-	public void setDuration( long theValue) {
+	public Repeat setDuration( long theValue) {
 		myDuration = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -373,8 +378,9 @@ public class ScheduleDt
      * How long each repetition should last
      * </p> 
 	 */
-	public void setDuration( double theValue) {
+	public Repeat setDuration( double theValue) {
 		myDuration = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -385,8 +391,9 @@ public class ScheduleDt
      * How long each repetition should last
      * </p> 
 	 */
-	public void setDuration( java.math.BigDecimal theValue) {
+	public Repeat setDuration( java.math.BigDecimal theValue) {
 		myDuration = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -419,7 +426,6 @@ public class ScheduleDt
 		myUnits = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>units</b> (s | min | h | d | wk | mo | a - unit of time (UCUM))
 	 *
@@ -462,7 +468,6 @@ public class ScheduleDt
 		myCount = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>count</b> (Number of times to repeat)
 	 *
@@ -471,8 +476,9 @@ public class ScheduleDt
      * A total count of the desired number of repetitions
      * </p> 
 	 */
-	public void setCount( Integer theInteger) {
+	public Repeat setCount( Integer theInteger) {
 		myCount = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -505,7 +511,6 @@ public class ScheduleDt
 		myEnd = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>end</b> (When to stop repeats)
 	 *
@@ -514,8 +519,9 @@ public class ScheduleDt
      * When to stop repeating the schedule
      * </p> 
 	 */
-	public void setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Repeat setEnd( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myEnd = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -526,8 +532,9 @@ public class ScheduleDt
      * When to stop repeating the schedule
      * </p> 
 	 */
-	public void setEndWithSecondsPrecision( Date theDate) {
+	public Repeat setEndWithSecondsPrecision( Date theDate) {
 		myEnd = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java

@@ -17,111 +17,21 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.primitive.BooleanDt;
+import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
+import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
+import ca.uhn.fhir.model.dstu.composite.ContactDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
 import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 
@@ -380,6 +290,21 @@ public class Device extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Instance id from manufacturer, owner and others),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifiers assigned to this device by various organizations. The most likely organizations to assign identifiers are the manufacturer and the owner, though regulatory agencies may also assign an identifier. The identifiers identify the particular device, not the kind of device
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>type</b> (What kind of device this is).
@@ -411,7 +336,6 @@ public class Device extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>manufacturer</b> (Name of device manufacturer).
 	 * creating it if it does
@@ -441,7 +365,6 @@ public class Device extends BaseResource implements IResource {
 		myManufacturer = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>manufacturer</b> (Name of device manufacturer)
 	 *
@@ -450,8 +373,9 @@ public class Device extends BaseResource implements IResource {
      * A name of the manufacturer
      * </p> 
 	 */
-	public void setManufacturer( String theString) {
+	public Device setManufacturer( String theString) {
 		myManufacturer = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -484,7 +408,6 @@ public class Device extends BaseResource implements IResource {
 		myModel = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>model</b> (Model id assigned by the manufacturer)
 	 *
@@ -493,8 +416,9 @@ public class Device extends BaseResource implements IResource {
      * The \"model\" - an identifier assigned by the manufacturer to identify the product by its type. This number is shared by the all devices sold as the same type
      * </p> 
 	 */
-	public void setModel( String theString) {
+	public Device setModel( String theString) {
 		myModel = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -527,7 +451,6 @@ public class Device extends BaseResource implements IResource {
 		myVersion = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>version</b> (Version number (i.e. software))
 	 *
@@ -536,8 +459,9 @@ public class Device extends BaseResource implements IResource {
      * The version of the device, if the device has multiple releases under the same model, or if the device is software or carries firmware
      * </p> 
 	 */
-	public void setVersion( String theString) {
+	public Device setVersion( String theString) {
 		myVersion = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -570,7 +494,6 @@ public class Device extends BaseResource implements IResource {
 		myExpiry = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>expiry</b> (Date of expiry of this device (if applicable))
 	 *
@@ -579,8 +502,9 @@ public class Device extends BaseResource implements IResource {
      * Date of expiry of this device (if applicable)
      * </p> 
 	 */
-	public void setExpiryWithDayPrecision( Date theDate) {
+	public Device setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myExpiry = new DateDt(theDate); 
+		myExpiry = new DateDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -591,8 +515,9 @@ public class Device extends BaseResource implements IResource {
      * Date of expiry of this device (if applicable)
      * </p> 
 	 */
-	public void setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Device setExpiryWithDayPrecision( Date theDate) {
-		myExpiry = new DateDt(theDate, thePrecision); 
+		myExpiry = new DateDt(theDate); 
+		return this; 
 	}
 
  
@@ -625,7 +550,6 @@ public class Device extends BaseResource implements IResource {
 		myUdi = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>udi</b> (FDA Mandated Unique Device Identifier)
 	 *
@@ -634,8 +558,9 @@ public class Device extends BaseResource implements IResource {
      * FDA Mandated Unique Device Identifier. Use the human readable information (the content that the user sees, which is sometimes different to the exact syntax represented in the barcode)  - see http://www.fda.gov/MedicalDevices/DeviceRegulationandGuidance/UniqueDeviceIdentification/default.htm
      * </p> 
 	 */
-	public void setUdi( String theString) {
+	public Device setUdi( String theString) {
 		myUdi = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -668,7 +593,6 @@ public class Device extends BaseResource implements IResource {
 		myLotNumber = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>lotNumber</b> (Lot number of manufacture)
 	 *
@@ -677,8 +601,9 @@ public class Device extends BaseResource implements IResource {
      * Lot number assigned by the manufacturer
      * </p> 
 	 */
-	public void setLotNumber( String theString) {
+	public Device setLotNumber( String theString) {
 		myLotNumber = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -712,7 +637,6 @@ public class Device extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>location</b> (Where the resource is found).
 	 * creating it if it does
@@ -743,7 +667,6 @@ public class Device extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>patient</b> (If the resource is affixed to a person).
 	 * creating it if it does
@@ -774,7 +697,6 @@ public class Device extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>contact</b> (Details for human/organization for support).
 	 * creating it if it does
@@ -818,6 +740,21 @@ public class Device extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>contact</b> (Details for human/organization for support),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contact details for an organization or a particular human that is responsible for the device
+     * </p> 
+	 */
+	public ContactDt getContactFirstRep() {
+		if (getContact().isEmpty()) {
+			return addContact();
+		}
+		return getContact().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>url</b> (Network address to contact device).
@@ -848,7 +785,6 @@ public class Device extends BaseResource implements IResource {
 		myUrl = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>url</b> (Network address to contact device)
 	 *
@@ -857,8 +793,9 @@ public class Device extends BaseResource implements IResource {
      * A network address on which the device may be contacted directly
      * </p> 
 	 */
-	public void setUrl( String theUri) {
+	public Device setUrl( String theUri) {
 		myUrl = new UriDt(theUri); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java

@@ -17,113 +17,28 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
+import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
 import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
 import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -428,7 +343,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>orderer</b> (Who ordered the test).
 	 * creating it if it does
@@ -459,7 +373,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>identifier</b> (Identifiers assigned to this order).
 	 * creating it if it does
@@ -503,6 +416,21 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Identifiers assigned to this order),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifiers assigned to this order by the order or by the receiver
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>encounter</b> (The encounter that this diagnostic order is associated with).
@@ -534,7 +462,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>clinicalNotes</b> (Explanation/Justification for test).
 	 * creating it if it does
@@ -564,7 +491,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		myClinicalNotes = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>clinicalNotes</b> (Explanation/Justification for test)
 	 *
@@ -573,8 +499,9 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * An explanation or justification for why this diagnostic investigation is being requested
      * </p> 
 	 */
-	public void setClinicalNotes( String theString) {
+	public DiagnosticOrder setClinicalNotes( String theString) {
 		myClinicalNotes = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -607,7 +534,19 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		mySpecimen = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>specimen</b> (If the whole order relates to specific specimens)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * One or more specimens that the diagnostic investigation is about
+     * </p> 
+	 */
+	public ResourceReferenceDt addSpecimen() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getSpecimen().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>status</b> (requested | received | accepted | in progress | review | completed | suspended | rejected | failed).
@@ -638,7 +577,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (requested | received | accepted | in progress | review | completed | suspended | rejected | failed)
 	 *
@@ -681,7 +619,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		myPriority = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>priority</b> (routine | urgent | stat | asap)
 	 *
@@ -738,6 +675,21 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>event</b> (A list of events of interest in the lifecycle),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A summary of the events of interest that have occurred as the request is processed. E.g. when the order was made, various processing steps (specimens received), when it was completed
+     * </p> 
+	 */
+	public Event getEventFirstRep() {
+		if (getEvent().isEmpty()) {
+			return addEvent();
+		}
+		return getEvent().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>item</b> (The items the orderer requested).
@@ -782,6 +734,21 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>item</b> (The items the orderer requested),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The specific diagnostic investigations that are requested as part of this request. Sometimes, there can only be one item per request, but in most contexts, more than one investigation can be requested
+     * </p> 
+	 */
+	public Item getItemFirstRep() {
+		if (getItem().isEmpty()) {
+			return addItem();
+		}
+		return getItem().get(0); 
+	}
   
 	/**
 	 * Block class for child element: <b>DiagnosticOrder.event</b> (A list of events of interest in the lifecycle)
@@ -870,7 +837,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (requested | received | accepted | in progress | review | completed | suspended | rejected | failed)
 	 *
@@ -914,7 +880,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>dateTime</b> (The date at which the event happened).
 	 * creating it if it does
@@ -944,7 +909,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		myDateTime = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>dateTime</b> (The date at which the event happened)
 	 *
@@ -953,8 +917,9 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * The date/time at which the event occurred
      * </p> 
 	 */
-	public void setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Event setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myDateTime = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -965,8 +930,9 @@ public class DiagnosticOrder extends BaseResource implements IResource {
      * The date/time at which the event occurred
      * </p> 
 	 */
-	public void setDateTimeWithSecondsPrecision( Date theDate) {
+	public Event setDateTimeWithSecondsPrecision( Date theDate) {
 		myDateTime = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -998,7 +964,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1096,7 +1061,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>specimen</b> (If this item relates to specific specimens).
 	 * creating it if it does
@@ -1126,7 +1090,19 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		mySpecimen = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>specimen</b> (If this item relates to specific specimens)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * If the item is related to a specific speciment
+     * </p> 
+	 */
+	public ResourceReferenceDt addSpecimen() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getSpecimen().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>bodySite</b> (Location of requested test (if applicable)).
@@ -1158,7 +1134,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>status</b> (requested | received | accepted | in progress | review | completed | suspended | rejected | failed).
 	 * creating it if it does
@@ -1188,7 +1163,6 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (requested | received | accepted | in progress | review | completed | suspended | rejected | failed)
 	 *
@@ -1245,6 +1219,21 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>event</b> (Events specific to this item),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A summary of the events of interest that have occurred as this item of the request is processed
+     * </p> 
+	 */
+	public Event getEventFirstRep() {
+		if (getEvent().isEmpty()) {
+			return addEvent();
+		}
+		return getEvent().get(0); 
+	}
   
 
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java

@@ -17,113 +17,30 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IDatatype;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.primitive.BooleanDt;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
+import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.composite.PeriodDt;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -296,10 +213,10 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private DateTimeDt myIssued;
 	
 	@Child(name="subject", order=3, min=1, max=1, type={
-		Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		Group.class,
+		ca.uhn.fhir.model.dstu.resource.Group.class,
-		Device.class,
+		ca.uhn.fhir.model.dstu.resource.Device.class,
-		Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class,
 	})
 	@Description(
 		shortDefinition="The subject of the report, usually, but not always, the patient",
@@ -308,8 +225,8 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="performer", order=4, min=1, max=1, type={
-		Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class,
 	})
 	@Description(
 		shortDefinition="Responsible Diagnostic Service",
@@ -325,7 +242,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private IdentifierDt myIdentifier;
 	
 	@Child(name="requestDetail", order=6, min=0, max=Child.MAX_UNLIMITED, type={
-		DiagnosticOrder.class,
+		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class,
 	})
 	@Description(
 		shortDefinition="What was requested",
@@ -351,7 +268,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private IDatatype myDiagnostic;
 	
 	@Child(name="specimen", order=9, min=0, max=Child.MAX_UNLIMITED, type={
-		Specimen.class,
+		ca.uhn.fhir.model.dstu.resource.Specimen.class,
 	})
 	@Description(
 		shortDefinition="Specimens this report is based on",
@@ -360,7 +277,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> mySpecimen;
 	
 	@Child(name="result", order=10, min=0, max=Child.MAX_UNLIMITED, type={
-		Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class,
 	})
 	@Description(
 		shortDefinition="Observations - simple, or complex nested groups",
@@ -369,7 +286,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myResult;
 	
 	@Child(name="imagingStudy", order=11, min=0, max=Child.MAX_UNLIMITED, type={
-		ImagingStudy.class,
+		ca.uhn.fhir.model.dstu.resource.ImagingStudy.class,
 	})
 	@Description(
 		shortDefinition="Reference to full details of imaging associated with the diagnostic report",
@@ -530,8 +447,9 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * The date and/or time that this version of the report was released from the source diagnostic service
      * </p> 
 	 */
-	public void setIssuedWithSecondsPrecision( Date theDate) {
+	public DiagnosticReport setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIssued = new DateTimeDt(theDate); 
+		myIssued = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -542,8 +460,9 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * The date and/or time that this version of the report was released from the source diagnostic service
      * </p> 
 	 */
-	public void setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public DiagnosticReport setIssuedWithSecondsPrecision( Date theDate) {
-		myIssued = new DateTimeDt(theDate, thePrecision); 
+		myIssued = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -903,6 +822,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>image</b> (Key images associated with this report),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A list of key images associated with this report. The images are generally created during the diagnostic process, and may be directly of the patient, or of treated specimens (i.e. slides of interest)
+     * </p> 
+	 */
+	public Image getImageFirstRep() {
+		if (getImage().isEmpty()) {
+			return addImage();
+		}
+		return getImage().get(0); 
+	}
+  
 	/**
 	 * Gets the value(s) for <b>conclusion</b> (Clinical Interpretation of test results).
 	 * creating it if it does
@@ -940,8 +875,9 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * Concise and clinically contextualized narrative interpretation of the diagnostic report
      * </p> 
 	 */
-	public void setConclusion( String theString) {
+	public DiagnosticReport setConclusion( String theString) {
 		myConclusion = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -988,6 +924,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>codedDiagnosis</b> (Codes for the conclusion),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public CodeableConceptDt getCodedDiagnosisFirstRep() {
+		if (getCodedDiagnosis().isEmpty()) {
+			return addCodedDiagnosis();
+		}
+		return getCodedDiagnosis().get(0); 
+	}
+  
 	/**
 	 * Gets the value(s) for <b>presentedForm</b> (Entire Report as issued).
 	 * creating it if it does
@@ -1031,6 +983,22 @@ public class DiagnosticReport extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>presentedForm</b> (Entire Report as issued),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Rich text representation of the entire result as issued by the diagnostic service. Multiple formats are allowed but they SHALL be semantically equivalent.
+     * </p> 
+	 */
+	public AttachmentDt getPresentedFormFirstRep() {
+		if (getPresentedForm().isEmpty()) {
+			return addPresentedForm();
+		}
+		return getPresentedForm().get(0); 
+	}
+  
 	/**
 	 * Block class for child element: <b>DiagnosticReport.image</b> (Key images associated with this report)
 	 *
@@ -1050,7 +1018,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private StringDt myComment;
 	
 	@Child(name="link", order=1, min=1, max=1, type={
-		Media.class,
+		ca.uhn.fhir.model.dstu.resource.Media.class,
 	})
 	@Description(
 		shortDefinition="Reference to the image source",
@@ -1111,8 +1079,9 @@ public class DiagnosticReport extends BaseResource implements IResource {
      * A comment about the image. Typically, this is used to provide an explanation for why the image is included, or to draw the viewer's attention to important features
      * </p> 
 	 */
-	public void setComment( String theString) {
+	public Image setComment( String theString) {
 		myComment = new StringDt(theString); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java

@@ -17,113 +17,32 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
+import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
+import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
+import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
+import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
 import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
 import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
 import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
 import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
 import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
 import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -406,6 +325,21 @@ public class Encounter extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Identifier(s) by which this encounter is known),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>status</b> (planned | in progress | onleave | finished | cancelled).
@@ -436,7 +370,6 @@ public class Encounter extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (planned | in progress | onleave | finished | cancelled)
 	 *
@@ -479,7 +412,6 @@ public class Encounter extends BaseResource implements IResource {
 		myClassElement = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>class</b> (inpatient | outpatient | ambulatory | emergency +)
 	 *
@@ -522,7 +454,6 @@ public class Encounter extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Add a value for <b>type</b> (Specific type of encounter)
 	 *
@@ -579,7 +510,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>participant</b> (List of participants involved in the encounter).
 	 * creating it if it does
@@ -623,6 +553,21 @@ public class Encounter extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>participant</b> (List of participants involved in the encounter),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The main practitioner responsible for providing the service
+     * </p> 
+	 */
+	public Participant getParticipantFirstRep() {
+		if (getParticipant().isEmpty()) {
+			return addParticipant();
+		}
+		return getParticipant().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>period</b> (The start and end time of the encounter).
@@ -654,7 +599,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>length</b> (Quantity of time the encounter lasted).
 	 * creating it if it does
@@ -685,7 +629,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>reason</b> (Reason the encounter takes place (code)).
 	 * creating it if it does
@@ -715,7 +658,6 @@ public class Encounter extends BaseResource implements IResource {
 		myReason = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>reason</b> (Reason the encounter takes place (code))
 	 *
@@ -759,7 +701,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>priority</b> (Indicates the urgency of the encounter).
 	 * creating it if it does
@@ -790,7 +731,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>hospitalization</b> (Details about an admission to a clinic).
 	 * creating it if it does
@@ -821,7 +761,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>location</b> (List of locations the patient has been at).
 	 * creating it if it does
@@ -865,6 +804,21 @@ public class Encounter extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>location</b> (List of locations the patient has been at),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * List of locations at which the patient has been
+     * </p> 
+	 */
+	public Location getLocationFirstRep() {
+		if (getLocation().isEmpty()) {
+			return addLocation();
+		}
+		return getLocation().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>serviceProvider</b> (Department or team providing care).
@@ -896,7 +850,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>partOf</b> (Another Encounter this encounter is part of).
 	 * creating it if it does
@@ -927,7 +880,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Block class for child element: <b>Encounter.participant</b> (List of participants involved in the encounter)
 	 *
@@ -1001,7 +953,6 @@ public class Encounter extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Add a value for <b>type</b> (Role of participant in encounter)
 	 *
@@ -1056,7 +1007,6 @@ public class Encounter extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1207,7 +1157,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>origin</b> (The location from which the patient came before admission).
 	 * creating it if it does
@@ -1238,7 +1187,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>admitSource</b> (From where patient was admitted (physician referral, transfer)).
 	 * creating it if it does
@@ -1268,7 +1216,6 @@ public class Encounter extends BaseResource implements IResource {
 		myAdmitSource = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>admitSource</b> (From where patient was admitted (physician referral, transfer))
 	 *
@@ -1312,7 +1259,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>accomodation</b> (Where the patient stays during this encounter).
 	 * creating it if it does
@@ -1356,6 +1302,21 @@ public class Encounter extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>accomodation</b> (Where the patient stays during this encounter),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public HospitalizationAccomodation getAccomodationFirstRep() {
+		if (getAccomodation().isEmpty()) {
+			return addAccomodation();
+		}
+		return getAccomodation().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>diet</b> (Dietary restrictions for the patient).
@@ -1387,7 +1348,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>specialCourtesy</b> (Special courtesies (VIP, board member)).
 	 * creating it if it does
@@ -1431,6 +1391,21 @@ public class Encounter extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>specialCourtesy</b> (Special courtesies (VIP, board member)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public CodeableConceptDt getSpecialCourtesyFirstRep() {
+		if (getSpecialCourtesy().isEmpty()) {
+			return addSpecialCourtesy();
+		}
+		return getSpecialCourtesy().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>specialArrangement</b> (Wheelchair, translator, stretcher, etc).
@@ -1475,6 +1450,21 @@ public class Encounter extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>specialArrangement</b> (Wheelchair, translator, stretcher, etc),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public CodeableConceptDt getSpecialArrangementFirstRep() {
+		if (getSpecialArrangement().isEmpty()) {
+			return addSpecialArrangement();
+		}
+		return getSpecialArrangement().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>destination</b> (Location to which the patient is discharged).
@@ -1506,7 +1496,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>dischargeDisposition</b> (Category or kind of location after discharge).
 	 * creating it if it does
@@ -1537,7 +1526,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>dischargeDiagnosis</b> (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete).
 	 * creating it if it does
@@ -1568,7 +1556,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>reAdmission</b> (Is this hospitalization a readmission?).
 	 * creating it if it does
@@ -1598,7 +1585,6 @@ public class Encounter extends BaseResource implements IResource {
 		myReAdmission = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>reAdmission</b> (Is this hospitalization a readmission?)
 	 *
@@ -1607,8 +1593,9 @@ public class Encounter extends BaseResource implements IResource {
      * Whether this hospitalization is a readmission
      * </p> 
 	 */
-	public void setReAdmission( Boolean theBoolean) {
+	public Hospitalization setReAdmission( Boolean theBoolean) {
 		myReAdmission = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -1688,7 +1675,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>period</b> (Period during which the patient was assigned the bed).
 	 * creating it if it does
@@ -1720,7 +1706,6 @@ public class Encounter extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1798,7 +1783,6 @@ public class Encounter extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>period</b> (Time period during which the patient was present at the location).
 	 * creating it if it does
@@ -1830,7 +1814,6 @@ public class Encounter extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java

@@ -17,113 +17,29 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IDatatype;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
+import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
 import ca.uhn.fhir.model.dstu.composite.QuantityDt;
 import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
+import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
 import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -342,7 +258,6 @@ public class Group extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>type</b> (person | animal | practitioner | device | medication | substance).
 	 * creating it if it does
@@ -372,7 +287,6 @@ public class Group extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (person | animal | practitioner | device | medication | substance)
 	 *
@@ -415,7 +329,6 @@ public class Group extends BaseResource implements IResource {
 		myActual = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>actual</b> (Descriptive or actual)
 	 *
@@ -424,8 +337,9 @@ public class Group extends BaseResource implements IResource {
      * If true, indicates that the resource refers to a specific group of real individuals.  If false, the group defines a set of intended individuals
      * </p> 
 	 */
-	public void setActual( Boolean theBoolean) {
+	public Group setActual( Boolean theBoolean) {
 		myActual = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -459,7 +373,6 @@ public class Group extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>name</b> (Label for Group).
 	 * creating it if it does
@@ -489,7 +402,6 @@ public class Group extends BaseResource implements IResource {
 		myName = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>name</b> (Label for Group)
 	 *
@@ -498,8 +410,9 @@ public class Group extends BaseResource implements IResource {
      * A label assigned to the group for human identification and communication
      * </p> 
 	 */
-	public void setName( String theString) {
+	public Group setName( String theString) {
 		myName = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -532,7 +445,6 @@ public class Group extends BaseResource implements IResource {
 		myQuantity = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>quantity</b> (Number of members)
 	 *
@@ -541,8 +453,9 @@ public class Group extends BaseResource implements IResource {
      * A count of the number of resource instances that are part of the group
      * </p> 
 	 */
-	public void setQuantity( Integer theInteger) {
+	public Group setQuantity( Integer theInteger) {
 		myQuantity = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -589,6 +502,21 @@ public class Group extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>characteristic</b> (Trait of group members),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies the traits shared by members of the group
+     * </p> 
+	 */
+	public Characteristic getCharacteristicFirstRep() {
+		if (getCharacteristic().isEmpty()) {
+			return addCharacteristic();
+		}
+		return getCharacteristic().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>member</b> (Who is in group).
@@ -616,7 +544,19 @@ public class Group extends BaseResource implements IResource {
 		myMember = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>member</b> (Who is in group)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies the resource instances that are members of the group.
+     * </p> 
+	 */
+	public ResourceReferenceDt addMember() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getMember().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Block class for child element: <b>Group.characteristic</b> (Trait of group members)
@@ -701,7 +641,6 @@ public class Group extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>value[x]</b> (Value held by characteristic).
 	 * creating it if it does
@@ -729,7 +668,6 @@ public class Group extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>exclude</b> (Group includes or excludes).
 	 * creating it if it does
@@ -759,7 +697,6 @@ public class Group extends BaseResource implements IResource {
 		myExclude = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>exclude</b> (Group includes or excludes)
 	 *
@@ -768,8 +705,9 @@ public class Group extends BaseResource implements IResource {
      * If true, indicates the characteristic is one that is NOT held by members of the group
      * </p> 
 	 */
-	public void setExclude( Boolean theBoolean) {
+	public Characteristic setExclude( Boolean theBoolean) {
 		myExclude = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java

@@ -17,109 +17,28 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.primitive.BooleanDt;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.composite.CodingDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
+import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
+import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
@@ -416,7 +335,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myDateTime = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>dateTime</b> (When the study was performed)
 	 *
@@ -425,8 +343,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Date and Time the study took place
      * </p> 
 	 */
-	public void setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public ImagingStudy setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myDateTime = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -437,8 +356,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Date and Time the study took place
      * </p> 
 	 */
-	public void setDateTimeWithSecondsPrecision( Date theDate) {
+	public ImagingStudy setDateTimeWithSecondsPrecision( Date theDate) {
 		myDateTime = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -472,7 +392,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>uid</b> (Formal identifier for the study (0020,000D)).
 	 * creating it if it does
@@ -503,7 +422,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>accessionNo</b> (Accession Number (0008,0050)).
 	 * creating it if it does
@@ -534,7 +452,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>identifier</b> (Other identifiers for the study (0020,0010)).
 	 * creating it if it does
@@ -578,6 +495,21 @@ public class ImagingStudy extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Other identifiers for the study (0020,0010)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Other identifiers for the study
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>order</b> (Order(s) that caused this study to be performed).
@@ -608,7 +540,19 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myOrder = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>order</b> (Order(s) that caused this study to be performed)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A list of the diagnostic orders that resulted in this imaging study being performed
+     * </p> 
+	 */
+	public ResourceReferenceDt addOrder() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getOrder().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>modality</b> (All series.modality if actual acquisition modalities).
@@ -639,7 +583,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myModality = theValue;
 	}
 
-
 	/**
 	 * Add a value for <b>modality</b> (All series.modality if actual acquisition modalities)
 	 *
@@ -696,7 +639,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>availability</b> (ONLINE | OFFLINE | NEARLINE | UNAVAILABLE (0008,0056)).
 	 * creating it if it does
@@ -726,7 +668,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myAvailability = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>availability</b> (ONLINE | OFFLINE | NEARLINE | UNAVAILABLE (0008,0056))
 	 *
@@ -769,7 +710,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myUrl = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>url</b> (Retrieve URI (0008,1190))
 	 *
@@ -778,8 +718,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * WADO-RS URI where Study is available
      * </p> 
 	 */
-	public void setUrl( String theUri) {
+	public ImagingStudy setUrl( String theUri) {
 		myUrl = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -812,7 +753,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myNumberOfSeries = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>numberOfSeries</b> (Number of Study Related Series (0020,1206))
 	 *
@@ -821,8 +761,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Number of Series in Study
      * </p> 
 	 */
-	public void setNumberOfSeries( Integer theInteger) {
+	public ImagingStudy setNumberOfSeries( Integer theInteger) {
 		myNumberOfSeries = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -855,7 +796,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myNumberOfInstances = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>numberOfInstances</b> (Number of Study Related Instances (0020,1208))
 	 *
@@ -864,8 +804,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Number of SOP Instances in Study
      * </p> 
 	 */
-	public void setNumberOfInstances( Integer theInteger) {
+	public ImagingStudy setNumberOfInstances( Integer theInteger) {
 		myNumberOfInstances = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -898,7 +839,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myClinicalInformation = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>clinicalInformation</b> (Diagnoses etc with request (0040,1002))
 	 *
@@ -907,8 +847,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Diagnoses etc provided with request
      * </p> 
 	 */
-	public void setClinicalInformation( String theString) {
+	public ImagingStudy setClinicalInformation( String theString) {
 		myClinicalInformation = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -955,6 +896,21 @@ public class ImagingStudy extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>procedure</b> (Type of procedure performed (0008,1032)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Type of procedure performed
+     * </p> 
+	 */
+	public CodingDt getProcedureFirstRep() {
+		if (getProcedure().isEmpty()) {
+			return addProcedure();
+		}
+		return getProcedure().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>interpreter</b> (Who interpreted images (0008,1060)).
@@ -986,7 +942,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>description</b> (Institution-generated description (0008,1030)).
 	 * creating it if it does
@@ -1016,7 +971,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (Institution-generated description (0008,1030))
 	 *
@@ -1025,8 +979,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Institution-generated description or classification of the Study (component) performed
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public ImagingStudy setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1073,6 +1028,21 @@ public class ImagingStudy extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>series</b> (Each study has one or more series of instances),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Each study has one or more series of image instances
+     * </p> 
+	 */
+	public Series getSeriesFirstRep() {
+		if (getSeries().isEmpty()) {
+			return addSeries();
+		}
+		return getSeries().get(0); 
+	}
   
 	/**
 	 * Block class for child element: <b>ImagingStudy.series</b> (Each study has one or more series of instances)
@@ -1200,7 +1170,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myNumber = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>number</b> (Number of this series in overall sequence (0020,0011))
 	 *
@@ -1209,8 +1178,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * The number of this series in the overall sequence
      * </p> 
 	 */
-	public void setNumber( Integer theInteger) {
+	public Series setNumber( Integer theInteger) {
 		myNumber = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -1243,7 +1213,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myModality = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>modality</b> (The modality of the instances in the series (0008,0060))
 	 *
@@ -1287,7 +1256,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>description</b> (A description of the series (0008,103E)).
 	 * creating it if it does
@@ -1317,7 +1285,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (A description of the series (0008,103E))
 	 *
@@ -1326,8 +1293,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * A description of the series
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public Series setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1360,7 +1328,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myNumberOfInstances = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>numberOfInstances</b> (Number of Series Related Instances (0020,1209))
 	 *
@@ -1369,8 +1336,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * Sequence that contains attributes from the
      * </p> 
 	 */
-	public void setNumberOfInstances( Integer theInteger) {
+	public Series setNumberOfInstances( Integer theInteger) {
 		myNumberOfInstances = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -1403,7 +1371,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myAvailability = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>availability</b> (ONLINE | OFFLINE | NEARLINE | UNAVAILABLE (0008,0056))
 	 *
@@ -1446,7 +1413,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myUrl = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>url</b> (Retrieve URI (0008,1115 > 0008,1190))
 	 *
@@ -1455,8 +1421,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * WADO-RS URI where Series is available
      * </p> 
 	 */
-	public void setUrl( String theUri) {
+	public Series setUrl( String theUri) {
 		myUrl = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -1490,7 +1457,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>dateTime</b> (When the series started).
 	 * creating it if it does
@@ -1520,7 +1486,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myDateTime = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>dateTime</b> (When the series started)
 	 *
@@ -1529,8 +1494,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Series setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myDateTime = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -1541,8 +1507,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setDateTimeWithSecondsPrecision( Date theDate) {
+	public Series setDateTimeWithSecondsPrecision( Date theDate) {
 		myDateTime = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -1589,6 +1556,21 @@ public class ImagingStudy extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>instance</b> (A single instance taken from a patient (image or other)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A single image taken from a patient
+     * </p> 
+	 */
+	public SeriesInstance getInstanceFirstRep() {
+		if (getInstance().isEmpty()) {
+			return addInstance();
+		}
+		return getInstance().get(0); 
+	}
   
 
 	}
@@ -1700,7 +1682,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myNumber = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>number</b> (The number of this instance in the series (0020,0013))
 	 *
@@ -1709,8 +1690,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * The number of this image in the series
      * </p> 
 	 */
-	public void setNumber( Integer theInteger) {
+	public SeriesInstance setNumber( Integer theInteger) {
 		myNumber = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -1744,7 +1726,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>sopclass</b> (DICOM class type (0008,0016)).
 	 * creating it if it does
@@ -1775,7 +1756,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>type </b> (Type of instance (image etc) (0004,1430)).
 	 * creating it if it does
@@ -1805,7 +1785,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>type </b> (Type of instance (image etc) (0004,1430))
 	 *
@@ -1814,8 +1793,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setType( String theString) {
+	public SeriesInstance setType( String theString) {
 		myType = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1848,7 +1828,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myTitle = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>title</b> (Description (0070,0080 | 0040,A043 > 0008,0104 | 0042,0010 | 0008,0008))
 	 *
@@ -1857,8 +1836,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setTitle( String theString) {
+	public SeriesInstance setTitle( String theString) {
 		myTitle = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1891,7 +1871,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 		myUrl = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>url</b> (WADO-RS service where instance is available  (0008,1199 > 0008,1190))
 	 *
@@ -1900,8 +1879,9 @@ public class ImagingStudy extends BaseResource implements IResource {
      * WADO-RS url where image is available
      * </p> 
 	 */
-	public void setUrl( String theUri) {
+	public SeriesInstance setUrl( String theUri) {
 		myUrl = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -1936,7 +1916,6 @@ public class ImagingStudy extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java

@@ -17,113 +17,30 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
+import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseResource;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.IResourceBlock;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
 import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
 import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
 import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
 import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -358,7 +275,6 @@ public class Location extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>name</b> (Name of the location as used by humans).
 	 * creating it if it does
@@ -388,7 +304,6 @@ public class Location extends BaseResource implements IResource {
 		myName = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>name</b> (Name of the location as used by humans)
 	 *
@@ -397,8 +312,9 @@ public class Location extends BaseResource implements IResource {
      * Name of the location as used by humans. Does not need to be unique.
      * </p> 
 	 */
-	public void setName( String theString) {
+	public Location setName( String theString) {
 		myName = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -431,7 +347,6 @@ public class Location extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (Description of the Location, which helps in finding or referencing the place)
 	 *
@@ -440,8 +355,9 @@ public class Location extends BaseResource implements IResource {
      * Description of the Location, which helps in finding or referencing the place
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public Location setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -474,7 +390,6 @@ public class Location extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (Indicates the type of function performed at the location)
 	 *
@@ -531,6 +446,21 @@ public class Location extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (Contact details of the location),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The contact details of communication devices available at the location. This can include phone numbers, fax numbers, mobile numbers, email addresses and web sites
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>address</b> (Physical location).
@@ -562,7 +492,6 @@ public class Location extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>physicalType</b> (Physical form of the location).
 	 * creating it if it does
@@ -593,7 +522,6 @@ public class Location extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>position</b> (The absolute geographic location).
 	 * creating it if it does
@@ -624,7 +552,6 @@ public class Location extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>managingOrganization</b> (The organization that is responsible for the provisioning and upkeep of the location).
 	 * creating it if it does
@@ -655,7 +582,6 @@ public class Location extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>status</b> (active | suspended | inactive).
 	 * creating it if it does
@@ -685,7 +611,6 @@ public class Location extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (active | suspended | inactive)
 	 *
@@ -729,7 +654,6 @@ public class Location extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>mode</b> (instance | kind).
 	 * creating it if it does
@@ -759,7 +683,6 @@ public class Location extends BaseResource implements IResource {
 		myMode = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>mode</b> (instance | kind)
 	 *
@@ -850,7 +773,6 @@ public class Location extends BaseResource implements IResource {
 		myLongitude = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>longitude</b> (Longitude as expressed in KML)
 	 *
@@ -859,8 +781,9 @@ public class Location extends BaseResource implements IResource {
      * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setLongitude( long theValue) {
+	public Position setLongitude( long theValue) {
 		myLongitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -871,8 +794,9 @@ public class Location extends BaseResource implements IResource {
      * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setLongitude( double theValue) {
+	public Position setLongitude( double theValue) {
 		myLongitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -883,8 +807,9 @@ public class Location extends BaseResource implements IResource {
      * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setLongitude( java.math.BigDecimal theValue) {
+	public Position setLongitude( java.math.BigDecimal theValue) {
 		myLongitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -917,7 +842,6 @@ public class Location extends BaseResource implements IResource {
 		myLatitude = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>latitude</b> (Latitude as expressed in KML)
 	 *
@@ -926,8 +850,9 @@ public class Location extends BaseResource implements IResource {
      * Latitude. The value domain and the interpretation are the same as for the text of the latitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setLatitude( long theValue) {
+	public Position setLatitude( long theValue) {
 		myLatitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -938,8 +863,9 @@ public class Location extends BaseResource implements IResource {
      * Latitude. The value domain and the interpretation are the same as for the text of the latitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setLatitude( double theValue) {
+	public Position setLatitude( double theValue) {
 		myLatitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -950,8 +876,9 @@ public class Location extends BaseResource implements IResource {
      * Latitude. The value domain and the interpretation are the same as for the text of the latitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setLatitude( java.math.BigDecimal theValue) {
+	public Position setLatitude( java.math.BigDecimal theValue) {
 		myLatitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
  
@@ -984,7 +911,6 @@ public class Location extends BaseResource implements IResource {
 		myAltitude = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>altitude</b> (Altitude as expressed in KML)
 	 *
@@ -993,8 +919,9 @@ public class Location extends BaseResource implements IResource {
      * Altitude. The value domain and the interpretation are the same as for the text of the altitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setAltitude( long theValue) {
+	public Position setAltitude( long theValue) {
 		myAltitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -1005,8 +932,9 @@ public class Location extends BaseResource implements IResource {
      * Altitude. The value domain and the interpretation are the same as for the text of the altitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setAltitude( double theValue) {
+	public Position setAltitude( double theValue) {
 		myAltitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
 	/**
@@ -1017,8 +945,9 @@ public class Location extends BaseResource implements IResource {
      * Altitude. The value domain and the interpretation are the same as for the text of the altitude element in KML (see notes below)
      * </p> 
 	 */
-	public void setAltitude( java.math.BigDecimal theValue) {
+	public Position setAltitude( java.math.BigDecimal theValue) {
 		myAltitude = new DecimalDt(theValue); 
+		return this; 
 	}
 
  

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java

@@ -17,113 +17,26 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.primitive.BooleanDt;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
+import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -358,7 +271,6 @@ public class Media extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (photo | video | audio)
 	 *
@@ -402,7 +314,6 @@ public class Media extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>identifier</b> (Identifier(s) for the image).
 	 * creating it if it does
@@ -446,6 +357,21 @@ public class Media extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Identifier(s) for the image),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifiers associated with the image - these may include identifiers for the image itself, identifiers for the context of its collection (e.g. series ids) and context ids such as accession numbers or other workflow identifiers
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>dateTime</b> (When the media was taken/recorded (end)).
@@ -476,7 +402,6 @@ public class Media extends BaseResource implements IResource {
 		myDateTime = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>dateTime</b> (When the media was taken/recorded (end))
 	 *
@@ -485,8 +410,9 @@ public class Media extends BaseResource implements IResource {
      * When the media was originally recorded. For video and audio, if the length of the recording is not insignificant, this is the end of the recording
      * </p> 
 	 */
-	public void setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Media setDateTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myDateTime = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -497,8 +423,9 @@ public class Media extends BaseResource implements IResource {
      * When the media was originally recorded. For video and audio, if the length of the recording is not insignificant, this is the end of the recording
      * </p> 
 	 */
-	public void setDateTimeWithSecondsPrecision( Date theDate) {
+	public Media setDateTimeWithSecondsPrecision( Date theDate) {
 		myDateTime = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -529,7 +456,6 @@ public class Media extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>operator</b> (The person who generated the image).
 	 * creating it if it does
@@ -560,7 +486,6 @@ public class Media extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>view</b> (Imaging view e.g Lateral or Antero-posterior).
 	 * creating it if it does
@@ -591,7 +516,6 @@ public class Media extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>deviceName</b> (Name of the device/manufacturer).
 	 * creating it if it does
@@ -621,7 +545,6 @@ public class Media extends BaseResource implements IResource {
 		myDeviceName = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>deviceName</b> (Name of the device/manufacturer)
 	 *
@@ -630,8 +553,9 @@ public class Media extends BaseResource implements IResource {
      * The name of the device / manufacturer of the device  that was used to make the recording
      * </p> 
 	 */
-	public void setDeviceName( String theString) {
+	public Media setDeviceName( String theString) {
 		myDeviceName = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -664,7 +588,6 @@ public class Media extends BaseResource implements IResource {
 		myHeight = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>height</b> (Height of the image in pixels(photo/video))
 	 *
@@ -673,8 +596,9 @@ public class Media extends BaseResource implements IResource {
      * Height of the image in pixels(photo/video)
      * </p> 
 	 */
-	public void setHeight( Integer theInteger) {
+	public Media setHeight( Integer theInteger) {
 		myHeight = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -707,7 +631,6 @@ public class Media extends BaseResource implements IResource {
 		myWidth = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>width</b> (Width of the image in pixels (photo/video))
 	 *
@@ -716,8 +639,9 @@ public class Media extends BaseResource implements IResource {
      * Width of the image in pixels (photo/video)
      * </p> 
 	 */
-	public void setWidth( Integer theInteger) {
+	public Media setWidth( Integer theInteger) {
 		myWidth = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -750,7 +674,6 @@ public class Media extends BaseResource implements IResource {
 		myFrames = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>frames</b> (Number of frames if > 1 (photo))
 	 *
@@ -759,8 +682,9 @@ public class Media extends BaseResource implements IResource {
      * The number of frames in a photo. This is used with a multi-page fax, or an imaging acquisition context that takes multiple slices in a single image, or an animated gif. If there is more than one frame, this SHALL have a value in order to alert interface software that a multi-frame capable rendering widget is required
      * </p> 
 	 */
-	public void setFrames( Integer theInteger) {
+	public Media setFrames( Integer theInteger) {
 		myFrames = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -793,7 +717,6 @@ public class Media extends BaseResource implements IResource {
 		myLength = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>length</b> (Length in seconds (audio / video))
 	 *
@@ -802,8 +725,9 @@ public class Media extends BaseResource implements IResource {
      * The length of the recording in seconds - for audio and video
      * </p> 
 	 */
-	public void setLength( Integer theInteger) {
+	public Media setLength( Integer theInteger) {
 		myLength = new IntegerDt(theInteger); 
+		return this; 
 	}
 
  
@@ -839,5 +763,4 @@ public class Media extends BaseResource implements IResource {
   
 
 
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java

@@ -17,113 +17,25 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
+import ca.uhn.fhir.model.dstu.composite.RatioDt;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
 import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -310,7 +222,6 @@ public class Medication extends BaseResource implements IResource {
 		myName = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>name</b> (Common / Commercial name)
 	 *
@@ -319,8 +230,9 @@ public class Medication extends BaseResource implements IResource {
      * The common/commercial name of the medication absent information such as strength, form, etc.  E.g. Acetaminophen, Tylenol 3, etc.  The fully coordinated name is communicated as the display of Medication.code
      * </p> 
 	 */
-	public void setName( String theString) {
+	public Medication setName( String theString) {
 		myName = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -354,7 +266,6 @@ public class Medication extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>isBrand</b> (True if a brand).
 	 * creating it if it does
@@ -384,7 +295,6 @@ public class Medication extends BaseResource implements IResource {
 		myIsBrand = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>isBrand</b> (True if a brand)
 	 *
@@ -393,8 +303,9 @@ public class Medication extends BaseResource implements IResource {
      * Set to true if the item is attributable to a specific manufacturer (even if we don't know who that is)
      * </p> 
 	 */
-	public void setIsBrand( Boolean theBoolean) {
+	public Medication setIsBrand( Boolean theBoolean) {
 		myIsBrand = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -428,7 +339,6 @@ public class Medication extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>kind</b> (product | package).
 	 * creating it if it does
@@ -458,7 +368,6 @@ public class Medication extends BaseResource implements IResource {
 		myKind = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>kind</b> (product | package)
 	 *
@@ -502,7 +411,6 @@ public class Medication extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>package</b> (Details about packaged medications).
 	 * creating it if it does
@@ -532,7 +440,6 @@ public class Medication extends BaseResource implements IResource {
 		myPackage = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>package</b> (Details about packaged medications)
 	 *
@@ -541,8 +448,9 @@ public class Medication extends BaseResource implements IResource {
      * Information that only applies to packages (not products)
      * </p> 
 	 */
-	public void setPackage( String theCode) {
+	public Medication setPackage( String theCode) {
 		myPackage = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -617,7 +525,6 @@ public class Medication extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>ingredient</b> (Active or inactive ingredient).
 	 * creating it if it does
@@ -661,6 +568,21 @@ public class Medication extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>ingredient</b> (Active or inactive ingredient),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifies a particular constituent of interest in the product
+     * </p> 
+	 */
+	public ProductIngredient getIngredientFirstRep() {
+		if (getIngredient().isEmpty()) {
+			return addIngredient();
+		}
+		return getIngredient().get(0); 
+	}
   
 
 	}
@@ -736,7 +658,6 @@ public class Medication extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>amount</b> (How much ingredient in product).
 	 * creating it if it does
@@ -768,7 +689,6 @@ public class Medication extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java

@@ -17,113 +17,39 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IDatatype;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.IResourceBlock;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
+import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
+import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
+import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
+import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.Location;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
+import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
 import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
 import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
 import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -474,7 +400,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>value[x]</b> (Actual result).
 	 * creating it if it does
@@ -502,7 +427,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>interpretation</b> (High, low, normal, etc.).
 	 * creating it if it does
@@ -532,7 +456,6 @@ public class Observation extends BaseResource implements IResource {
 		myInterpretation = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>interpretation</b> (High, low, normal, etc.)
 	 *
@@ -575,7 +498,6 @@ public class Observation extends BaseResource implements IResource {
 		myComments = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>comments</b> (Comments about result)
 	 *
@@ -584,8 +506,9 @@ public class Observation extends BaseResource implements IResource {
      * May include statements about significant, unexpected or unreliable values, or information about the source of the value where this may be relevant to the interpretation of the result.
      * </p> 
 	 */
-	public void setComments( String theString) {
+	public Observation setComments( String theString) {
 		myComments = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -616,7 +539,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>issued</b> (Date/Time this was made available).
 	 * creating it if it does
@@ -646,7 +568,6 @@ public class Observation extends BaseResource implements IResource {
 		myIssued = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>issued</b> (Date/Time this was made available)
 	 *
@@ -655,8 +576,9 @@ public class Observation extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Observation setIssuedWithMillisPrecision( Date theDate) {
-		myIssued = new InstantDt(theDate, thePrecision); 
+		myIssued = new InstantDt(theDate); 
+		return this; 
 	}
 
 	/**
@@ -667,8 +589,9 @@ public class Observation extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setIssuedWithMillisPrecision( Date theDate) {
+	public Observation setIssued( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myIssued = new InstantDt(theDate); 
+		myIssued = new InstantDt(theDate, thePrecision); 
+		return this; 
 	}
 
  
@@ -701,7 +624,6 @@ public class Observation extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (registered | preliminary | final | amended +)
 	 *
@@ -744,7 +666,6 @@ public class Observation extends BaseResource implements IResource {
 		myReliability = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>reliability</b> (ok | ongoing | early | questionable | calibrating | error +)
 	 *
@@ -788,7 +709,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>method</b> (How it was done).
 	 * creating it if it does
@@ -819,7 +739,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>identifier</b> (Unique Id for this particular observation).
 	 * creating it if it does
@@ -850,7 +769,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>subject</b> (Who and/or what this is about).
 	 * creating it if it does
@@ -878,7 +796,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>specimen</b> (Specimen used for this observation).
 	 * creating it if it does
@@ -909,7 +826,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>performer</b> (Who did the observation).
 	 * creating it if it does
@@ -936,7 +852,19 @@ public class Observation extends BaseResource implements IResource {
 		myPerformer = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>performer</b> (Who did the observation)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Who was responsible for asserting the observed value as \"true\"
+     * </p> 
+	 */
+	public ResourceReferenceDt addPerformer() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getPerformer().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>referenceRange</b> (Provides guide for interpretation).
@@ -981,6 +909,21 @@ public class Observation extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>referenceRange</b> (Provides guide for interpretation),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Guidance on how to interpret the value by comparison to a normal or recommended range
+     * </p> 
+	 */
+	public ReferenceRange getReferenceRangeFirstRep() {
+		if (getReferenceRange().isEmpty()) {
+			return addReferenceRange();
+		}
+		return getReferenceRange().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>related</b> (Observations related to this observation).
@@ -1025,6 +968,21 @@ public class Observation extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>related</b> (Observations related to this observation),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Related observations - either components, or previous observations, or statements of derivation
+     * </p> 
+	 */
+	public Related getRelatedFirstRep() {
+		if (getRelated().isEmpty()) {
+			return addRelated();
+		}
+		return getRelated().get(0); 
+	}
   
 	/**
 	 * Block class for child element: <b>Observation.referenceRange</b> (Provides guide for interpretation)
@@ -1111,7 +1069,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>high</b> (High Range, if relevant).
 	 * creating it if it does
@@ -1142,7 +1099,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>meaning</b> (Indicates the meaning/use of this range of this range).
 	 * creating it if it does
@@ -1173,7 +1129,6 @@ public class Observation extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>age</b> (Applicable age range, if relevant).
 	 * creating it if it does
@@ -1205,7 +1160,6 @@ public class Observation extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1281,7 +1235,6 @@ public class Observation extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (has-component | has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by)
 	 *
@@ -1326,7 +1279,6 @@ public class Observation extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java

@@ -17,113 +17,28 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
+import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseResource;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.IResourceBlock;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
+import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
+import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
 import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -340,6 +255,21 @@ public class Organization extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Identifies this organization  across multiple systems),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifier for the organization that is used to identify the organization across multiple disparate systems
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>name</b> (Name used for the organization).
@@ -370,7 +300,6 @@ public class Organization extends BaseResource implements IResource {
 		myName = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>name</b> (Name used for the organization)
 	 *
@@ -379,8 +308,9 @@ public class Organization extends BaseResource implements IResource {
      * A name associated with the organization
      * </p> 
 	 */
-	public void setName( String theString) {
+	public Organization setName( String theString) {
 		myName = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -413,7 +343,6 @@ public class Organization extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (Kind of organization)
 	 *
@@ -470,6 +399,21 @@ public class Organization extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (A contact detail for the organization),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the organization
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>address</b> (An address for the organization).
@@ -514,6 +458,21 @@ public class Organization extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>address</b> (An address for the organization),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * An address for the organization
+     * </p> 
+	 */
+	public AddressDt getAddressFirstRep() {
+		if (getAddress().isEmpty()) {
+			return addAddress();
+		}
+		return getAddress().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>partOf</b> (The organization of which this organization forms a part).
@@ -545,7 +504,6 @@ public class Organization extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>contact</b> (Contact for the organization for a certain purpose).
 	 * creating it if it does
@@ -589,6 +547,21 @@ public class Organization extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>contact</b> (Contact for the organization for a certain purpose),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public Contact getContactFirstRep() {
+		if (getContact().isEmpty()) {
+			return addContact();
+		}
+		return getContact().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>location</b> (Location(s) the organization uses to provide services).
@@ -619,7 +592,19 @@ public class Organization extends BaseResource implements IResource {
 		myLocation = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>location</b> (Location(s) the organization uses to provide services)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Location(s) the organization uses to provide services
+     * </p> 
+	 */
+	public ResourceReferenceDt addLocation() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getLocation().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>active</b> (Whether the organization's record is still in active use).
@@ -650,7 +635,6 @@ public class Organization extends BaseResource implements IResource {
 		myActive = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>active</b> (Whether the organization's record is still in active use)
 	 *
@@ -659,8 +643,9 @@ public class Organization extends BaseResource implements IResource {
      * Whether the organization's record is still in active use
      * </p> 
 	 */
-	public void setActive( Boolean theBoolean) {
+	public Organization setActive( Boolean theBoolean) {
 		myActive = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -756,7 +741,6 @@ public class Organization extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>name</b> (A name associated with the contact).
 	 * creating it if it does
@@ -787,7 +771,6 @@ public class Organization extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>telecom</b> (Contact details (telephone, email, etc)  for a contact).
 	 * creating it if it does
@@ -831,6 +814,21 @@ public class Organization extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (Contact details (telephone, email, etc)  for a contact),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail (e.g. a telephone number or an email address) by which the party may be contacted.
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>address</b> (Visiting or postal addresses for the contact).
@@ -862,7 +860,6 @@ public class Organization extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
 	 * creating it if it does
@@ -892,7 +889,6 @@ public class Organization extends BaseResource implements IResource {
 		myGender = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>gender</b> (Gender for administrative purposes)
 	 *

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java

@@ -17,113 +17,37 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
+import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseResource;
+import ca.uhn.fhir.model.api.IDatatype;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.IResourceBlock;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
+import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
+import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
+import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
+import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
 import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -483,6 +407,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (An identifier for the person as this patient),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * An identifier that applies to this person as a patient
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>name</b> (A name associated with the patient).
@@ -527,6 +466,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>name</b> (A name associated with the patient),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A name associated with the individual.
+     * </p> 
+	 */
+	public HumanNameDt getNameFirstRep() {
+		if (getName().isEmpty()) {
+			return addName();
+		}
+		return getName().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>telecom</b> (A contact detail for the individual).
@@ -571,6 +525,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (A contact detail for the individual),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail (e.g. a telephone number or an email address) by which the individual may be contacted.
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
@@ -601,7 +570,6 @@ public class Patient extends BaseResource implements IResource {
 		myGender = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>gender</b> (Gender for administrative purposes)
 	 *
@@ -644,7 +612,6 @@ public class Patient extends BaseResource implements IResource {
 		myBirthDate = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>birthDate</b> (The date and time of birth for the individual)
 	 *
@@ -653,8 +620,9 @@ public class Patient extends BaseResource implements IResource {
      * The date and time of birth for the individual
      * </p> 
 	 */
-	public void setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Patient setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myBirthDate = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -665,8 +633,9 @@ public class Patient extends BaseResource implements IResource {
      * The date and time of birth for the individual
      * </p> 
 	 */
-	public void setBirthDateWithSecondsPrecision( Date theDate) {
+	public Patient setBirthDateWithSecondsPrecision( Date theDate) {
 		myBirthDate = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -697,7 +666,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>address</b> (Addresses for the individual).
 	 * creating it if it does
@@ -741,6 +709,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>address</b> (Addresses for the individual),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Addresses for the individual
+     * </p> 
+	 */
+	public AddressDt getAddressFirstRep() {
+		if (getAddress().isEmpty()) {
+			return addAddress();
+		}
+		return getAddress().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>maritalStatus</b> (Marital (civil) status of a person).
@@ -771,7 +754,6 @@ public class Patient extends BaseResource implements IResource {
 		myMaritalStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>maritalStatus</b> (Marital (civil) status of a person)
 	 *
@@ -812,7 +794,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>photo</b> (Image of the person).
 	 * creating it if it does
@@ -856,6 +837,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>photo</b> (Image of the person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Image of the person
+     * </p> 
+	 */
+	public AttachmentDt getPhotoFirstRep() {
+		if (getPhoto().isEmpty()) {
+			return addPhoto();
+		}
+		return getPhoto().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>contact</b> (A contact party (e.g. guardian, partner, friend) for the patient).
@@ -900,6 +896,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>contact</b> (A contact party (e.g. guardian, partner, friend) for the patient),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact party (e.g. guardian, partner, friend) for the patient
+     * </p> 
+	 */
+	public Contact getContactFirstRep() {
+		if (getContact().isEmpty()) {
+			return addContact();
+		}
+		return getContact().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>animal</b> (If this patient is an animal (non-human)).
@@ -931,7 +942,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>communication</b> (Languages which may be used to communicate with the patient about his or her health).
 	 * creating it if it does
@@ -975,6 +985,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>communication</b> (Languages which may be used to communicate with the patient about his or her health),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Languages which may be used to communicate with the patient about his or her health
+     * </p> 
+	 */
+	public CodeableConceptDt getCommunicationFirstRep() {
+		if (getCommunication().isEmpty()) {
+			return addCommunication();
+		}
+		return getCommunication().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>careProvider</b> (Patient's nominated care provider).
@@ -1002,7 +1027,19 @@ public class Patient extends BaseResource implements IResource {
 		myCareProvider = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>careProvider</b> (Patient's nominated care provider)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Patient's nominated care provider
+     * </p> 
+	 */
+	public ResourceReferenceDt addCareProvider() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getCareProvider().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>managingOrganization</b> (Organization that is the custodian of the patient record).
@@ -1034,7 +1071,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>link</b> (Link to another patient resource that concerns the same actual person).
 	 * creating it if it does
@@ -1078,6 +1114,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>link</b> (Link to another patient resource that concerns the same actual person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Link to another patient resource that concerns the same actual person
+     * </p> 
+	 */
+	public Link getLinkFirstRep() {
+		if (getLink().isEmpty()) {
+			return addLink();
+		}
+		return getLink().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>active</b> (Whether this patient's record is in active use).
@@ -1108,7 +1159,6 @@ public class Patient extends BaseResource implements IResource {
 		myActive = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>active</b> (Whether this patient's record is in active use)
 	 *
@@ -1117,8 +1167,9 @@ public class Patient extends BaseResource implements IResource {
      * Whether this patient record is in active use
      * </p> 
 	 */
-	public void setActive( Boolean theBoolean) {
+	public Patient setActive( Boolean theBoolean) {
 		myActive = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -1236,6 +1287,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>relationship</b> (The kind of relationship),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The nature of the relationship between the patient and the contact person
+     * </p> 
+	 */
+	public CodeableConceptDt getRelationshipFirstRep() {
+		if (getRelationship().isEmpty()) {
+			return addRelationship();
+		}
+		return getRelationship().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>name</b> (A name associated with the person).
@@ -1267,7 +1333,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>telecom</b> (A contact detail for the person).
 	 * creating it if it does
@@ -1311,6 +1376,21 @@ public class Patient extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (A contact detail for the person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the person, e.g. a telephone number or an email address.
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>address</b> (Address for the contact person).
@@ -1342,7 +1422,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
 	 * creating it if it does
@@ -1372,7 +1451,6 @@ public class Patient extends BaseResource implements IResource {
 		myGender = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>gender</b> (Gender for administrative purposes)
 	 *
@@ -1417,7 +1495,6 @@ public class Patient extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1498,7 +1575,6 @@ public class Patient extends BaseResource implements IResource {
 		mySpecies = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>species</b> (E.g. Dog, Cow)
 	 *
@@ -1542,7 +1618,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>genderStatus</b> (E.g. Neutered, Intact).
 	 * creating it if it does
@@ -1574,7 +1649,6 @@ public class Patient extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1651,7 +1725,6 @@ public class Patient extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>type</b> (replace | refer | seealso - type of link).
 	 * creating it if it does
@@ -1681,7 +1754,6 @@ public class Patient extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (replace | refer | seealso - type of link)
 	 *

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java

@@ -17,113 +17,32 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
+import ca.uhn.fhir.model.api.BaseElement;
+import ca.uhn.fhir.model.api.BaseResource;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.IResourceBlock;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
 import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
 import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -395,6 +314,21 @@ public class Practitioner extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (A identifier for the person as this agent),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * An identifier that applies to this person in this role
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>name</b> (A name associated with the person).
@@ -426,7 +360,6 @@ public class Practitioner extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>telecom</b> (A contact detail for the practitioner).
 	 * creating it if it does
@@ -470,6 +403,21 @@ public class Practitioner extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (A contact detail for the practitioner),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the practitioner, e.g. a telephone number or an email address.
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>address</b> (Where practitioner can be found/visited).
@@ -501,7 +449,6 @@ public class Practitioner extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
 	 * creating it if it does
@@ -531,7 +478,6 @@ public class Practitioner extends BaseResource implements IResource {
 		myGender = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>gender</b> (Gender for administrative purposes)
 	 *
@@ -574,7 +520,6 @@ public class Practitioner extends BaseResource implements IResource {
 		myBirthDate = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>birthDate</b> (The date and time of birth for the practitioner)
 	 *
@@ -583,8 +528,9 @@ public class Practitioner extends BaseResource implements IResource {
      * The date and time of birth for the practitioner
      * </p> 
 	 */
-	public void setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Practitioner setBirthDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myBirthDate = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -595,8 +541,9 @@ public class Practitioner extends BaseResource implements IResource {
      * The date and time of birth for the practitioner
      * </p> 
 	 */
-	public void setBirthDateWithSecondsPrecision( Date theDate) {
+	public Practitioner setBirthDateWithSecondsPrecision( Date theDate) {
 		myBirthDate = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -643,6 +590,21 @@ public class Practitioner extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>photo</b> (Image of the person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Image of the person
+     * </p> 
+	 */
+	public AttachmentDt getPhotoFirstRep() {
+		if (getPhoto().isEmpty()) {
+			return addPhoto();
+		}
+		return getPhoto().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>organization</b> (The represented organization).
@@ -674,7 +636,6 @@ public class Practitioner extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>role</b> (Roles which this practitioner may perform).
 	 * creating it if it does
@@ -704,7 +665,6 @@ public class Practitioner extends BaseResource implements IResource {
 		myRole = theValue;
 	}
 
-
 	/**
 	 * Add a value for <b>role</b> (Roles which this practitioner may perform)
 	 *
@@ -760,7 +720,6 @@ public class Practitioner extends BaseResource implements IResource {
 		mySpecialty = theValue;
 	}
 
-
 	/**
 	 * Add a value for <b>specialty</b> (Specific specialty of the practitioner)
 	 *
@@ -817,7 +776,6 @@ public class Practitioner extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>location</b> (The location(s) at which this practitioner provides care).
 	 * creating it if it does
@@ -847,7 +805,19 @@ public class Practitioner extends BaseResource implements IResource {
 		myLocation = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>location</b> (The location(s) at which this practitioner provides care)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The location(s) at which this practitioner provides care
+     * </p> 
+	 */
+	public ResourceReferenceDt addLocation() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getLocation().add(newType);
+		return newType; 
+	}
   
 	/**
 	 * Gets the value(s) for <b>qualification</b> (Qualifications obtained by training and certification).
@@ -892,6 +862,21 @@ public class Practitioner extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>qualification</b> (Qualifications obtained by training and certification),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public Qualification getQualificationFirstRep() {
+		if (getQualification().isEmpty()) {
+			return addQualification();
+		}
+		return getQualification().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>communication</b> (A language the practitioner is able to use in patient communication).
@@ -936,6 +921,21 @@ public class Practitioner extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>communication</b> (A language the practitioner is able to use in patient communication),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A language the practitioner is able to use in patient communication
+     * </p> 
+	 */
+	public CodeableConceptDt getCommunicationFirstRep() {
+		if (getCommunication().isEmpty()) {
+			return addCommunication();
+		}
+		return getCommunication().get(0); 
+	}
   
 	/**
 	 * Block class for child element: <b>Practitioner.qualification</b> (Qualifications obtained by training and certification)
@@ -1017,7 +1017,6 @@ public class Practitioner extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>period</b> (Period during which the qualification is valid).
 	 * creating it if it does
@@ -1048,7 +1047,6 @@ public class Practitioner extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>issuer</b> (Organization that regulates and issues the qualification).
 	 * creating it if it does
@@ -1080,7 +1078,6 @@ public class Practitioner extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java

@@ -17,113 +17,24 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.annotation.*;
 
+import ca.uhn.fhir.model.api.BaseResource;
+import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.AddressDt;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
 import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
 import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
+import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
+import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -331,6 +242,21 @@ public class RelatedPerson extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (A Human identifier for this person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Identifier for a person within a particular scope.
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>patient</b> (The patient this person is related to).
@@ -362,7 +288,6 @@ public class RelatedPerson extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>relationship</b> (The nature of the relationship).
 	 * creating it if it does
@@ -392,7 +317,6 @@ public class RelatedPerson extends BaseResource implements IResource {
 		myRelationship = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>relationship</b> (The nature of the relationship)
 	 *
@@ -436,7 +360,6 @@ public class RelatedPerson extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>telecom</b> (A contact detail for the person).
 	 * creating it if it does
@@ -480,6 +403,21 @@ public class RelatedPerson extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (A contact detail for the person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A contact detail for the person, e.g. a telephone number or an email address.
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>gender</b> (Gender for administrative purposes).
@@ -510,7 +448,6 @@ public class RelatedPerson extends BaseResource implements IResource {
 		myGender = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>gender</b> (Gender for administrative purposes)
 	 *
@@ -554,7 +491,6 @@ public class RelatedPerson extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>photo</b> (Image of the person).
 	 * creating it if it does
@@ -598,6 +534,21 @@ public class RelatedPerson extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>photo</b> (Image of the person),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Image of the person
+     * </p> 
+	 */
+	public AttachmentDt getPhotoFirstRep() {
+		if (getPhoto().isEmpty()) {
+			return addPhoto();
+		}
+		return getPhoto().get(0); 
+	}
   
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java

@@ -17,113 +17,33 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IDatatype;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
+import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
 import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
 import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
 import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
+import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
 import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
 import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
-import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -281,6 +201,21 @@ public class Specimen extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (External Identifier),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Id for specimen
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>type</b> (Kind of material that forms the specimen).
@@ -312,7 +247,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>source</b> (Parent of specimen).
 	 * creating it if it does
@@ -356,6 +290,21 @@ public class Specimen extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>source</b> (Parent of specimen),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Parent specimen from which the focal specimen was a component
+     * </p> 
+	 */
+	public Source getSourceFirstRep() {
+		if (getSource().isEmpty()) {
+			return addSource();
+		}
+		return getSource().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>subject</b> (Where the specimen came from. This may be the patient(s) or from the environment or  a device).
@@ -384,7 +333,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>accessionIdentifier</b> (Identifier assigned by the lab).
 	 * creating it if it does
@@ -415,7 +363,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>receivedTime</b> (The time when specimen was received for processing).
 	 * creating it if it does
@@ -445,7 +392,6 @@ public class Specimen extends BaseResource implements IResource {
 		myReceivedTime = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>receivedTime</b> (The time when specimen was received for processing)
 	 *
@@ -454,8 +400,9 @@ public class Specimen extends BaseResource implements IResource {
      * Time when specimen was received for processing or testing
      * </p> 
 	 */
-	public void setReceivedTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Specimen setReceivedTime( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myReceivedTime = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -466,8 +413,9 @@ public class Specimen extends BaseResource implements IResource {
      * Time when specimen was received for processing or testing
      * </p> 
 	 */
-	public void setReceivedTimeWithSecondsPrecision( Date theDate) {
+	public Specimen setReceivedTimeWithSecondsPrecision( Date theDate) {
 		myReceivedTime = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -501,7 +449,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>treatment</b> (Treatment and processing step details).
 	 * creating it if it does
@@ -545,6 +492,21 @@ public class Specimen extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>treatment</b> (Treatment and processing step details),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Details concerning treatment and processing steps for the specimen
+     * </p> 
+	 */
+	public Treatment getTreatmentFirstRep() {
+		if (getTreatment().isEmpty()) {
+			return addTreatment();
+		}
+		return getTreatment().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>container</b> (Direct container of specimen (tube/slide, etc)).
@@ -589,6 +551,21 @@ public class Specimen extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>container</b> (Direct container of specimen (tube/slide, etc)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The container holding the specimen.  The recursive nature of containers; i.e. blood in tube in tray in rack is not addressed here.
+     * </p> 
+	 */
+	public Container getContainerFirstRep() {
+		if (getContainer().isEmpty()) {
+			return addContainer();
+		}
+		return getContainer().get(0); 
+	}
   
 	/**
 	 * Block class for child element: <b>Specimen.source</b> (Parent of specimen)
@@ -662,7 +639,6 @@ public class Specimen extends BaseResource implements IResource {
 		myRelationship = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>relationship</b> (parent | child)
 	 *
@@ -705,7 +681,19 @@ public class Specimen extends BaseResource implements IResource {
 		myTarget = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>target</b> (The subject of the relationship)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * The specimen resource that is the target of this relationship
+     * </p> 
+	 */
+	public ResourceReferenceDt addTarget() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getTarget().add(newType);
+		return newType; 
+	}
   
 
 	}
@@ -815,7 +803,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>comment</b> (Collector comments).
 	 * creating it if it does
@@ -860,18 +847,36 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
 	/**
-	 * Adds a new value for <b>comment</b> (Collector comments)
+	 * Gets the first repetition for <b>comment</b> (Collector comments),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * To communicate any details or issues encountered during the specimen collection procedure.
      * </p> 
 	 */
-	public void addComment( String theString) {
+	public StringDt getCommentFirstRep() {
+		if (getComment().isEmpty()) {
+			return addComment();
+		}
+		return getComment().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>comment</b> (Collector comments)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * To communicate any details or issues encountered during the specimen collection procedure.
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Collection addComment( String theString) {
 		if (myComment == null) {
 			myComment = new java.util.ArrayList<StringDt>();
 		}
 		myComment.add(new StringDt(theString));
+		return this; 
 	}
 
  
@@ -902,7 +907,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>quantity</b> (The quantity of specimen collected).
 	 * creating it if it does
@@ -933,7 +937,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>method</b> (Technique used to perform collection).
 	 * creating it if it does
@@ -963,7 +966,6 @@ public class Specimen extends BaseResource implements IResource {
 		myMethod = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>method</b> (Technique used to perform collection)
 	 *
@@ -1008,7 +1010,6 @@ public class Specimen extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -1091,7 +1092,6 @@ public class Specimen extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (Textual description of procedure)
 	 *
@@ -1100,8 +1100,9 @@ public class Specimen extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public Treatment setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1134,7 +1135,6 @@ public class Specimen extends BaseResource implements IResource {
 		myProcedure = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>procedure</b> (Indicates the treatment or processing step  applied to the specimen)
 	 *
@@ -1177,7 +1177,19 @@ public class Specimen extends BaseResource implements IResource {
 		myAdditive = theValue;
 	}
 
-
+	/**
+	 * Adds and returns a new value for <b>additive</b> (Material used in the processing step)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public ResourceReferenceDt addAdditive() {
+		ResourceReferenceDt newType = new ResourceReferenceDt();
+		getAdditive().add(newType);
+		return newType; 
+	}
   
 
 	}
@@ -1297,6 +1309,21 @@ public class Specimen extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>identifier</b> (Id for the container),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Id for container. There may be multiple; a manufacturer's bar code, lab assigned identifier, etc. The container ID may differ from the specimen id in some circumstances
+     * </p> 
+	 */
+	public IdentifierDt getIdentifierFirstRep() {
+		if (getIdentifier().isEmpty()) {
+			return addIdentifier();
+		}
+		return getIdentifier().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>description</b> (Textual description of the container).
@@ -1327,7 +1354,6 @@ public class Specimen extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (Textual description of the container)
 	 *
@@ -1336,8 +1362,9 @@ public class Specimen extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public Container setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1371,7 +1398,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>capacity</b> (Container volume or size).
 	 * creating it if it does
@@ -1402,7 +1428,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>specimenQuantity</b> (Quantity of specimen within container).
 	 * creating it if it does
@@ -1433,7 +1458,6 @@ public class Specimen extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>additive</b> (Additive associated with container).
 	 * creating it if it does
@@ -1465,7 +1489,6 @@ public class Specimen extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java

@@ -17,113 +17,28 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.primitive.BooleanDt;
+import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.composite.QuantityDt;
+import ca.uhn.fhir.model.dstu.composite.RatioDt;
+import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
+import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
 import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
-import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 
 
 /**
@@ -267,7 +182,6 @@ public class Substance extends BaseResource implements IResource {
 		myType = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>type</b> (What kind of substance this is)
 	 *
@@ -310,7 +224,6 @@ public class Substance extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (Textual description of the substance, comments)
 	 *
@@ -319,8 +232,9 @@ public class Substance extends BaseResource implements IResource {
      * A description of the substance - its appearance, handling requirements, and other usage notes
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public Substance setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -354,7 +268,6 @@ public class Substance extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>ingredient</b> (Composition information about the substance).
 	 * creating it if it does
@@ -398,6 +311,21 @@ public class Substance extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>ingredient</b> (Composition information about the substance),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * A substance can be composed of other substances
+     * </p> 
+	 */
+	public Ingredient getIngredientFirstRep() {
+		if (getIngredient().isEmpty()) {
+			return addIngredient();
+		}
+		return getIngredient().get(0); 
+	}
   
 	/**
 	 * Block class for child element: <b>Substance.instance</b> (If this describes a specific package/container of the substance)
@@ -477,7 +405,6 @@ public class Substance extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>expiry</b> (When no longer valid to use).
 	 * creating it if it does
@@ -507,7 +434,6 @@ public class Substance extends BaseResource implements IResource {
 		myExpiry = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>expiry</b> (When no longer valid to use)
 	 *
@@ -516,8 +442,9 @@ public class Substance extends BaseResource implements IResource {
      * When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
      * </p> 
 	 */
-	public void setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Instance setExpiry( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myExpiry = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -528,8 +455,9 @@ public class Substance extends BaseResource implements IResource {
      * When the substance is no longer valid to use. For some substances, a single arbitrary date is used for expiry.
      * </p> 
 	 */
-	public void setExpiryWithSecondsPrecision( Date theDate) {
+	public Instance setExpiryWithSecondsPrecision( Date theDate) {
 		myExpiry = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -564,7 +492,6 @@ public class Substance extends BaseResource implements IResource {
 
   
 
-
 	}
 
 
@@ -641,7 +568,6 @@ public class Substance extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>substance</b> (A component of the substance).
 	 * creating it if it does
@@ -673,7 +599,6 @@ public class Substance extends BaseResource implements IResource {
 
   
 
-
 	}
 
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java

@@ -17,111 +17,28 @@
 package ca.uhn.fhir.model.dstu.resource;
 
 
-import java.util.*;
+import java.util.Date;
-import ca.uhn.fhir.model.api.*;
+import java.util.List;
-import ca.uhn.fhir.model.api.annotation.*;
 
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
+import ca.uhn.fhir.model.api.BaseElement;
-import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum;
+import ca.uhn.fhir.model.api.BaseResource;
-import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum;
+import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum;
-import ca.uhn.fhir.model.dstu.composite.AttachmentDt;
-import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum;
-import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
-import ca.uhn.fhir.model.dstu.composite.CodingDt;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum;
-import ca.uhn.fhir.model.dstu.composite.ContactDt;
-import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Device;
-import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum;
-import ca.uhn.fhir.model.dstu.resource.Encounter;
-import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum;
-import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum;
-import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
-import ca.uhn.fhir.model.dstu.resource.Group;
-import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
-import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
-import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.ImagingStudy;
-import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Location;
-import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum;
-import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum;
-import ca.uhn.fhir.model.dstu.resource.Media;
-import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Medication;
-import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum;
-import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum;
-import ca.uhn.fhir.model.dstu.valueset.ModalityEnum;
-import ca.uhn.fhir.model.dstu.resource.Observation;
-import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum;
-import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum;
-import ca.uhn.fhir.model.dstu.resource.Organization;
-import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum;
-import ca.uhn.fhir.model.dstu.composite.PeriodDt;
-import ca.uhn.fhir.model.dstu.resource.Practitioner;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum;
-import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum;
-import ca.uhn.fhir.model.dstu.resource.Profile;
-import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum;
-import ca.uhn.fhir.model.dstu.composite.QuantityDt;
-import ca.uhn.fhir.model.dstu.composite.RangeDt;
-import ca.uhn.fhir.model.dstu.composite.RatioDt;
-import ca.uhn.fhir.model.dstu.resource.RelatedPerson;
-import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum;
-import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt;
-import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum;
-import ca.uhn.fhir.model.dstu.composite.SampledDataDt;
-import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
-import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum;
-import ca.uhn.fhir.model.dstu.resource.Specimen;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum;
-import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum;
-import ca.uhn.fhir.model.dstu.resource.Substance;
-import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum;
-import ca.uhn.fhir.model.dstu.resource.ValueSet;
-import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.dstu.composite.DurationDt;
+import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.primitive.Base64BinaryDt;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.api.annotation.Block;
+import ca.uhn.fhir.model.api.annotation.Child;
+import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.api.annotation.ResourceDef;
+import ca.uhn.fhir.model.dstu.composite.ContactDt;
+import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
+import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum;
+import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum;
 import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
-import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
-import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
-import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.OidDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 
@@ -397,7 +314,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myIdentifier = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>identifier</b> (Logical id to reference this value set)
 	 *
@@ -406,8 +322,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The identifier that is used to identify this value set when it is referenced in a specification, model, design or an instance (should be globally unique OID, UUID, or URI)
      * </p> 
 	 */
-	public void setIdentifier( String theString) {
+	public ValueSet setIdentifier( String theString) {
 		myIdentifier = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -440,7 +357,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myVersion = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>version</b> (Logical id for this version of the value set)
 	 *
@@ -449,8 +365,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The identifier that is used to identify this version of the value set when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the profile author manually and the value should be a timestamp
      * </p> 
 	 */
-	public void setVersion( String theString) {
+	public ValueSet setVersion( String theString) {
 		myVersion = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -483,7 +400,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myName = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>name</b> (Informal name for this value set)
 	 *
@@ -492,8 +408,9 @@ public class ValueSet extends BaseResource implements IResource {
      * A free text natural language name describing the value set
      * </p> 
 	 */
-	public void setName( String theString) {
+	public ValueSet setName( String theString) {
 		myName = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -526,7 +443,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myPublisher = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>publisher</b> (Name of the publisher (Organization or individual))
 	 *
@@ -535,8 +451,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The name of the individual or organization that published the value set
      * </p> 
 	 */
-	public void setPublisher( String theString) {
+	public ValueSet setPublisher( String theString) {
 		myPublisher = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -583,6 +500,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>telecom</b> (Contact information of the publisher),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Contacts of the publisher to assist a user in finding and communicating with the publisher
+     * </p> 
+	 */
+	public ContactDt getTelecomFirstRep() {
+		if (getTelecom().isEmpty()) {
+			return addTelecom();
+		}
+		return getTelecom().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>description</b> (Human language description of the value set).
@@ -613,7 +545,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myDescription = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>description</b> (Human language description of the value set)
 	 *
@@ -622,8 +553,9 @@ public class ValueSet extends BaseResource implements IResource {
      * A free text natural language description of the use of the value set - reason for definition, conditions of use, etc.
      * </p> 
 	 */
-	public void setDescription( String theString) {
+	public ValueSet setDescription( String theString) {
 		myDescription = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -656,7 +588,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myCopyright = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>copyright</b> (About the value set or its content)
 	 *
@@ -665,8 +596,9 @@ public class ValueSet extends BaseResource implements IResource {
      * A copyright statement relating to the value set and/or its contents
      * </p> 
 	 */
-	public void setCopyright( String theString) {
+	public ValueSet setCopyright( String theString) {
 		myCopyright = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -699,7 +631,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myStatus = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>status</b> (draft | active | retired)
 	 *
@@ -742,7 +673,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myExperimental = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>experimental</b> (If for testing purposes, not real usage)
 	 *
@@ -751,8 +681,9 @@ public class ValueSet extends BaseResource implements IResource {
      * This valueset was authored for testing purposes (or education/evaluation/marketing), and is not intended to be used for genuine usage
      * </p> 
 	 */
-	public void setExperimental( Boolean theBoolean) {
+	public ValueSet setExperimental( Boolean theBoolean) {
 		myExperimental = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -785,7 +716,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myExtensible = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>extensible</b> (Whether this is intended to be used with an extensible binding)
 	 *
@@ -794,8 +724,9 @@ public class ValueSet extends BaseResource implements IResource {
      * Whether this is intended to be used with an extensible binding or not
      * </p> 
 	 */
-	public void setExtensible( Boolean theBoolean) {
+	public ValueSet setExtensible( Boolean theBoolean) {
 		myExtensible = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -828,7 +759,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myDate = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>date</b> (Date for given status)
 	 *
@@ -837,8 +767,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The date that the value set status was last changed
      * </p> 
 	 */
-	public void setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public ValueSet setDate( Date theDate,  TemporalPrecisionEnum thePrecision) {
 		myDate = new DateTimeDt(theDate, thePrecision); 
+		return this; 
 	}
 
 	/**
@@ -849,8 +780,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The date that the value set status was last changed
      * </p> 
 	 */
-	public void setDateWithSecondsPrecision( Date theDate) {
+	public ValueSet setDateWithSecondsPrecision( Date theDate) {
 		myDate = new DateTimeDt(theDate); 
+		return this; 
 	}
 
  
@@ -884,7 +816,6 @@ public class ValueSet extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>compose</b> (When value set includes codes from elsewhere).
 	 * creating it if it does
@@ -915,7 +846,6 @@ public class ValueSet extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>expansion</b> (When value set is an expansion).
 	 * creating it if it does
@@ -946,7 +876,6 @@ public class ValueSet extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Block class for child element: <b>ValueSet.define</b> (When value set defines its own codes)
 	 *
@@ -1031,7 +960,6 @@ public class ValueSet extends BaseResource implements IResource {
 		mySystem = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>system</b> (URI to identify the code system)
 	 *
@@ -1040,8 +968,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setSystem( String theUri) {
+	public Define setSystem( String theUri) {
 		mySystem = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -1074,7 +1003,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myVersion = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>version</b> (Version of this system)
 	 *
@@ -1083,8 +1011,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The version of this code system that defines the codes. Note that the version is optional because a well maintained code system does not suffer from versioning, and therefore the version does not need to be maintained. However many code systems are not well maintained, and the version needs to be defined and tracked
      * </p> 
 	 */
-	public void setVersion( String theString) {
+	public Define setVersion( String theString) {
 		myVersion = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1117,7 +1046,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myCaseSensitive = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>caseSensitive</b> (If code comparison is case sensitive)
 	 *
@@ -1126,8 +1054,9 @@ public class ValueSet extends BaseResource implements IResource {
      * If code comparison is case sensitive when codes within this system are compared to each other
      * </p> 
 	 */
-	public void setCaseSensitive( Boolean theBoolean) {
+	public Define setCaseSensitive( Boolean theBoolean) {
 		myCaseSensitive = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -1174,6 +1103,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>concept</b> (Concepts in the code system),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public DefineConcept getConceptFirstRep() {
+		if (getConcept().isEmpty()) {
+			return addConcept();
+		}
+		return getConcept().get(0); 
+	}
   
 
 	}
@@ -1269,7 +1213,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myCode = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>code</b> (Code that identifies concept)
 	 *
@@ -1278,8 +1221,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setCode( String theCode) {
+	public DefineConcept setCode( String theCode) {
 		myCode = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -1312,7 +1256,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myAbstract = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>abstract</b> (If this code is not for use as a real concept)
 	 *
@@ -1321,8 +1264,9 @@ public class ValueSet extends BaseResource implements IResource {
      * If this code is not for use as a real concept
      * </p> 
 	 */
-	public void setAbstract( Boolean theBoolean) {
+	public DefineConcept setAbstract( Boolean theBoolean) {
 		myAbstract = new BooleanDt(theBoolean); 
+		return this; 
 	}
 
  
@@ -1355,7 +1299,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myDisplay = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>display</b> (Text to Display to the user)
 	 *
@@ -1364,8 +1307,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setDisplay( String theString) {
+	public DefineConcept setDisplay( String theString) {
 		myDisplay = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1398,7 +1342,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myDefinition = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>definition</b> (Formal Definition)
 	 *
@@ -1407,8 +1350,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The formal definition of the concept. Formal definitions are not required, because of the prevalence of legacy systems without them, but they are highly recommended, as without them there is no formal meaning associated with the concept
      * </p> 
 	 */
-	public void setDefinition( String theString) {
+	public DefineConcept setDefinition( String theString) {
 		myDefinition = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1455,6 +1399,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>concept</b> (Child Concepts (is-a / contains)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public DefineConcept getConceptFirstRep() {
+		if (getConcept().isEmpty()) {
+			return addConcept();
+		}
+		return getConcept().get(0); 
+	}
   
 
 	}
@@ -1553,18 +1512,36 @@ public class ValueSet extends BaseResource implements IResource {
 	}
 
 	/**
-	 * Adds a new value for <b>import</b> (Import the contents of another value set)
+	 * Gets the first repetition for <b>import</b> (Import the contents of another value set),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * Includes the contents of the referenced value set as a part of the contents of this value set
      * </p> 
 	 */
-	public void addImport( String theUri) {
+	public UriDt getImportFirstRep() {
+		if (getImport().isEmpty()) {
+			return addImport();
+		}
+		return getImport().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>import</b> (Import the contents of another value set)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Includes the contents of the referenced value set as a part of the contents of this value set
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public Compose addImport( String theUri) {
 		if (myImport == null) {
 			myImport = new java.util.ArrayList<UriDt>();
 		}
 		myImport.add(new UriDt(theUri));
+		return this; 
 	}
 
  
@@ -1611,6 +1588,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>include</b> (Include one or more codes from a code system),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Include one or more codes from a code system
+     * </p> 
+	 */
+	public ComposeInclude getIncludeFirstRep() {
+		if (getInclude().isEmpty()) {
+			return addInclude();
+		}
+		return getInclude().get(0); 
+	}
   
 	/**
 	 * Gets the value(s) for <b>exclude</b> (Explicitly exclude codes).
@@ -1655,6 +1647,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>exclude</b> (Explicitly exclude codes),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Exclude one or more codes from the value set
+     * </p> 
+	 */
+	public ComposeInclude getExcludeFirstRep() {
+		if (getExclude().isEmpty()) {
+			return addExclude();
+		}
+		return getExclude().get(0); 
+	}
   
 
 	}
@@ -1743,7 +1750,6 @@ public class ValueSet extends BaseResource implements IResource {
 		mySystem = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>system</b> (The system the codes come from)
 	 *
@@ -1752,8 +1758,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The code system from which the selected codes come from
      * </p> 
 	 */
-	public void setSystem( String theUri) {
+	public ComposeInclude setSystem( String theUri) {
 		mySystem = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -1786,7 +1793,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myVersion = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>version</b> (Specific version of the code system referred to)
 	 *
@@ -1795,8 +1801,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The version of the code system that the codes are selected from
      * </p> 
 	 */
-	public void setVersion( String theString) {
+	public ComposeInclude setVersion( String theString) {
 		myVersion = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -1844,18 +1851,36 @@ public class ValueSet extends BaseResource implements IResource {
 	}
 
 	/**
-	 * Adds a new value for <b>code</b> (Code or concept from system)
+	 * Gets the first repetition for <b>code</b> (Code or concept from system),
+	 * creating it if it does not already exist.
 	 *
      * <p>
      * <b>Definition:</b>
      * Specifies a code or concept to be included or excluded. The list of codes is considered ordered, though the order may not have any particular significance
      * </p> 
 	 */
-	public void addCode( String theCode) {
+	public CodeDt getCodeFirstRep() {
+		if (getCode().isEmpty()) {
+			return addCode();
+		}
+		return getCode().get(0); 
+	}
+ 	/**
+	 * Adds a new value for <b>code</b> (Code or concept from system)
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Specifies a code or concept to be included or excluded. The list of codes is considered ordered, though the order may not have any particular significance
+     * </p> 
+     *
+     * @return Returns a reference to this object, to allow for simple chaining.
+	 */
+	public ComposeInclude addCode( String theCode) {
 		if (myCode == null) {
 			myCode = new java.util.ArrayList<CodeDt>();
 		}
 		myCode.add(new CodeDt(theCode));
+		return this; 
 	}
 
  
@@ -1902,6 +1927,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>filter</b> (Select codes/concepts by their properties (including relationships)),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * Select concepts by specify a matching criteria based on the properties (including relationships) defined by the system. If multiple filters are specified, they SHALL all be true.
+     * </p> 
+	 */
+	public ComposeIncludeFilter getFilterFirstRep() {
+		if (getFilter().isEmpty()) {
+			return addFilter();
+		}
+		return getFilter().get(0); 
+	}
   
 
 	}
@@ -1983,7 +2023,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myProperty = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>property</b> ()
 	 *
@@ -1992,8 +2031,9 @@ public class ValueSet extends BaseResource implements IResource {
      * A code that identifies a property defined in the code system
      * </p> 
 	 */
-	public void setProperty( String theCode) {
+	public ComposeIncludeFilter setProperty( String theCode) {
 		myProperty = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -2026,7 +2066,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myOp = theValue;
 	}
 
-
 	/**
 	 * Sets the value(s) for <b>op</b> (= | is-a | is-not-a | regex | in | not in)
 	 *
@@ -2069,7 +2108,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myValue = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>value</b> (Code from the system, or regex criteria)
 	 *
@@ -2078,8 +2116,9 @@ public class ValueSet extends BaseResource implements IResource {
      * The match value may be either a code defined by the system, or a string value which is used a regex match on the literal string of the property value
      * </p> 
 	 */
-	public void setValue( String theCode) {
+	public ComposeIncludeFilter setValue( String theCode) {
 		myValue = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -2167,7 +2206,6 @@ public class ValueSet extends BaseResource implements IResource {
 	}
 
   
-  
 	/**
 	 * Gets the value(s) for <b>timestamp</b> (Time valueset expansion happened).
 	 * creating it if it does
@@ -2197,7 +2235,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myTimestamp = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>timestamp</b> (Time valueset expansion happened)
 	 *
@@ -2206,8 +2243,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
+	public Expansion setTimestampWithMillisPrecision( Date theDate) {
-		myTimestamp = new InstantDt(theDate, thePrecision); 
+		myTimestamp = new InstantDt(theDate); 
+		return this; 
 	}
 
 	/**
@@ -2218,8 +2256,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setTimestampWithMillisPrecision( Date theDate) {
+	public Expansion setTimestamp( Date theDate,  TemporalPrecisionEnum thePrecision) {
-		myTimestamp = new InstantDt(theDate); 
+		myTimestamp = new InstantDt(theDate, thePrecision); 
+		return this; 
 	}
 
  
@@ -2266,6 +2305,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>contains</b> (Codes in the value set),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public ExpansionContains getContainsFirstRep() {
+		if (getContains().isEmpty()) {
+			return addContains();
+		}
+		return getContains().get(0); 
+	}
   
 
 	}
@@ -2354,7 +2408,6 @@ public class ValueSet extends BaseResource implements IResource {
 		mySystem = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>system</b> (System value for the code)
 	 *
@@ -2363,8 +2416,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setSystem( String theUri) {
+	public ExpansionContains setSystem( String theUri) {
 		mySystem = new UriDt(theUri); 
+		return this; 
 	}
 
  
@@ -2397,7 +2451,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myCode = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>code</b> (Code - if blank, this is not a choosable code)
 	 *
@@ -2406,8 +2459,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setCode( String theCode) {
+	public ExpansionContains setCode( String theCode) {
 		myCode = new CodeDt(theCode); 
+		return this; 
 	}
 
  
@@ -2440,7 +2494,6 @@ public class ValueSet extends BaseResource implements IResource {
 		myDisplay = theValue;
 	}
 
-
  	/**
 	 * Sets the value for <b>display</b> (User display for the concept)
 	 *
@@ -2449,8 +2502,9 @@ public class ValueSet extends BaseResource implements IResource {
      * 
      * </p> 
 	 */
-	public void setDisplay( String theString) {
+	public ExpansionContains setDisplay( String theString) {
 		myDisplay = new StringDt(theString); 
+		return this; 
 	}
 
  
@@ -2497,6 +2551,21 @@ public class ValueSet extends BaseResource implements IResource {
 		return newType; 
 	}
 
+	/**
+	 * Gets the first repetition for <b>contains</b> (Codes contained in this concept),
+	 * creating it if it does not already exist.
+	 *
+     * <p>
+     * <b>Definition:</b>
+     * 
+     * </p> 
+	 */
+	public ExpansionContains getContainsFirstRep() {
+		if (getContains().isEmpty()) {
+			return addContains();
+		}
+		return getContains().get(0); 
+	}
   
 
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum AddressUseEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum AdministrativeGenderCodesEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum AdmitSourceEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum AggregationModeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum AnimalSpeciesEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum BindingConformanceEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceEventModeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ConformanceEventModeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceStatementStatusEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ConformanceStatementStatusEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConstraintSeverityEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ConstraintSeverityEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactSystemEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ContactSystemEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactUseEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ContactUseEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DataTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum DataTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderPriorityEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum DiagnosticOrderPriorityEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderStatusEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum DiagnosticOrderStatusEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticReportStatusEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum DiagnosticReportStatusEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentModeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum DocumentModeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterClassEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum EncounterClassEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterReasonCodesEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum EncounterReasonCodesEnum {
 
 	;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterStateEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum EncounterStateEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum EncounterTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EventTimingEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum EventTimingEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExtensionContextEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ExtensionContextEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FHIRDefinedTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum FHIRDefinedTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FilterOperatorEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum FilterOperatorEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/GroupTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum GroupTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/HierarchicalRelationshipTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum HierarchicalRelationshipTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IdentifierUseEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum IdentifierUseEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImagingModalityEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ImagingModalityEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/InstanceAvailabilityEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum InstanceAvailabilityEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LinkTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum LinkTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationModeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum LocationModeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationStatusEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum LocationStatusEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum LocationTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MaritalStatusCodesEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum MaritalStatusCodesEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MediaTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum MediaTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationKindEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum MedicationKindEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageEventEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum MessageEventEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageSignificanceCategoryEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum MessageSignificanceCategoryEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageTransportEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum MessageTransportEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ModalityEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ModalityEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/NameUseEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum NameUseEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationInterpretationCodesEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ObservationInterpretationCodesEnum {
 
 	;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationRelationshipTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ObservationRelationshipTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationReliabilityEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ObservationReliabilityEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationStatusEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ObservationStatusEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrganizationTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum OrganizationTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ParticipantTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum ParticipantTypeEnum {
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PatientRelationshipTypeEnum.java

@@ -1,10 +1,11 @@
 
 package ca.uhn.fhir.model.dstu.valueset;
 
-import ca.uhn.fhir.model.api.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+
 public enum PatientRelationshipTypeEnum {
 
 	;