diff --git a/files/constants.php b/files/constants.php
index 0ffdb65f..abaf8cf0 100644
--- a/files/constants.php
+++ b/files/constants.php
@@ -121,7 +121,6 @@
 // Core encoding entities
 const PHPFHIR_ENCODING_CLASSNAME_XML_WRITER = 'XMLWriter';
 const PHPFHIR_ENCODING_ENUM_VALUE_XML_LOCATION = 'ValueXMLLocationEnum';
-const PHPFHIR_ENCODING_TRAIT_VALUE_XML_LOCATION = 'ValueXMLLocationTrait';
 const PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG = 'SerializeConfig';
 const PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG = 'UnserializeConfig';
 
diff --git a/src/Enum/TypeKindEnum.php b/src/Enum/TypeKindEnum.php
index 282a366f..9ac79801 100644
--- a/src/Enum/TypeKindEnum.php
+++ b/src/Enum/TypeKindEnum.php
@@ -40,7 +40,6 @@ enum TypeKindEnum: string
     case RESOURCE = 'Resource';
     case RESOURCE_CONTAINER = 'ResourceContainer';
     case RESOURCE_INLINE = 'Resource.Inline';
-    case QUANTITY = 'Quantity';
 
     // this indicates a type that is an immediate child of a resource and not used elsewhere
     case RESOURCE_COMPONENT = 'resource_component';
