diff --git a/src/Utilities/TypeHintUtils.php b/src/Utilities/TypeHintUtils.php
index ac91b539..65ad64ab 100644
--- a/src/Utilities/TypeHintUtils.php
+++ b/src/Utilities/TypeHintUtils.php
@@ -30,77 +30,57 @@ class TypeHintUtils
      * @param \DCarbone\PHPFHIR\Version $version
      * @param \DCarbone\PHPFHIR\Enum\PrimitiveTypeEnum $primitiveType
      * @param bool $nullable
+     * @param bool $stringable
      * @return string
      */
-    public static function primitivePHPValueTypeHint(Version $version, PrimitiveTypeEnum $primitiveType, bool $nullable): string
+    public static function primitivePHPValueTypeHint(Version           $version,
+                                                     PrimitiveTypeEnum $primitiveType,
+                                                     bool              $nullable,
+                                                     bool              $stringable = false): string
     {
-        // this assumes the property's value type is a primiive.
-        // it will bomb if not.
-        return sprintf(
-            '%s%s',
-            $nullable ? 'null|' : '',
-            $primitiveType->getPHPReturnValueTypeHint()
-        );
-    }
-
-    public static function primitivePHPReturnValueTypeDoc(Version $version, PrimitiveTypeEnum $primitiveType, bool $nullable, bool $asCollection): string
-    {
-        $hint = $primitiveType->getPHPReturnValueTypeHint();
-
-        if ($asCollection) {
-            return sprintf('%s[]', $hint);
-        }
-
-        if ($nullable) {
-            return sprintf('null|%s', $hint);
-        }
-
-        return $hint;
+        return ($nullable ? 'null|' : '')
+            . ($stringable ? 'string|' : '')
+            . $primitiveType->getPHPReturnValueTypeHint();
     }
 
     /**
      * @param \DCarbone\PHPFHIR\Version $version
      * @param \DCarbone\PHPFHIR\Enum\PrimitiveTypeEnum $primitiveType
      * @param bool $nullable
-     * @param bool $asCollection
+     * @param bool $asArray
+     * @param bool $asVariadic
      * @return string
      */