diff --git a/src/Enum/XMLValueLocationUtils.php b/src/Enum/XMLValueLocationUtils.php
index 3b5f6f06..4de92852 100644
--- a/src/Enum/XMLValueLocationUtils.php
+++ b/src/Enum/XMLValueLocationUtils.php
@@ -25,10 +25,20 @@ class XMLValueLocationUtils
 {
     public static function determineDefaultLocation(Type $type, Property $property, bool $withClass): string
     {
-        $case = match (true) {
-            $property->isValueProperty() && !$type->isQuantity() && !$type->hasQuantityParent() => 'LOCAL_ATTRIBUTE',
-            default => 'ELEMENT',
-        };
+        $propType = $property->getValueFHIRType();
+        if ($propType->isPrimitiveOrListType() || $propType->hasPrimitiveContainerParent()) {
+            $case = match(true) {
+                $type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent() => 'CONTAINER_ATTRIBUTE',
+                default => 'ELEMENT_ATTRIBUTE',
+            };
+        } else if ($property->isValueProperty()) {
+            $case = match (true) {
+                $type->isQuantity() || $type->hasQuantityParent() => 'ELEMENT_ATTRIBUTE',
+                default => 'CONTAINER_ATTRIBUTE',
+            };
+        } else {
+            $case = 'ELEMENT_ATTRIBUTE';
+        }
         if ($withClass) {
             return sprintf('%s::%s', PHPFHIR_ENCODING_ENUM_VALUE_XML_LOCATION, $case);
         }
diff --git a/src/Version/Definition/Type.php b/src/Version/Definition/Type.php
index 6750f9a4..9df2c076 100644
--- a/src/Version/Definition/Type.php
+++ b/src/Version/Definition/Type.php
@@ -828,7 +828,7 @@ public function hasValueContainerParent(): bool
      */
     public function isQuantity(): bool
     {
-        return $this->_kind === TypeKindEnum::QUANTITY;
+        return $this->_fhirName === 'Quantity';
     }
 
     /**
diff --git a/src/Version/Definition/TypeDecorator.php b/src/Version/Definition/TypeDecorator.php
index 419baac0..33ec5483 100644
--- a/src/Version/Definition/TypeDecorator.php
+++ b/src/Version/Definition/TypeDecorator.php
@@ -396,7 +396,7 @@ public static function setValueContainerFlag(Config $config, Types $types): void
             }
 
             // skip "quantity" types, as their "value" is always applied as an element
-            if ($type->getKind()->isOneOf(TypeKindEnum::QUANTITY)) {
+            if ($type->isQuantity()) {
                 continue;
             }
 
diff --git a/template/core/encoding/enum_value_xml_location.php b/template/core/encoding/enum_value_xml_location.php
index a4714729..80e2ed54 100644
--- a/template/core/encoding/enum_value_xml_location.php
+++ b/template/core/encoding/enum_value_xml_location.php
@@ -30,7 +30,8 @@ enum <?php echo PHPFHIR_ENCODING_ENUM_VALUE_XML_LOCATION; ?>
 
 {
     case PARENT_ATTRIBUTE;
-    case LOCAL_ATTRIBUTE;
-    case ELEMENT;
+    case CONTAINER_ATTRIBUTE;
+    case ELEMENT_ATTRIBUTE;
+    case ELEMENT_VALUE;
 }
 <?php return ob_get_clean();
diff --git a/template/core/encoding/trait_value_xml_location.php b/template/core/encoding/trait_value_xml_location.php
deleted file mode 100644
index 523af29f..00000000
--- a/template/core/encoding/trait_value_xml_location.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * Copyright 2024-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\Config $config */
-/** @var \DCarbone\PHPFHIR\CoreFile $coreFile */
-
-$coreFiles = $config->getCoreFiles();
-
-$valueXMLLocationEnum = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_ENUM_VALUE_XML_LOCATION);
-
-ob_start();
-
-echo '<?php ';?>declare(strict_types=1);
-
-namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;
-
-<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>
-
-trait <?php echo PHPFHIR_ENCODING_TRAIT_VALUE_XML_LOCATION; ?>
-
-{
-    private <?php echo $valueXMLLocationEnum->getEntityName(); ?> $_valueLoc;
-
-    /**
-     * Set the XML location of this element's value when serializing
-     *
-     * @param <?php echo $valueXMLLocationEnum->getFullyQualifiedName(true); ?> $valueXMLLocation
-     */
-    public function _setValueXMLLocation(<?php echo $valueXMLLocationEnum->getEntityName(); ?> $valueXMLLocation): void
-    {
-        $this->_valueLoc = $valueXMLLocation;
-    }
-
-    /**
-     * @return null|<?php echo $valueXMLLocationEnum->getFullyQualifiedName(true); ?>
-
-     */
-    public function _getValueXMLLocation(): null|<?php echo $valueXMLLocationEnum->getEntityName(); ?>
-
-    {
-        return $this->_valueLoc ?? null;
-    }
-}
-<?php return ob_get_clean();
diff --git a/template/core/types/interface_element_type.php b/template/core/types/interface_element_type.php
index c9f5b9fb..085134ab 100644
--- a/template/core/types/interface_element_type.php
+++ b/template/core/types/interface_element_type.php
@@ -65,11 +65,9 @@ public static function xmlUnserialize(\SimpleXMLElement $element,
     /**
      * @param <?php echo $xmlWriterClass->getFullyQualifiedName(true); ?> $xw
      * @param <?php echo $serializeConfigClass->getFullyQualifiedName(true); ?> $config
-     * @return <?php echo $xmlWriterClass->getFullyQualifiedName(true); ?>
-
      */
     public function xmlSerialize(<?php echo $xmlWriterClass->getEntityName(); ?> $xw,
-                                 <?php echo $serializeConfigClass->getEntityName(); ?> $config): <?php echo $xmlWriterClass->getEntityName(); ?>;
+                                 <?php echo $serializeConfigClass->getEntityName(); ?> $config): void;
 
     /**
      * @param array $json Decoded JSON
diff --git a/template/core/types/interface_value_container_type.php b/template/core/types/interface_value_container_type.php
index 49d690a7..a43d1e26 100644
--- a/template/core/types/interface_value_container_type.php
+++ b/template/core/types/interface_value_container_type.php
@@ -68,12 +68,10 @@ public function _nonValueFieldDefined(): bool;
      * @param <?php echo $xmlWriterClass->getFullyQualifiedName(true); ?> $xw
      * @param <?php echo $serializeConfigClass->getFullyQualifiedName(true); ?> $config
      * @param null|<?php echo $xmlValueLocationEnum->getFullyQualifiedName(true); ?> $valueLocation
-     * @return <?php echo $xmlWriterClass->getFullyQualifiedName(true); ?>
-
      */
     public function xmlSerialize(<?php echo $xmlWriterClass->getEntityName(); ?> $xw,
                                  <?php echo $serializeConfigClass->getEntityName(); ?> $config,
-                                 null|<?php echo $xmlValueLocationEnum->getEntityName(); ?> $valueLocation = null): <?php echo $xmlWriterClass->getEntityName(); ?>;
+                                 null|<?php echo $xmlValueLocationEnum->getEntityName(); ?> $valueLocation = null): void;
 }
 
 <?php return ob_get_clean();
diff --git a/template/versions/types/class_default.php b/template/versions/types/class_default.php
index 2fed7e55..4bb2b066 100644
--- a/template/versions/types/class_default.php
+++ b/template/versions/types/class_default.php
@@ -221,8 +221,6 @@ public function _nonValueFieldDefined(): bool
             'type'     => $type,
         ]
     );
-
-    echo "\n";
 endif;
 
 if ($type->hasLocalProperties()) :
diff --git a/template/versions/types/properties/methods/default.php b/template/versions/types/properties/methods/default.php
index f2bac3f9..5886aeee 100644
--- a/template/versions/types/properties/methods/default.php
+++ b/template/versions/types/properties/methods/default.php
@@ -71,19 +71,22 @@ public function get<?php echo ucfirst($propertyName); ?>(): <?php echo TypeHintU
     {
         return $this-><?php echo $propertyName; ?> ?? <?php if ($property->isCollection()) : ?>[]<?php else : ?>null<?php endif; ?>;
     }
-<?php if ($isCollection) : ?>
+<?php
+    // start collection iterator getter
+    if ($isCollection) : ?>
 
     /**
      * @return \ArrayIterator<<?php echo $propType->getFullyQualifiedClassName(true); ?>>
      */
     public function get<?php echo ucfirst($propertyName); ?>Iterator(): iterable
     {
-        if (!isset($this-><?php echo $propertyName; ?>) || [] === $this-><?php echo $propertyName; ?>) {
+        if (!isset($this-><?php echo $propertyName; ?>)) {
             return new \EmptyIterator();
         }
         return new \ArrayIterator($this-><?php echo $propertyName; ?>);
     }
 <?php
+    // end collection iterator getter
     endif;
 
 // end getter methods
@@ -98,48 +101,61 @@ public function get<?php echo ucfirst($propertyName); ?>Iterator(): iterable
 
      * @param <?php echo TypeHintUtils::buildSetterParameterDocHint($version, $property, !$property->isCollection(), true); ?> $<?php echo $propertyName; ?>
 
-<?php if ($property->isSerializableAsXMLAttribute()) : ?>
+<?php
+    if ($property->isSerializableAsXMLAttribute()) : ?>
      * @param <?php echo $valueXMLLocationEnum->getFullyQualifiedName(true); ?> $valueXMLLocation
-<?php endif; ?>
+<?php
+    endif; ?>
      * @return static
      */
     public function <?php echo $property->getSetterName(); ?>(<?php echo TypeHintUtils::buildSetterParameterHint($version, $property, !$property->isCollection(), true); ?> $<?php echo $property; if ($property->isSerializableAsXMLAttribute()) : ?>,
                      <?php echo str_repeat(' ', strlen($property->getSetterName()));
                         echo $valueXMLLocationEnum->getEntityName(); ?> $valueXMLLocation = <?php echo XMLValueLocationUtils::determineDefaultLocation($type, $property, true); endif ?>): self
     {
-<?php if (!$property->isCollection()) : ?>
+<?php
+    if (!$property->isCollection()) : ?>
         if (null === $<?php echo $propertyName; ?>) {
             unset($this-><?php echo $propertyName; ?>);
             return $this;
         }
-<?php endif;
-if ($propType->isPrimitiveContainer() || $propType->isPrimitiveOrListType()) : ?>
+<?php
+    endif;
+    if ($propType->isPrimitiveContainer() || $propType->isPrimitiveOrListType()) : ?>
         if (!($<?php echo $propertyName; ?> instanceof <?php echo $propTypeClassname; ?>)) {
             $<?php echo $propertyName; ?> = new <?php echo $propTypeClassname; ?>(value: $<?php echo $propertyName; ?>);
         }
 <?php
-elseif ($propTypeKind->isResourceContainer($version)) : ?>
+    elseif ($propTypeKind->isResourceContainer($version)) : ?>
         if ($<?php echo $propertyName; ?> instanceof <?php echo $versionContainerType->getClassName(); ?>) {
             $<?php echo $propertyName; ?> = $<?php echo $propertyName; ?>->getContainedType();
         }
-<?php endif;
+<?php
+    endif;
     if ($property->isCollection()) : ?>
         if (!isset($this-><?php echo $propertyName; ?>)) {
             $this-><?php echo $propertyName; ?> = [];
         }
-<?php endif;
-if ($propTypeKind === TypeKindEnum::PHPFHIR_XHTML) : ?>
+<?php
+    endif;
+    if ($propTypeKind === TypeKindEnum::PHPFHIR_XHTML) : ?>
         if (!($<?php echo $propertyName; ?> instanceof <?php echo $propTypeClassname; ?>)) {
             $<?php echo $propertyName; ?> = new <?php echo $propTypeClassname; ?>($<?php echo $propertyName; ?>);
         }
-<?php endif; ?>
+<?php
+    endif; ?>
         $this-><?php echo $propertyName; echo $isCollection ? '[]' : ''; ?> = $<?php echo $propertyName; ?>;
-<?php if ($property->isSerializableAsXMLAttribute()) : ?>
-        $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>] = $valueXMLLocation;
-<?php endif; ?>
+<?php
+    if ($property->isSerializableAsXMLAttribute()) : ?>
+        if ($this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>] !== $valueXMLLocation) {
+            $this->_set<?php echo ucfirst($property->getName()); ?>ValueXMLLocation($valueXMLLocation);
+        }
+<?php
+    endif; ?>
         return $this;
     }