-    public static function primitivePHPValueTypeSetterDoc(Version $version, PrimitiveTypeEnum $primitiveType, bool $nullable, bool $asCollection): string
+    public static function primitivePHPValueTypeSetterDoc(Version           $version,
+                                                          PrimitiveTypeEnum $primitiveType,
+                                                          bool              $nullable,
+                                                          bool              $asArray = false,
+                                                          bool              $asVariadic = false): string
     {
+        if ($asArray && $asVariadic) {
+            throw new \InvalidArgumentException('Cannot set both array and variadic');
+        }
+        if ($asVariadic && $nullable) {
+            throw new \InvalidArgumentException('Cannot set both nullable and variadic');
+        }
+
         $hintTypes = $primitiveType->getPHPReceiveValueTypeHints();
 
-        if ($asCollection) {
+        if ($asArray) {
             $hintTypes[] = array_map(function (string $v) {
                 return sprintf('%s[]', $v);
             }, $hintTypes);
-        } else if ($nullable) {
-            array_unshift($hintTypes, 'null');
         }
 
-        return implode('|', $hintTypes);
-    }
+        if ($nullable) {
+            array_unshift($hintTypes, 'null');
+        }
 
-    /**
-     * @param \DCarbone\PHPFHIR\Version $version
-     * @param \DCarbone\PHPFHIR\Version\Definition\Property $property
-     * @param bool $nullable
-     * @return string
-     */
-    public static function primitiveValuePropertyTypeHint(Version $version, Property $property, bool $nullable): string
-    {
-        return self::primitivePHPValueTypeHint($version, $property->getMemberOf()->getPrimitiveType(), $nullable);
-    }
+        if ($asVariadic) {
+            return sprintf('...%s', implode('|', $hintTypes));
+        }
 
-    /**
-     * @param \DCarbone\PHPFHIR\Version $version
-     * @param \DCarbone\PHPFHIR\Version\Definition\Property $property
-     * @param bool $nullable
-     * @param bool $asCollection
-     * @return string
-     */
-    public static function primitiveValuePropertyTypeDoc(Version $version, Property $property, bool $nullable, bool $asCollection): string
-    {
-        return self::primitivePHPReturnValueTypeDoc($version, $property->getMemberOf()->getPrimitiveType(), $nullable, $asCollection);
+        return implode('|', $hintTypes);
     }
 
     /**
@@ -109,7 +89,7 @@ public static function primitiveValuePropertyTypeDoc(Version $version, Property
      * @param bool $nullable
      * @return string
      */
-    public static function typeTypeHint(Version $version, Type $type, bool $nullable): string
+    public static function typeHint(Version $version, Type $type, bool $nullable): string
     {
         $tk = $type->getKind();
 
@@ -161,49 +141,52 @@ public static function typeSetterTypeHint(Version $version, Type $type, bool $nu
     }
 
     /**
+     * Compiles base array of hint components for a given FHIR type.
+     *
      * @param \DCarbone\PHPFHIR\Version $version
      * @param \DCarbone\PHPFHIR\Version\Definition\Type $type
-     * @param bool $nullable
-     * @param bool $asCollection
-     * @return string
+     * @param bool $fullyQualified
+     * @return array
      */
-    public static function typeTypeDoc(Version $version, Type $type, bool $nullable, bool $asCollection): string
+    public static function buildBaseHintParts(Version $version, Type $type, bool $fullyQualified): array
     {
-        // if nullable, add to list of additional types
-        $types = [];
-
         // fetch type's kind
         $tk = $type->getKind();
 
-        // if this is an inline resource
-        if ($tk->isOneOf(TypeKindEnum::RESOURCE_INLINE, TypeKindEnum::RESOURCE_CONTAINER)) {
-            $types[] = $version->getFullyQualifiedName(true, PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE);
+        if ($tk->isOneOf(TypeKindEnum::PRIMITIVE, TypeKindEnum::LIST)) {
+            $hintTypes = $type->getPrimitiveType()->getPHPReceiveValueTypeHints();
+        } else if ($tk === TypeKindEnum::PRIMITIVE_CONTAINER) {
+            $ptp = $type->getProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME)->getValueFHIRType();
+            $hintTypes = $ptp->getPrimitiveType()->getPHPReceiveValueTypeHints();
+            array_merge($hintTypes, self::buildBaseHintParts($version, $ptp, $fullyQualified));
+        } else if ($tk->isOneOf(TypeKindEnum::RESOURCE_INLINE, TypeKindEnum::RESOURCE_CONTAINER)) {
+            $hintTypes = [
+                match ($fullyQualified) {
+                    true => $version->getFullyQualifiedName(true, PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE),
+                    false => PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE,
+                },
+            ];
         } else {
-            $types[] = $type->getFullyQualifiedClassName(true);
+            $hintTypes = [
+                match ($fullyQualified) {
+                    true => $type->getFullyQualifiedClassName(true),
+                    false => $type->getClassName(),
+                },
+            ];
         }
 
-        // if this type is a collection, add [] to end of each element
-        if ($asCollection) {
-            $types = array_map(function (string $n): string {
-                return sprintf('%s[]', $n);
-            }, $types);
-        }
-
-        // if this type is nullable, prepend list with 'null'
-        if ($nullable) {
-            array_unshift($types, 'null');
-        }
-
-        return implode('|', $types);
+        return array_unique($hintTypes);
     }
 
     /**
+     * Builds the type hint for a property declaration.
+     *
      * @param \DCarbone\PHPFHIR\Version $version
      * @param \DCarbone\PHPFHIR\Version\Definition\Property $property
      * @param bool $nullable
      * @return string
      */
-    public static function propertyTypeHint(Version $version, Property $property, bool $nullable): string
+    public static function propertyDeclarationHint(Version $version, Property $property, bool $nullable): string
     {
         // if this proprety is a collection, the type hint must be a potentially nullable array
         if ($property->isCollection()) {
@@ -215,64 +198,151 @@ public static function propertyTypeHint(Version $version, Property $property, bo
 
         // if null, the (hopefully) only possibility is that this is a value property for a primitive type
         if (null === $t) {
-            return self::primitiveValuePropertyTypeHint($version, $property, $nullable);
+            return self::primitivePHPValueTypeHint(
+                $version,
+                $property->getMemberOf()->getPrimitiveType(),
+                $nullable,
+            );
         }
 
         // otherwise, hint as the underlying type
-        return self::typeTypeHint($version, $t, $nullable);
+        return self::typeHint($version, $t, $nullable);
     }
 
     /**
+     * Builds a TypeDoc hint for a property when returned from a method.
+     *
      * @param \DCarbone\PHPFHIR\Version $version
      * @param \DCarbone\PHPFHIR\Version\Definition\Property $property
      * @param bool $nullable
      * @return string
      */
-    public static function propertyGetterTypeDoc(Version $version, Property $property, bool $nullable): string
+    public static function propertyGetterTypeDocHint(Version  $version,
+                                                     Property $property,
+                                                     bool     $nullable): string
     {
-        // determine if this property contains a FHIR type or a raw php type
         $t = $property->getValueFHIRType();
         if (null === $t) {
-            return self::primitiveValuePropertyTypeDoc($version, $property, $nullable, $property->isCollection());
+            return self::primitivePHPValueTypeHint(
+                $version,
+                $property->getMemberOf()->getPrimitiveType(),
+                $nullable,
+            );
         }
 
-        return self::typeTypeDoc($version, $t, $nullable, $property->isCollection());
+        $hintTypes = self::buildBaseHintParts($version, $t, false);
+
+        if ($property->isCollection()) {
+            $hintTypes = array_map(fn(string $n) => "{$n}[]", $hintTypes);
+        }
+
+        if ($nullable) {
+            array_unshift($hintTypes, 'null');
+        }
+
+        return implode('|', $hintTypes);
     }
 
     /**
+     * Builds a TypeDoc hint for a property when received as a parameter in a method.
+     *
      * @param \DCarbone\PHPFHIR\Version $version
      * @param \DCarbone\PHPFHIR\Version\Definition\Property $property
-     * @param bool $asCollection
+     * @param bool $nullable
      * @return string
      */
-    public static function propertySetterTypeDoc(Version $version, Property $property, bool $asCollection): string
+    public static function buildConstructorParameterDocHint(Version  $version,
+                                                            Property $property,
+                                                            bool     $nullable): string
     {
-        // determine if this property contains a FHIR type or a raw php type
         $pt = $property->getValueFHIRType();
-        if (null === $pt) {
-            return self::primitiveValuePropertyTypeDoc($version, $property, !$asCollection, $asCollection);
+
+        if ($property->isValueProperty()) {
+            if ($property->getMemberOf()->getKind() !== TypeKindEnum::PRIMITIVE_CONTAINER) {
+                return self::primitivePHPValueTypeHint(
+                    version: $version,
+                    primitiveType: $property->getMemberOf()->getPrimitiveType(),
+                    nullable: $nullable,
+                    stringable: true,
+                );
+            }
+            $hintTypes = [
+                'null',
+            ];
+        } else {
+            $hintTypes = self::buildBaseHintParts($version, $pt, true);
         }
 
+
+
         $ptk = $pt->getKind();
 
-        $hintTypes = ['null'];
+        if ($ptk->isOneOf(TypeKindEnum::PRIMITIVE_CONTAINER)) {
+            $vp = $pt->getProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME);
+            array_push(
+                $hintTypes,
+                $vp->getValueFHIRType()->getFullyQualifiedClassName(true),
+                $pt->getFullyQualifiedClassName(true),
+            );
+        }
+
+        if ($property->isCollection()) {
+            $hintTypes = array_map(fn(string $n) => "{$n}[]", $hintTypes);
+        }
+
+        if ($nullable) {
+            array_unshift($hintTypes, 'null');
+        }
+
+        return implode('|', $hintTypes);
+    }
+
+    /**
+     * @param \DCarbone\PHPFHIR\Version $version
+     * @param \DCarbone\PHPFHIR\Version\Definition\Property $property
+     * @param bool $nullable
+     * @return string
+     */
+    public static function buildConstructorParameterHint(Version  $version,
+                                                         Property $property,
+                                                         bool     $nullable): string
+    {
+        $pt = $property->getValueFHIRType();
+        if (null === $pt) {
+            return self::primitivePHPValueTypeHint(
+                version: $version,
+                primitiveType: $property->getMemberOf()->getPrimitiveType(),
+                nullable: $nullable,
+                stringable: true,
+            );
+        }
+
+        if ($property->isCollection()) {
+            return $nullable ? 'null|array' : 'array';
+        }
 
-        if ($ptk === TypeKindEnum::PRIMITIVE_CONTAINER) {
-            $ptp = $pt->getProperties()->getProperty('value')->getValueFHIRType();
-            $hintTypes = array_merge($hintTypes, $ptp->getPrimitiveType()->getPHPReceiveValueTypeHints());
+        $hintTypes = self::buildBaseHintParts($version, $pt, false);
+
+        $ptk = $pt->getKind();
+
+        if ($ptk->isOneOf(TypeKindEnum::PRIMITIVE_CONTAINER)) {
+            $vp = $pt->getProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME);
             array_push(
                 $hintTypes,
-                self::typeTypeDoc($version, $ptp, false, $asCollection),
-                self::typeTypeDoc($version, $pt, false, $asCollection),
+                $vp->getValueFHIRType()->getClassName(),
+                $pt->getClassName(),
             );
-        } else if ($ptk->isOneOf(TypeKindEnum::PRIMITIVE, TypeKindEnum::LIST)) {
-            $hintTypes = array_merge($hintTypes, $pt->getPrimitiveType()->getPHPReceiveValueTypeHints());
-            $hintTypes[] = self::typeTypeDoc($version, $pt, false, $asCollection);
-        } else {
-            $hintTypes[] = self::typeTypeDoc($version, $pt, false, $asCollection);
         }
 
-        return implode('|', array_unique($hintTypes));
+        if ($property->isCollection()) {
+            $hintTypes = array_map(fn(string $n) => "{$n}[]", $hintTypes);
+        }
+
+        if ($nullable) {
+            array_unshift($hintTypes, 'null');
+        }
+
+        return implode('|', $hintTypes);
     }
 
     /**
diff --git a/template/versions/types/class_default.php b/template/versions/types/class_default.php
index 4e67f3e5..7c0a48d7 100644
--- a/template/versions/types/class_default.php
+++ b/template/versions/types/class_default.php
@@ -61,10 +61,10 @@
     foreach ($type->getProperties()->getGenerator() as $property) : ?>
     /**
 <?php echo DocumentationUtils::compilePropertyDocumentation($property, 5, true); ?>
-     * @var <?php echo TypeHintUtils::propertyGetterTypeDoc($version, $property, true); ?>
+     * @var <?php echo TypeHintUtils::propertyGetterTypeDocHint($version, $property, true); ?>
 
      */
-    protected <?php echo TypeHintUtils::propertyTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = <?php echo $property->isCollection() ? '[]' : 'null'; ?>;
+    protected <?php echo TypeHintUtils::propertyDeclarationHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = <?php echo $property->isCollection() ? '[]' : 'null'; ?>;
 <?php
 // -- end directly implemented properties
     endforeach;
diff --git a/template/versions/types/methods/constructor.php b/template/versions/types/methods/constructor.php
index 4fc9189a..712bad9b 100644
--- a/template/versions/types/methods/constructor.php
+++ b/template/versions/types/methods/constructor.php
@@ -37,43 +37,14 @@
 if ($typeKind->isOneOf(TypeKindeNum::PRIMITIVE, TypeKindEnum::LIST)) :
     $primitiveType = $type->getPrimitiveType();
 
-    if (null !== $parentType) :
-        // only define constructor if this parent has more than just a "value" property.
+    // only define constructor if this primitive does not have a parent.
+    if (null === $parentType) : ?>
 
-        if ($parentType->getKind() !== TypeKindeNum::PRIMITIVE && !$parentType->isValueContainer()) : ?>
-    /**
-     * <?php echo $type->getClassName(); ?> Constructor
-     * @param <?php echo TypeHintUtils::primitivePHPValueTypeSetterDoc($version, $primitiveType, true, false); ?>|array $value
-     */
-    public function __construct(<?php echo TypeHintUtils::primitiveValuePropertyTypeHint($version, $valueProperty, true); ?>|array $value = null)
-    {
-        if (null === $value) {
-            parent::__construct(null);
-        } elseif (is_scalar($value)) {
-            parent::__construct(null);
-            $this->setValue($value);
-        } elseif (is_array($value)) {
-            parent::__construct($value);
-            if (array_key_exists(self::FIELD_VALUE, $value)) {
-                $this->setValue($value[self::FIELD_VALUE]);
-            }
-        } else {
-             throw new \InvalidArgumentException(sprintf(
-                '<?php echo $typeClassName; ?>::__construct - $data expected to be null, <?php echo $primitiveType->getPHPValueTypes(); ?>, or array, %s seen',
-                gettype($value)
-            ));
-        }
-    }
-<?php
-        endif;
-    else :
-        // in all other cases, just set value and move on.
-        ?>
     /**
      * <?php echo $typeClassName; ?> Constructor
      * @param <?php echo TypeHintUtils::primitivePHPValueTypeSetterDoc($version, $primitiveType, true, false); ?> $value
      */
-    public function __construct(<?php echo TypeHintUtils::typeSetterTypeHint($version, $type, true); ?> $value = null)
+    public function __construct(<?php echo TypeHintUtils::buildConstructorParameterHint($version, $valueProperty, true); ?> $value = null)
     {
         $this->setValue($value);
     }
@@ -86,58 +57,37 @@ public function __construct(<?php echo TypeHintUtils::typeSetterTypeHint($versio
 ?>
 
     /**
-     * <?php echo $typeClassName; ?> Constructor
-     * @param null|array $data
-     * @param <?php echo TypeHintUtils::typeSetterTypeHint($version, $valuePropertyType, true); ?>|<?php echo $valuePropertyType->getClassName(); ?> $value
+     * <?php echo $typeClassName; ?> Constructor BOOTY
+     * @param <?php echo TypeHintUtils::buildConstructorParameterDocHint($version, $valueProperty, true); ?> $value
 <?php foreach($type->getAllPropertiesIndexedIterator() as $property) :
     if ($property->isValueProperty()) {
         continue;
     }
     ?>
-     * @param <?php echo TypeHintUtils::propertySetterTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?>
+     * @param <?php echo TypeHintUtils::buildConstructorParameterDocHint($version, $property, true); ?> $<?php echo $property->getName(); ?>
 
 <?php endforeach; if ($type->hasCommentContainerParent() || $type->isCommentContainer()) : ?>
      * @param null|array $fhirComments
 <?php endif; ?>     */
-    public function __construct(null|array $data = null,
-                                <?php echo TypeHintUtils::propertySetterTypeHint($version, $valueProperty, true); ?> $value = null<?php foreach($type->getAllPropertiesIndexedIterator() as $property) :
+    public function __construct(<?php echo TypeHintUtils::buildConstructorParameterHint($version, $valueProperty, true); ?> $value = null<?php foreach($type->getAllPropertiesIndexedIterator() as $property) :
     if ($property->isValueProperty()) {
         continue;
     }
     ?>,
-                                <?php echo TypeHintUtils::propertySetterTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = null<?php endforeach; if ($type->hasCommentContainerParent() || $type->isCommentContainer()) : ?>,
+                                <?php echo TypeHintUtils::buildConstructorParameterHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = null<?php endforeach; if ($type->hasCommentContainerParent() || $type->isCommentContainer()) : ?>,
                                 null|array $fhirComments = null<?php endif; ?>)
     {
 <?php if (null !== $parentType) : ?>
-        parent::__construct(data: $data<?php foreach($type->getParentPropertiesIterator() as $property) : ?>,
-                            <?php echo $property->getName(); ?>: $<?php echo $property->getName(); ?><?php endforeach; ?><?php if ($type->hasCommentContainerParent()) : ?>,
+        parent::__construct(<?php foreach($type->getParentPropertiesIterator() as $i => $property) : if ($i > 0) : ?>,
+                            <?php endif; echo $property->getName(); ?>: $<?php echo $property->getName(); ?><?php endforeach; ?><?php if ($type->hasCommentContainerParent()) : ?>,
                             fhirComments: $fhirComments<?php endif; ?>);
-<?php endif; ?>
-        if (null === $data) {
-            return;
-        }
-        if (is_scalar($data) || $data instanceof <?php echo $typeImports->getImportByType($valuePropertyType); ?>) {
-            $this->setValue($data);
-            return;
-        }<?php if (null !== $parentType) : ?>
-
-        parent::__construct($data);
-<?php endif; ?><?php if (!$type->hasCommentContainerParent() && $type->isCommentContainer()) : ?>
+<?php endif;
+if (!$type->hasCommentContainerParent() && $type->isCommentContainer()) : ?>
 
         if (null !== $fhirComments && [] !== $fhirComments) {
             $this->_setFHIRComments($fhirComments);
-        } else if (isset($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
-            if (is_array($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
-                $this->_setFHIRComments($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS]);
-            } elseif (is_string($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
-                $this->_addFHIRComment($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS]);
-            }
         }<?php endif; ?>
 <?php foreach ($properties->getGenerator() as $property) :
-    if ($property->getOverloadedProperty()) {
-        continue;
-    }
-
     echo require_with(
         PHPFHIR_TEMPLATE_VERSION_TYPES_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'default_property_setter_call.php',
         [
@@ -150,10 +100,9 @@ public function __construct(null|array $data = null,
 
     /**
      * <?php echo $typeClassName; ?> Constructor
-     * @param null|array $data
 <?php if ($type->isValueContainer()) : ?>
 
-     * @param <?php echo TypeHintUtils::propertySetterTypeHint($version, $valueProperty, true); ?> $value = null
+     * @param <?php echo TypeHintUtils::buildConstructorParameterDocHint($version, $valueProperty, true); ?> $value = null
 <?php endif; ?>
 <?php foreach($type->getAllPropertiesIndexedIterator() as $property) :
         $pt = $property->getValueFHIRType();
@@ -161,19 +110,17 @@ public function __construct(null|array $data = null,
             continue;
         }
         ?>
-     * @param <?php echo TypeHintUtils::propertySetterTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?>
+     * @param <?php echo TypeHintUtils::buildConstructorParameterDocHint($version, $property, true); ?> $<?php echo $property->getName(); ?>
 
 <?php endforeach; if ($type->hasCommentContainerParent() && $type->isCommentContainer()) : ?>
      * @param null|array $fhirComments
 <?php endif; ?>     */
-    public function __construct(null|array $data = null<?php if ($type->isValueContainer()) : ?>,
-                                <?php echo TypeHintUtils::propertySetterTypeHint($version, $valueProperty, true);?> $value = null<?php endif; ?>
-<?php foreach($type->getAllPropertiesIndexedIterator() as $property) :
+    public function __construct(<?php if ($type->isValueContainer()) : echo TypeHintUtils::propertySetterTypeHint($version, $valueProperty, true);?> $value = null<?php endif; foreach($type->getAllPropertiesIndexedIterator() as $i => $property) :
         if ($type->isValueContainer() && $property->isValueProperty()) {
             continue;
         }
-    ?>,
-                                <?php echo TypeHintUtils::propertySetterTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = null<?php endforeach; if ($type->hasCommentContainerParent() && $type->isCommentContainer()) : ?>,
+        if ($type->isValueContainer() || $i > 0) : ?>,
+                                <?php endif; echo TypeHintUtils::propertySetterTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = null<?php endforeach; if ($type->hasCommentContainerParent() && $type->isCommentContainer()) : ?>,
                                 null|array $fhirComments = null<?php endif; ?>)
     {
         if (null === $data || [] === $data) {
diff --git a/template/versions/types/methods/constructors/default_property_setter_call.php b/template/versions/types/methods/constructors/default_property_setter_call.php
index a4399709..1a16fca5 100644
--- a/template/versions/types/methods/constructors/default_property_setter_call.php
+++ b/template/versions/types/methods/constructors/default_property_setter_call.php
@@ -21,29 +21,28 @@
 /** @var \DCarbone\PHPFHIR\Version\Definition\Property $property */
 
 $propertyType = $property->getValueFHIRType();
-$fieldConstantName = $property->getFieldConstantName();
+$propertyVarName = "\${$property->getName()}";
+$propertyTypeClassName = $propertyType->getClassName();
+$propertyFieldConst = $property->getFieldConstantName();
+$propertyFieldConstExt = $property->getFieldConstantExtensionName();
+$setter = $property->getSetterName();
 
 $requireArgs = [
     'property' => $property
 ];
 
-ob_start();
-
-if ($propertyType->getKind()->isOneOf(TypeKindEnum::PRIMITIVE, TypeKindEnum::LIST) || $propertyType->hasPrimitiveParent()) :
-    echo require_with(
-        __DIR__ . DIRECTORY_SEPARATOR . 'property_setter_primitive.php',
-        $requireArgs
-    );
-elseif ($propertyType->getKind() === TypeKindEnum::PRIMITIVE_CONTAINER || $propertyType->hasPrimitiveContainerParent() || $propertyType->isValueContainer()) :
-    echo require_with(
-        __DIR__ . DIRECTORY_SEPARATOR . 'property_setter_primitive_container.php',
-        $requireArgs
-    );
-else :
-    echo require_with(
-        __DIR__ . DIRECTORY_SEPARATOR . 'property_setter_default.php',
-        $requireArgs
-    );
-endif;
-
+ob_start(); ?>
+        if (null !== <?php echo $propertyVarName; if ($property->isCollection()) : ?> && [] !== <?php echo $propertyVarName; endif; ?>) {
+<?php if ($property->isCollection()) : ?>
+            foreach(<?php echo $propertyVarName; ?> as $i => $v) {
+                if (!($v instanceof <?php echo $property->getValueFHIRType()->getClassName(); ?>)) {
+                    <?php echo $propertyVarName; ?>[$i] = new <?php echo $property->getValueFHIRType()->getClassName(); ?>($v);
+                }
+            }
+            $this->set<?php echo $property->getName(); ?>(...$v);
+<?php else : ?>
+            $this-><?php echo $setter; ?>(<?php echo $propertyVarName; ?>);
+<?php endif; ?>
+        }
+<?php
 return ob_get_clean();
diff --git a/template/versions/types/methods/constructors/property_setter_default.php b/template/versions/types/methods/constructors/property_setter_default.php
deleted file mode 100644
index 6a62d163..00000000
--- a/template/versions/types/methods/constructors/property_setter_default.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * Copyright 2018-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** @var \DCarbone\PHPFHIR\Version\Definition\Property $property */
-
-$propertyTypeClassName = $property->getValueFHIRType()->getClassName();
-$propertyFieldConst = $property->getFieldConstantName();
-$propertyFieldConstExt = $property->getFieldConstantExtensionName();
-$setter = $property->getSetterName();
-
-ob_start(); ?>
-        if (isset($data[self::<?php echo $propertyFieldConst; ?>]) || array_key_exists(self::<?php echo $propertyFieldConst; ?>, $data)) {
-<?php if ($property->isCollection()) : ?>
-            if (is_array($data[self::<?php echo $propertyFieldConst; ?>])) {
-                foreach($data[self::<?php echo $propertyFieldConst; ?>] as $v) {
-                    if ($v instanceof <?php echo $propertyTypeClassName; ?>) {
-                        $this-><?php echo $setter; ?>($v);
-                    } else {
-                        $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($v));
-                    }
-                }
-            } elseif ($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo $propertyTypeClassName; ?>) {
-                $this-><?php echo $setter; ?>($data[self::<?php echo $propertyFieldConst; ?>]);
-            } else {
-                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($data[self::<?php echo $propertyFieldConst; ?>]));
-            }
-<?php else : ?>
-            if ($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo $propertyTypeClassName; ?>) {
-                $this-><?php echo $setter; ?>($data[self::<?php echo $propertyFieldConst; ?>]);
-            } else {
-                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($data[self::<?php echo $propertyFieldConst; ?>]));
-            }
-<?php endif; ?>
-        }
-<?php
-return ob_get_clean(); ?>
diff --git a/template/versions/types/properties/declaration.php b/template/versions/types/properties/declaration.php
index 8a01374a..d891fc00 100644
--- a/template/versions/types/properties/declaration.php
+++ b/template/versions/types/properties/declaration.php
@@ -26,13 +26,13 @@
 
 ob_start();
 if ('' === $documentation) : ?>
-    /** @var <?php echo TypeHintUtils::propertyGetterTypeDoc($version, $property, true); ?> */
+    /** @var <?php echo TypeHintUtils::propertyGetterTypeDocHint($version, $property, true); ?> */
 <?php else : ?>
     /**
 <?php echo $documentation; ?>
-     * @var <?php echo TypeHintUtils::propertyGetterTypeDoc($version, $property, true); ?>
+     * @var <?php echo TypeHintUtils::propertyGetterTypeDocHint($version, $property, true); ?>
 
      */
 <?php endif; ?>
-    protected <?php echo TypeHintUtils::propertyTypeHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = <?php echo $property->isCollection() ? '[]' : 'null'; ?>;
+    protected <?php echo TypeHintUtils::propertyDeclarationHint($version, $property, true); ?> $<?php echo $property->getName(); ?> = <?php echo $property->isCollection() ? '[]' : 'null'; ?>;
 <?php return ob_get_clean();
diff --git a/template/versions/types/properties/methods/default.php b/template/versions/types/properties/methods/default.php
index 691a77d5..a4f54d3c 100644
--- a/template/versions/types/properties/methods/default.php
+++ b/template/versions/types/properties/methods/default.php
@@ -57,10 +57,10 @@
 <?php echo $documentation; ?>
      *<?php endif; ?>
 
-     * @return <?php echo TypeHintUtils::propertyGetterTypeDoc($version, $property, true); ?>
+     * @return <?php echo TypeHintUtils::propertyGetterTypeDocHint($version, $property, true); ?>
 
      */
-    public function get<?php echo ucfirst($propertyName); ?>(): <?php echo TypeHintUtils::propertyTypeHint($version, $property, true); ?>
+    public function get<?php echo ucfirst($propertyName); ?>(): <?php echo TypeHintUtils::propertyDeclarationHint($version, $property, true); ?>
 
     {
         return $this-><?php echo $propertyName; ?>;
@@ -96,7 +96,7 @@ public function get<?php echo ucfirst($propertyName); ?>Generator(): \Generator
 <?php echo $documentation; ?>
      *<?php endif; ?>
 
-     * @param <?php echo TypeHintUtils::propertySetterTypeDoc($version, $property, false); ?> $<?php echo $propertyName; ?>
+     * @param <?php echo TypeHintUtils::buildConstructorParameterDocHint($version, $property, false); ?> $<?php echo $propertyName; ?>
 
      * @param <?php echo $xmlLocationEnum->getFullyQualifiedName(true); ?> $xmlLocation
      * @return static
@@ -216,7 +216,7 @@ public function set<?php echo ucfirst($propertyName); ?>(array $<?php echo $prop
 <?php echo $documentation; ?>
      *<?php endif; ?>
 
-     * @param <?php echo TypeHintUtils::propertySetterTypeDoc($version, $property, false); ?> $<?php echo $propertyName; ?>
+     * @param <?php echo TypeHintUtils::buildConstructorParameterDocHint($version, $property, false); ?> $<?php echo $propertyName; ?>
 
      * @return static
      */
diff --git a/template/versions/types/properties/methods/primitive.php b/template/versions/types/properties/methods/primitive.php
index 91cc5004..b4ad1f94 100644
--- a/template/versions/types/properties/methods/primitive.php
+++ b/template/versions/types/properties/methods/primitive.php
@@ -27,7 +27,7 @@
 
 ob_start(); ?>
     /**
-     * @return <?php echo TypeHintUtils::primitivePHPReturnValueTypeDoc($version, $primitiveType, true, false); ?>
+     * @return <?php echo TypeHintUtils::primitivePHPValueTypeHint($version, $primitiveType, true); ?>
 
      */
     public function getValue(): <?php echo TypeHintUtils::primitivePHPValueTypeHint($version, $primitiveType, true); ?>
diff --git a/template/versions/types/serialization/json.php b/template/versions/types/serialization/json.php
index efff06af..b66e1dd0 100644
--- a/template/versions/types/serialization/json.php
+++ b/template/versions/types/serialization/json.php
@@ -26,7 +26,13 @@
 ob_start();
 if ($typeKind->isOneOf(TypeKindEnum::PRIMITIVE, TypeKindEnum::LIST)) :
     echo require_with(
-        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'primitive.php',
+        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR
+        . DIRECTORY_SEPARATOR
+        . 'json'
+        . DIRECTORY_SEPARATOR
+        . 'serialize'
+        . DIRECTORY_SEPARATOR
+        . 'primitive.php',
         [
             'version' => $version,
             'type'     => $type,
@@ -34,7 +40,13 @@
     );
 else:
     echo require_with(
-        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'default.php',
+        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR
+        . DIRECTORY_SEPARATOR
+        . 'json'
+        . DIRECTORY_SEPARATOR
+        . 'serialize'
+        . DIRECTORY_SEPARATOR
+        . 'default.php',
         [
             'version' => $version,
             'type' => $type,
diff --git a/template/versions/types/serialization/json/default.php b/template/versions/types/serialization/json/serialize/default.php
similarity index 100%
rename from template/versions/types/serialization/json/default.php
rename to template/versions/types/serialization/json/serialize/default.php
diff --git a/template/versions/types/serialization/json/primitive.php b/template/versions/types/serialization/json/serialize/primitive.php
similarity index 90%
rename from template/versions/types/serialization/json/primitive.php
rename to template/versions/types/serialization/json/serialize/primitive.php
index afc9c003..66ec7be7 100644
--- a/template/versions/types/serialization/json/primitive.php
+++ b/template/versions/types/serialization/json/serialize/primitive.php
@@ -26,7 +26,7 @@
 
 ob_start(); ?>
     /**
-     * @return <?php echo TypeHintUtils::primitivePHPReturnValueTypeDoc($version, $type->getPrimitiveType(), true, false); ?>
+     * @return <?php echo TypeHintUtils::primitivePHPValueTypeHint($version, $type->getPrimitiveType(), true); ?>
 
      */
     public function jsonSerialize(): mixed
diff --git a/template/versions/types/serialization/json/unserialize/default.php b/template/versions/types/serialization/json/unserialize/default.php
new file mode 100644
index 00000000..e69de29b
diff --git a/template/versions/types/methods/constructors/property_setter_primitive.php b/template/versions/types/serialization/json/unserialize/default_property_setter_call.php
similarity index 52%
rename from template/versions/types/methods/constructors/property_setter_primitive.php
rename to template/versions/types/serialization/json/unserialize/default_property_setter_call.php
index 1d01b346..94ac0dbd 100644
--- a/template/versions/types/methods/constructors/property_setter_primitive.php
+++ b/template/versions/types/serialization/json/unserialize/default_property_setter_call.php
@@ -16,12 +16,23 @@
  * limitations under the License.
  */
 
+use DCarbone\PHPFHIR\Enum\TypeKindEnum;
+
 /** @var \DCarbone\PHPFHIR\Version\Definition\Property $property */
 
+$propertyType = $property->getValueFHIRType();
+$propertyTypeClassName = $propertyType->getClassName();
 $propertyFieldConst = $property->getFieldConstantName();
+$propertyFieldConstExt = $property->getFieldConstantExtensionName();
 $setter = $property->getSetterName();
 
-ob_start(); ?>
+$requireArgs = [
+    'property' => $property
+];
+
+ob_start();
+
+if ($propertyType->getKind()->isOneOf(TypeKindEnum::PRIMITIVE, TypeKindEnum::LIST) || $propertyType->hasPrimitiveParent()) :?>
         if (isset($data[self::<?php echo $propertyFieldConst; ?>]) || array_key_exists(self::<?php echo $propertyFieldConst; ?>, $data)) {
 <?php if ($property->isCollection()) : ?>
             if (is_array($data[self::<?php echo $propertyFieldConst; ?>])) {
@@ -45,4 +56,36 @@
 <?php endif; ?>
         }
 <?php
+elseif ($propertyType->getKind() === TypeKindEnum::PRIMITIVE_CONTAINER || $propertyType->hasPrimitiveContainerParent() || $propertyType->isValueContainer()) :
+    echo require_with(
+        __DIR__ . DIRECTORY_SEPARATOR . 'property_setter_primitive_container.php',
+        $requireArgs
+    );
+else : ?>
+        if (isset($data[self::<?php echo $propertyFieldConst; ?>]) || array_key_exists(self::<?php echo $propertyFieldConst; ?>, $data)) {
+<?php if ($property->isCollection()) : ?>
+            if (is_array($data[self::<?php echo $propertyFieldConst; ?>])) {
+                foreach($data[self::<?php echo $propertyFieldConst; ?>] as $v) {
+                    if ($v instanceof <?php echo $propertyTypeClassName; ?>) {
+                        $this-><?php echo $setter; ?>($v);
+                    } else {
+                        $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($v));
+                    }
+                }
+            } elseif ($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo $propertyTypeClassName; ?>) {
+                $this-><?php echo $setter; ?>($data[self::<?php echo $propertyFieldConst; ?>]);
+            } else {
+                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($data[self::<?php echo $propertyFieldConst; ?>]));
+            }
+<?php else : ?>
+            if ($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo $propertyTypeClassName; ?>) {
+                $this-><?php echo $setter; ?>($data[self::<?php echo $propertyFieldConst; ?>]);
+            } else {
+                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($data[self::<?php echo $propertyFieldConst; ?>]));
+            }
+<?php endif; ?>
+        }
+<?php
+endif;
+
 return ob_get_clean();
diff --git a/template/versions/types/serialization/json/unserialize/fhir_comments.php b/template/versions/types/serialization/json/unserialize/fhir_comments.php
new file mode 100644
index 00000000..b6417cce
--- /dev/null
+++ b/template/versions/types/serialization/json/unserialize/fhir_comments.php
@@ -0,0 +1,7 @@
+        if (isset($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
+            if (is_array($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
+                $this->_setFHIRComments($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS]);
+            } elseif (is_string($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
+                $this->_addFHIRComment($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS]);
+            }
+        }
\ No newline at end of file
diff --git a/template/versions/types/serialization/json/unserialize/property_setter_primitive_container.php b/template/versions/types/serialization/json/unserialize/property_setter_primitive_container.php
new file mode 100644
index 00000000..fd41260b
--- /dev/null
+++ b/template/versions/types/serialization/json/unserialize/property_setter_primitive_container.php
@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+
+/*
+ * Copyright 2018-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @var \DCarbone\PHPFHIR\Version\Definition\Property $property */
+
+$propertyTypeClassName = $property->getValueFHIRType()->getClassName();
+$propertyFieldConst = $property->getFieldConstantName();
+$propertyFieldConstExt = $property->getFieldConstantExtensionName();
+$setter = $property->getSetterName();
+
+// these types are a pain in the ass
+
+ob_start(); ?>
+        if (isset($data[self::<?php echo $propertyFieldConst; ?>]) || isset($data[self::<?php echo $propertyFieldConstExt; ?>]) || array_key_exists(self::<?php echo $propertyFieldConst; ?>, $data) || array_key_exists(self::<?php echo $propertyFieldConstExt; ?>, $data)) {
+            $value = $data[self::<?php echo $propertyFieldConst; ?>] ?? null;
+            $ext = (isset($data[self::<?php echo $propertyFieldConstExt; ?>]) && is_array($data[self::<?php echo $propertyFieldConstExt; ?>])) ? $data[self::<?php echo $propertyFieldConstExt; ?>] : [];
+            if (null !== $value) {
+                if ($value instanceof <?php echo $propertyTypeClassName; ?>) {
+                    $this-><?php echo $setter; ?>($value);
+                } else <?php if ($property->isCollection()) : ?>if (is_array($value)) {
+                    foreach($value as $i => $v) {
+                        if ($v instanceof <?php echo $propertyTypeClassName; ?>) {
+                            $this-><?php echo $setter; ?>($v);
+                        } else {
+                            $iext = (isset($ext[$i]) && is_array($ext[$i])) ? $ext[$i] : [];
+                            if (is_array($v)) {
+                                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>(array_merge($v, $iext)));
+                            } else {
+                                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>([<?php echo $propertyTypeClassName; ?>::FIELD_VALUE => $v] + $iext));
+                            }
+                        }
+                    }
+                } else<?php endif; ?>if (is_array($value)) {
+                    $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>(array_merge($ext, $value)));
+                } else {
+                    $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>([<?php echo $propertyTypeClassName; ?>::FIELD_VALUE => $value] + $ext));
+                }
+            } elseif ([] !== $ext) {
+<?php if ($property->isCollection()) : ?>
+                foreach($ext as $iext) {
+                    $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($iext));
+                }
+<?php else : ?>
+                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>($ext));
+<?php endif; ?>
+            } else {
+                $this-><?php echo $setter; ?>(new <?php echo $propertyTypeClassName; ?>(null));
+            }
+        }
+<?php
+return ob_get_clean(); ?>
diff --git a/template/versions/types/serialization/json/unserialize/resource_container_property_setter_call.php b/template/versions/types/serialization/json/unserialize/resource_container_property_setter_call.php
new file mode 100644
index 00000000..a9f54d3a
--- /dev/null
+++ b/template/versions/types/serialization/json/unserialize/resource_container_property_setter_call.php
@@ -0,0 +1,68 @@
+<?php declare(strict_types=1);
+
+/*
+ * Copyright 2018-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @var \DCarbone\PHPFHIR\Version\Definition\Type $type */
+/** @var \DCarbone\PHPFHIR\Version\Definition\Property $property */
+
+$config = $type->getConfig();
+$version = $type->getVersion();
+$typeClassName = $type->getClassName();
+$propertyName = $property->getName();
+$propertyFieldConst = $property->getFieldConstantName();
+$propertyType = $property->getValueFHIRType();
+$setter = ($property->isCollection() ? 'add' : 'set') . ucfirst($propertyName);
+
+ob_start(); ?>
+        if (isset($data[self::<?php echo $propertyFieldConst; ?>])) {
+<?php if ($property->isCollection()) : ?>
+            if (is_array($data[self::<?php echo $propertyFieldConst; ?>])) {
+                if (is_int(key($data[self::<?php echo $propertyFieldConst; ?>]))) {
+                    $this->set<?php echo ucfirst($propertyName); ?>($data[self::<?php echo $propertyFieldConst; ?>]);
+                } else {
+                    $typeClassName = <?php echo PHPFHIR_VERSION_CLASSNAME_VERSION_TYPE_MAP; ?>::getContainedTypeClassNameFromArray($data[self::<?php echo $propertyFieldConst; ?>]);
+                    $d = $data[self::<?php echo $propertyFieldConst; ?>];
+                    unset($d[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_RESOURCE_TYPE]);
+                    $this-><?php echo $setter; ?>(new $typeClassName($d));
+                }
+            } elseif (!is_object($data[self::<?php echo $propertyFieldConst; ?>]) || !($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE; ?>)) {
+                throw new \InvalidArgumentException(sprintf(
+                    '<?php echo $typeClassName; ?> - Field "<?php echo $propertyName; ?>" must be an array of objects implementing <?php echo $version->getFullyQualifiedName(true, PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE); ?>, value of type %s seen',
+                    is_object($data[self::<?php echo $propertyFieldConst; ?>]) ? get_class($data[self::<?php echo $propertyFieldConst; ?>]) : gettype($data[self::<?php echo $propertyFieldConst; ?>])
+                ));
+            } else {
+                $this-><?php echo $setter; ?>($data[self::<?php echo $propertyFieldConst; ?>]);
+            }
+<?php else : ?>
+            if (is_array($data[self::<?php echo $propertyFieldConst; ?>])) {
+                $typeClassName = <?php echo PHPFHIR_VERSION_CLASSNAME_VERSION_TYPE_MAP; ?>::getContainedTypeClassNameFromArray($data[self::<?php echo $propertyFieldConst; ?>]);
+                $d = $data[self::<?php echo $propertyFieldConst; ?>];
+                unset($d[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_RESOURCE_TYPE]);
+                $typeClass = new $typeClassName($d);
+            } else if (!is_object($data[self::<?php echo $propertyFieldConst; ?>]) || !($data[self::<?php echo $propertyFieldConst; ?>] instanceof <?php echo PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE; ?>)) {
+                throw new \InvalidArgumentException(sprintf(
+                    '<?php echo $typeClassName; ?> - Field "<?php echo $propertyName; ?>" must be an array or object implementing <?php echo $version->getFullyQualifiedName(true, PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE); ?>, %s seen',
+                    is_object($data[self::<?php echo $propertyFieldConst; ?>]) ? get_class($data[self::<?php echo $propertyFieldConst; ?>]) : gettype($data[self::<?php echo $propertyFieldConst; ?>])
+                ));
+            } else {
+                $typeClass = $data[self::<?php echo $propertyFieldConst; ?>];
+            }
+            $this-><?php echo $setter; ?>($typeClass);
+<?php endif; ?>
+        }
+<?php
+return ob_get_clean();