-<?php   if ($isCollection) : ?>
+<?php
+    // start collection setter method
+    if ($isCollection) : ?>
 
     /**<?php if ('' !== $documentation) : ?>
 
@@ -152,7 +168,12 @@ public function <?php echo $property->getSetterName(); ?>(<?php echo TypeHintUti
      */
     public function set<?php echo ucfirst($propertyName); ?>(<?php echo TypeHintUtils::buildSetterParameterHint($version, $property, false, true); ?> ...$<?php echo $propertyName; ?>): self
     {
-<?php if ($propType->isValueContainer()) : ?>
+        if ([] === $<?php echo $propertyName; ?>) {
+            unset($this-><?php echo $propertyName; ?>);
+            return $this;
+        }
+<?php
+        if ($propType->isValueContainer()) : ?>
         $this-><?php echo $propertyName; ?> = [];
         foreach($<?php echo $propertyName; ?> as $v) {
             if ($v instanceof <?php echo $propTypeClassname; ?>) {
@@ -161,13 +182,18 @@ public function set<?php echo ucfirst($propertyName); ?>(<?php echo TypeHintUtil
                 $this-><?php echo $propertyName; ?>[] = new <?php echo $propTypeClassname; ?>(value: $v);
             }
         }
-<?php else : ?>
+<?php
+        else : ?>
         $this-><?php echo $propertyName; ?> = $<?php echo $propertyName; ?>;
-<?php endif; ?>
+<?php
+        endif; ?>
         return $this;
     }
-<?php   endif;
-if ($property->isSerializableAsXMLAttribute()) : ?>
+<?php
+    // end collection setter method
+    endif;
+
+    if ($property->isSerializableAsXMLAttribute()) : ?>
 
     /**
      * Return the current location the "value" field of the <?php echo $property->getName(); ?> element will be placed
@@ -191,6 +217,21 @@ public function _get<?php echo ucfirst($propertyName); ?>ValueXMLLocation() : <?
      */
     public function _set<?php echo ucfirst($propertyName); ?>ValueXMLLocation(<?php echo $valueXMLLocationEnum->getEntityName(); ?> $valueXMLLocation) : self
     {
+<?php if ($type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent()) : ?>
+        if (<?php echo $valueXMLLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE === $valueXMLLocation) {
+            throw new \InvalidArgumentException(sprintf(
+                'Cannot set "%s" as value XML serialize location for property "<?php echo $propertyName; ?>" on value container type "<?php echo $type->getFHIRName(); ?>"',
+                $valueXMLLocation->name,
+            ));
+        }
+<?php elseif ($propType->isPrimitiveOrListType() || $propType->hasprimitiveType()) : ?>
+        if (<?php echo $valueXMLLocationEnum->getEntityName(); ?>::CONTAINER_ATTRIBUTE === $valueXMLLocation) {
+            throw new \InvalidArgumentException(sprintf(
+                'Cannot set "%s" as value XML serialize location for primitive property "<?php echo $propertyName; ?>" on type "<?php echo $type->getfhirName(); ?>"',
+                $valueXMLLocation->name,
+            ));
+        }
+<?php endif; ?>
         $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>] = $valueXMLLocation;
         return $this;
     }
@@ -211,7 +252,7 @@ public function _set<?php echo ucfirst($propertyName); ?>ValueXMLLocation(<?php
      */
     public function _getFormattedValue(): string
     {
-        return (string)($this->getValue()?->_getFormattedValue());
+        return isset($this-><?php echo $valueProp->getName(); ?>) ? $this-><?php echo $valueProp->getName(); ?>->_getFormattedValue() : '';
     }
 <?php endif;
 
diff --git a/template/versions/types/serialization/xml.php b/template/versions/types/serialization/xml.php
index 3680d5fb..f955798d 100644
--- a/template/versions/types/serialization/xml.php
+++ b/template/versions/types/serialization/xml.php
@@ -62,7 +62,8 @@
         'type' => $type,
     ]
 );
-?>
+
+if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>
         if (isset($rootOpened) && $rootOpened) {
             $xw->endElement();
         }
@@ -70,5 +71,6 @@
             $xw->endDocument();
         }
         return $xw;
+<?php endif; ?>
     }
 <?php return ob_get_clean();
diff --git a/template/versions/types/serialization/xml/serialize/body.php b/template/versions/types/serialization/xml/serialize/body.php
index e9fbe068..3d899cfc 100644
--- a/template/versions/types/serialization/xml/serialize/body.php
+++ b/template/versions/types/serialization/xml/serialize/body.php
@@ -35,40 +35,18 @@
 
     $propType = $property->getValueFHIRType();
 
-    // a "value" property may be serialized as an attribute on the containing type's parent node, an attribute on the
-    // containing type's node, or as a child element of the containing type's node.
-    //
-    // this defaults to being controlled by the containing node, unless the parent node explicitly passes the
-    // "parent_attribute" value enum into the xml serialize func of the containing type.
-    //
-    // "value" properties are the only types of properties that respect the "valueLocation" parameter on value
-    // container xml serialize funcs.
     if ($property->isValueProperty()) :
-        // if this is a value container type, we need to only serialize our value as an attribute on our node
-        // if, and only if, the $valueLocation parameter is == "local_attribute" or is null and our internal
-        // location map defines it as "local_attribute"
         if ($type->isValueContainer() || $type->hasValueContainerParent()) : ?>
-        if (isset($this-><?php echo $property->getName(); ?>)
-            && (<?php echo $xmlLocationEnum->getEntityName(); ?>::LOCAL_ATTRIBUTE === $valueLocation
-                || (null === $valueLocation
-                    && <?php echo $xmlLocationEnum->getEntityName(); ?>::LOCAL_ATTRIBUTE === $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]))) {
+        if (isset($this-><?php echo $property->getName(); ?>) && <?php echo $xmlLocationEnum->getEntityName(); ?>::CONTAINER_ATTRIBUTE === $valueLocation) {
             $xw->writeAttribute(self::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
         }
 <?php
-        // if this is _not_ a value container type, we must only apply this attribute to the local type if and only if
-        // our local location map places it at "parent_attribute".
         else : ?>
         if (isset($this-><?php echo $property->getName(); ?>) && <?php echo $xmlLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE === $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]) {
             $xw->writeAttribute(self::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
         }
 <?php   endif;
-
-    elseif ($propType->isPrimitiveOrListType() || $propType->hasPrimitiveOrListParent()) : ?>
-        if (isset($this-><?php echo $property->getName(); ?>) && <?php echo $xmlLocationEnum->getEntityName(); ?>::LOCAL_ATTRIBUTE === $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]) {
-            $xw->writeAttribute(self::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
-        }
-<?php
-    elseif ($propType->isValueContainer() || $propType->hasValueContainerParent()) : ?>
+    elseif ($propType->isValueContainer() || $propType->hasValueContainerParent() || $propType->isPrimitiveOrListType() || $propType->hasPrimitiveOrListParent()) : ?>
         if (isset($this-><?php echo $property->getName(); ?>) && <?php echo $xmlLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE === $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]) {
             $xw->writeAttribute(self::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
         }
@@ -96,14 +74,15 @@
     $propTypeKind = $propType->getKind();
 
     // value property start
-    if (!$property->isCollection() && $property->isValueProperty() && $type->isPrimitiveContainer()) : ?>
-        if (isset($this-><?php echo $property->getName(); ?>)
-            && (<?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT === $valueLocation
-                || (null === $valueLocation
-                    && $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>] === <?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT))) {
-            $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
-            $xw->writeAttribute($this-><?php echo $property->getName(); ?>::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
-            $xw->endElement();
+    if (!$property->isCollection() && $property->isValueProperty() && ($type->isValueContainer() || $type->hasValueContainerParent())) : ?>
+        if (isset($this-><?php echo $property->getName(); ?>)) {
+            if (<?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT_ATTRIBUTE === $valueLocation) {
+                $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
+                $xw->writeAttribute(<?php echo $propType->getClassName(); ?>::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
+                $xw->endElement();
+            } else if (<?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT_VALUE === $valueLocation) {
+                $xw->writeElement(self::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
+            }
         }
 <?php
     // value property end
@@ -132,8 +111,8 @@
     // resource container end
 
     // primitive type start
-    elseif ($propType->hasPrimitiveOrListParent() || $propType->isPrimitiveOrListType()) : ?>
-<?php    if ($property->isCollection()) : ?>
+    elseif ($propType->hasPrimitiveOrListParent() || $propType->isPrimitiveOrListType()) :
+        if ($property->isCollection()) : ?>
         if (isset($this-><?php echo $property->getName(); ?>) && [] !== $this-><?php echo $property->getName(); ?>) {
             foreach($this-><?php echo $property->getName(); ?> as $v) {
                 $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
@@ -142,17 +121,21 @@
             }
         }
 <?php   else : ?>
-        if (isset($this-><?php echo $property->getName(); ?>) && $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>] === <?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT) {
-            $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
-            $xw->writeAttribute($this-><?php echo $property->getName(); ?>::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
-            $xw->endElement();
+        if (isset($this-><?php echo $property->getName(); ?>)) {
+            if (<?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT_ATTRIBUTE === $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]) {
+                $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
+                $xw->writeAttribute(<?php echo $propType->getClassName(); ?>::FIELD_VALUE, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
+                $xw->endElement();
+            } else if (<?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT_VALUE === $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]) {
+                $xw->writeElement(self::<?php echo $property->getFieldConstantName(); ?>, $this-><?php echo $property->getName(); ?>->_getFormattedValue());
+            }
         }
 <?php   endif;
     // primitive type end
 
     // primitive container start
-    elseif ($propType->isPrimitiveContainer()) : ?>
-<?php    if ($property->isCollection()) : ?>
+    elseif ($propType->isValueContainer() || $propType->hasValueContainerParent()) :
+        if ($property->isCollection()) : ?>
         if (isset($this-><?php echo $property->getName(); ?>) && [] !== $this-><?php echo $property->getName(); ?>) {
             foreach($this-><?php echo $property->getName(); ?> as $v) {
                 $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
@@ -162,7 +145,7 @@
         }
 <?php   else : ?>
         if (isset($this-><?php echo $property->getName(); ?>)
-            && ($this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>] === <?php echo $xmlLocationEnum->getEntityName(); ?>::ELEMENT
+            && (<?php echo $xmlLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE !== $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]
                 || $this-><?php echo $property->getName(); ?>->_nonValueFieldDefined())) {
             $xw->startElement(self::<?php echo $property->getFieldConstantName(); ?>);
             $this-><?php echo $property->getName(); ?>->xmlSerialize($xw, $config, $this->_valueXMLLocations[self::<?php echo $property->getFieldConstantName(); ?>]);
diff --git a/template/versions/types/serialization/xml/serialize/header.php b/template/versions/types/serialization/xml/serialize/header.php
index 4a0544cf..26fd4f8c 100644
--- a/template/versions/types/serialization/xml/serialize/header.php
+++ b/template/versions/types/serialization/xml/serialize/header.php
@@ -33,19 +33,23 @@
 
 ob_start(); ?>
     /**
-     * @param null|<?php echo $xmlWriterClass->getFullyQualifiedName(true); ?> $xw
-     * @param null|<?php echo $serializeConfigClass->getFullyQualifiedName(true); ?> $config
+     * @param <?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>null|<?php endif; echo $xmlWriterClass->getFullyQualifiedName(true); ?> $xw
+     * @param <?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>null|<?php endif; echo $serializeConfigClass->getFullyQualifiedName(true); ?> $config
 <?php if ($type->isValueContainer() || $type->hasValueContainerParent()) : ?>
      * @param null|<?php echo $xmlLocationEnum->getFullyQualifiedName(true); ?> $valueLocation
 <?php endif; ?>
+<?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>
      * @return <?php echo $xmlWriterClass->getFullyQualifiedName(true); ?>
 
+<?php endif; ?>
      */
-    public function xmlSerialize(null|<?php echo $xmlWriterClass->getEntityName(); ?> $xw = null,
-                                 null|<?php echo $serializeConfigClass->getEntityName(); ?> $config = null<?php if ($type->isValueContainer() || $type->hasValueContainerParent()) : ?>,
-                                 null|<?php echo $xmlLocationEnum->getEntityName(); ?> $valueLocation = null<?php endif; ?>): <?php echo $xmlWriterClass->getEntityName(); ?>
+    public function xmlSerialize(<?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>null|<?php endif;  echo $xmlWriterClass->getEntityName(); ?> $xw<?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?> = null<?php endif; ?>,
+                                 <?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>null|<?php endif; echo $serializeConfigClass->getEntityName(); ?> $config<?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?> = null<?php endif;
+    if ($type->isValueContainer() || $type->hasValueContainerParent()) : ?>,
+                                 null|<?php echo $xmlLocationEnum->getEntityName(); ?> $valueLocation = null<?php endif; ?>): <?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : echo $xmlWriterClass->getEntityName(); else : ?>void<?php endif; ?>
 
     {
+<?php if ($type->isResourceType() || $type->hasResourceTypeParent()) : ?>
         if (null === $config) {
             $config = (new <?php echo $versionClass->getEntityName(); ?>())->getConfig()->getSerializeConfig();
         }
@@ -63,4 +67,8 @@ public function xmlSerialize(null|<?php echo $xmlWriterClass->getEntityName(); ?
             $rootOpened = true;
             $xw->openRootNode('<?php echo NameUtils::getTypeXMLElementName($type); ?>', $this->_getSourceXMLNS());
         }
-<?php return ob_get_clean();
\ No newline at end of file
+<?php elseif ($type->isValueContainer() || $type->hasValueContainerParent()) : ?>
+        $valueLocation = $valueLocation ?? $this->_valueXMLLocations[self::FIELD_VALUE];
+<?php endif;
+
+return ob_get_clean();
diff --git a/template/versions/types/serialization/xml/unserialize/body.php b/template/versions/types/serialization/xml/unserialize/body.php
index 83198934..d21b9a31 100644
--- a/template/versions/types/serialization/xml/unserialize/body.php
+++ b/template/versions/types/serialization/xml/unserialize/body.php
@@ -17,7 +17,6 @@
  */
 
 use DCarbone\PHPFHIR\Enum\TypeKindEnum;
-use DCarbone\PHPFHIR\Enum\XMLValueLocationUtils;
 
 /** @var \DCarbone\PHPFHIR\Version $version */
 /** @var \DCarbone\PHPFHIR\Version\Definition\Type $type */
@@ -29,38 +28,36 @@
 $containedTypeInterface = $version->getCoreFiles()->getCoreFileByEntityName(PHPFHIR_VERSION_INTERFACE_VERSION_CONTAINED_TYPE);
 
 ob_start(); ?>
-        foreach ($element->children() as $n) {
-            $childName = $n->getName();
+        foreach ($element->children() as $ce) {
+            $cen = $ce->getName();
 <?php foreach ($type->getAllPropertiesIndexedIterator() as $i => $property) :
     $propType = $property->getValueFHIRType();
     $propTypeKind = $propType->getKind();
     $setter = $property->getSetterName();
     $propConst = $property->getFieldConstantName();
 
-    if ($i > 0) : ?> else <?php else : ?>            <?php endif; ?>if (self::<?php echo $propConst; ?> === $childName) {
-<?php   if ($propType->isPrimitiveOrListType()) : ?>
-                $valueAttr = $n->attributes()[<?php echo $propType->getClassName(); ?>::FIELD_VALUE] ?? null;
-                if (null !== $valueAttr) {
-                    $value = (string)$valueAttr;
+    if ($i > 0) : ?> else <?php else : ?>            <?php endif; ?>if (self::<?php echo $propConst; ?> === $cen) {
+<?php   if ($propType->isPrimitiveOrListType() || $propType->hasPrimitiveOrListParent()) : ?>
+                $va = $ce->attributes()[<?php echo $propType->getClassName(); ?>::FIELD_VALUE] ?? null;
+                if (null !== $va) {
+                    $type-><?php echo $setter; ?>((string)$va, <?php echo $valueXMLLocationEnum->getEntityName(); ?>::ELEMENT_ATTRIBUTE);
                 } else {
-                    $value = (string)$n;
+                    $type-><?php echo $setter; ?>((string)$ce, <?php echo $valueXMLLocationEnum->getEntityName(); ?>::ELEMENT_VALUE);
                 }
-                $type-><?php echo $setter; ?>($value, <?php echo $valueXMLLocationEnum->getEntityName(); ?>::ELEMENT);
 <?php   elseif ($propTypeKind->isResourceContainer($version)) : ?>
-                foreach ($n->children() as $nn) {
+                foreach ($ce->children() as $cen) {
                     /** @var <?php echo $containedTypeInterface->getFullyQualifiedName(true); ?> $cn */
-                    $cn = <?php echo PHPFHIR_VERSION_CLASSNAME_VERSION_TYPE_MAP; ?>::getContainedTypeClassNameFromXML($nn);
-                    $type-><?php echo $setter; ?>($cn::xmlUnserialize($nn, $config));
+                    $cn = <?php echo PHPFHIR_VERSION_CLASSNAME_VERSION_TYPE_MAP; ?>::getContainedTypeClassNameFromXML($cen);
+                    $type-><?php echo $setter; ?>($cn::xmlUnserialize($cen, $config));
                 }
 <?php   elseif ($propTypeKind === TypeKindEnum::PHPFHIR_XHTML) : ?>
-                $type-><?php echo $setter; ?>($n);
+                $type-><?php echo $setter; ?>($ce);
 <?php   else :
             $propTypeClassname = $property->getMemberOf()->getImports()->getImportByType($propType); ?>
-                $type-><?php echo $setter; ?>(<?php echo $propTypeClassname; ?>::xmlUnserialize($n, $config));
+                $type-><?php echo $setter; ?>(<?php echo $propTypeClassname; ?>::xmlUnserialize($ce, $config));
 <?php   endif; ?>
             }<?php
 endforeach; ?>
-
         }
         $attributes = $element->attributes();
 <?php
@@ -76,29 +73,19 @@
 ?>
         if (isset($attributes[self::<?php echo $propConst; ?>])) {
 <?php
-    // primitive properties need to be set directly on the type
-    if (null === $propType) : ?>
-            $type-><?php echo $setter; ?>((string)$attributes[self::<?php echo $propConst; ?>], <?php echo $valueXMLLocationEnum->getEntityName(); ?>::LOCAL_ATTRIBUTE);
+    if ($property->isValueProperty() && ($type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent())) : ?>
+            $type-><?php echo $setter; ?>((string)$attributes[self::<?php echo $propConst; ?>], <?php echo $valueXMLLocationEnum->getEntityName(); ?>::CONTAINER_ATTRIBUTE);
+<?php
+    elseif ($propType->isPrimitiveOrListType() || $propType->hasPrimitiveOrListParent()) : ?>
+            $type-><?php echo $setter; ?>((string)$attributes[self::<?php echo $propConst; ?>], <?php echo $valueXMLLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE);
 <?php
-    // "value container" type properties can have their "value" property defined either on their parent's node as an
-    // attribute, on their own node as an attribute, or as a child of themselves.
     else : ?>
             if (isset($type-><?php echo $property->getName(); ?>)) {
                 $type-><?php echo $property->getName(); ?>->setValue((string)$attributes[self::<?php echo $propConst; ?>]);
+                $type->_set<?php echo ucfirst($property->getName()); ?>ValueXMLLocation(<?php echo $valueXMLLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE);
             } else {
-                $type-><?php echo $setter; ?>((string)$attributes[self::<?php echo $propConst; ?>]);
+                $type-><?php echo $setter; ?>((string)$attributes[self::<?php echo $propConst; ?>], <?php echo $valueXMLLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE);
             }
-<?php
-    endif;
-    // if the local type is a "value container", this indicates the value was found on the container's local attributes
-    if ($type->isValueContainer() || $type->hasValueContainerParent()) : ?>
-            $type->_set<?php echo ucfirst($property->getName()); ?>ValueXMLLocation(<?php echo $valueXMLLocationEnum->getEntityName(); ?>::LOCAL_ATTRIBUTE);
-<?php
-    else :
-    // if the local type is NOT a "value container", this indicates the property's value was found in a PARENT node's
-    // attributes.
-        ?>
-            $type->_set<?php echo ucfirst($property->getName()); ?>ValueXMLLocation(<?php echo $valueXMLLocationEnum->getEntityName(); ?>::PARENT_ATTRIBUTE);
 <?php
     endif;
 ?>