diff --git a/src/Builder.php b/src/Builder.php
index 5719fcda..93e4044b 100644
--- a/src/Builder.php
+++ b/src/Builder.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Builder/Import.php b/src/Builder/Import.php
index fe0332ef..b1ce95ba 100644
--- a/src/Builder/Import.php
+++ b/src/Builder/Import.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Builder;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Builder/Imports.php b/src/Builder/Imports.php
index 387fc57a..1e8f9d35 100644
--- a/src/Builder/Imports.php
+++ b/src/Builder/Imports.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Builder;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Builder/TypeBuilder.php b/src/Builder/TypeBuilder.php
index 5c34fabb..8812dab7 100644
--- a/src/Builder/TypeBuilder.php
+++ b/src/Builder/TypeBuilder.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Builder;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Config.php b/src/Config.php
index 0eeb8165..c32b8a87 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/ConfigKeyEnum.php b/src/ConfigKeyEnum.php
index d9a39a89..fe1d4dd5 100644
--- a/src/ConfigKeyEnum.php
+++ b/src/ConfigKeyEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/CoreFile.php b/src/CoreFile.php
index 099b2d44..63eebb5e 100644
--- a/src/CoreFile.php
+++ b/src/CoreFile.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/CoreFiles.php b/src/CoreFiles.php
index 612ed684..26cfaff9 100644
--- a/src/CoreFiles.php
+++ b/src/CoreFiles.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/Enum/AttributeNameEnum.php b/src/Enum/AttributeNameEnum.php
index e3d7ae2d..9fde6bd4 100644
--- a/src/Enum/AttributeNameEnum.php
+++ b/src/Enum/AttributeNameEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Enum/ElementNameEnum.php b/src/Enum/ElementNameEnum.php
index 28d46314..00cd9239 100644
--- a/src/Enum/ElementNameEnum.php
+++ b/src/Enum/ElementNameEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Enum/PrimitiveTypeEnum.php b/src/Enum/PrimitiveTypeEnum.php
index ab3549e4..7737692a 100644
--- a/src/Enum/PrimitiveTypeEnum.php
+++ b/src/Enum/PrimitiveTypeEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Enum/PropertyUseEnum.php b/src/Enum/PropertyUseEnum.php
index c7ad6a4a..8d531ec7 100644
--- a/src/Enum/PropertyUseEnum.php
+++ b/src/Enum/PropertyUseEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Enum/TypeKindEnum.php b/src/Enum/TypeKindEnum.php
index 8ca62faa..282a366f 100644
--- a/src/Enum/TypeKindEnum.php
+++ b/src/Enum/TypeKindEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
@@ -48,9 +48,8 @@ enum TypeKindEnum: string
     // treated a bit different
     case PHPFHIR_XHTML = 'phpfhir_xhtml';
 
-    private const _DSTU1_CONTAINER_TYPE = self::RESOURCE_INLINE;
-
-    private const _CONTAINER_TYPE = self::RESOURCE_CONTAINER;
+    private const _DSTU1_RESOURCE_CONTAINER_TYPE = self::RESOURCE_INLINE;
+    private const _RESOURCE_CONTAINER_TYPE = self::RESOURCE_CONTAINER;
 
     /**
      * Returns true if the provided FHIR type name is the "container" type for the provided version.
@@ -62,9 +61,9 @@ enum TypeKindEnum: string
     public static function isContainerTypeName(Version $version, string $fhirName): bool
     {
         if ($version->getSourceMetadata()->isDSTU1()) {
-            return $fhirName === self::_DSTU1_CONTAINER_TYPE->value;
+            return $fhirName === self::_DSTU1_RESOURCE_CONTAINER_TYPE->value;
         }
-        return $fhirName === self::_CONTAINER_TYPE->value;
+        return $fhirName === self::_RESOURCE_CONTAINER_TYPE->value;
     }
 
     /**
@@ -77,16 +76,16 @@ public function isOneOf(TypeKindEnum|string ...$other): bool
     }
 
     /**
-     * Returns true if this kind is the "container" kind for the provided FHIR version.
+     * Returns true if this kind is the "resource container" kind for the provided FHIR version.
      *
      * @param \DCarbone\PHPFHIR\Version $version
      * @return bool
      */
-    public function isContainer(Version $version): bool
+    public function isResourceContainer(Version $version): bool
     {
         if ($version->getSourceMetadata()->isDSTU1()) {
-            return $this === self::_DSTU1_CONTAINER_TYPE;
+            return $this === self::_DSTU1_RESOURCE_CONTAINER_TYPE;
         }
-        return $this === self::_CONTAINER_TYPE;
+        return $this === self::_RESOURCE_CONTAINER_TYPE;
     }
 }
\ No newline at end of file
diff --git a/src/LogLevel.php b/src/LogLevel.php
index adbb4c36..24b34dae 100644
--- a/src/LogLevel.php
+++ b/src/LogLevel.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/Logger.php b/src/Logger.php
index 5241ee8c..e8fa0221 100644
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Render/Templates.php b/src/Render/Templates.php
index 412e44d2..a0949364 100644
--- a/src/Render/Templates.php
+++ b/src/Render/Templates.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Render;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
@@ -55,6 +55,9 @@ public static function renderVersionXHTMLTypeClass(Version $version, Types $type
      */
     public static function renderVersionTypeClass(Version $version, Types $types, Type $type): string
     {
+        if ($type->getKind()->isResourceContainer($version)) {
+            return require PHPFHIR_TEMPLATE_VERSION_TYPES_DIR . DIRECTORY_SEPARATOR . 'class_resource_container.php';
+        }
         return require PHPFHIR_TEMPLATE_VERSION_TYPES_DIR . DIRECTORY_SEPARATOR . 'class_default.php';
     }
 
diff --git a/src/Utilities/DocumentationUtils.php b/src/Utilities/DocumentationUtils.php
index 9e2bdb33..15c4db6f 100644
--- a/src/Utilities/DocumentationUtils.php
+++ b/src/Utilities/DocumentationUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Utilities/ExceptionUtils.php b/src/Utilities/ExceptionUtils.php
index 36c22be1..34590ca7 100644
--- a/src/Utilities/ExceptionUtils.php
+++ b/src/Utilities/ExceptionUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Utilities/FileUtils.php b/src/Utilities/FileUtils.php
index 8eae5d3f..663fe2d9 100644
--- a/src/Utilities/FileUtils.php
+++ b/src/Utilities/FileUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Utilities/ImportUtils.php b/src/Utilities/ImportUtils.php
index d40efeb1..09acd182 100644
--- a/src/Utilities/ImportUtils.php
+++ b/src/Utilities/ImportUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
@@ -48,17 +48,12 @@ public static function buildVersionTypeImports(Type $type): void
         $typeKind = $type->getKind();
 
         if (!$type->isAbstract()) {
-            $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_CLASSNAME_XML_WRITER);
-            $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_ENUM_XML_LOCATION);
+            $imports->addCoreFileImportsByName(
+                PHPFHIR_ENCODING_CLASSNAME_XML_WRITER,
+                PHPFHIR_ENCODING_ENUM_XML_LOCATION,
+            );
         }
 
-        $imports->addVersionCoreFileImportsByName($type->getVersion(), PHPFHIR_CLASSNAME_VERSION);
-        $imports->addVersionCoreFileImportsByName($type->getVersion(), PHPFHIR_CLASSNAME_VERSION_CONSTANTS);
-        $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG);
-        $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG);
-
-        $imports->addCoreFileImportsByName(PHPFHIR_INTERFACE_TYPE);
-
         foreach ($type->getDirectlyImplementedInterfaces() as $interface => $namespace) {
             $imports->addImport($namespace, $interface);
         }
@@ -67,12 +62,33 @@ public static function buildVersionTypeImports(Type $type): void
             $imports->addImport($namespace, $trait);
         }
 
+        $imports->addVersionCoreFileImportsByName(
+            $type->getVersion(),
+            PHPFHIR_CLASSNAME_VERSION,
+            PHPFHIR_CLASSNAME_VERSION_CONSTANTS,
+        );
+
+        $imports->addCoreFileImportsByName(
+            PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG,
+            PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG,
+            PHPFHIR_INTERFACE_TYPE,
+        );
+
         if (($type->isCommentContainer() && !$type->hasCommentContainerParent()) ||
             $type->hasLocalPropertiesWithValidations() ||
             ($typeKind->isOneOf(TypeKindEnum::PRIMITIVE) && !$type->hasPrimitiveParent())) {
             $imports->addCoreFileImportsByName(PHPFHIR_CLASSNAME_CONSTANTS);
         }
 
+        if ($typeKind->isResourceContainer($type->getVersion())) {
+            $imports->addVersionCoreFileImportsByName(
+                $type->getVersion(),
+                PHPFHIR_CLASSNAME_VERSION_TYPE_MAP,
+                PHPFHIR_INTERFACE_VERSION_CONTAINED_TYPE,
+            );
+            return;
+        }
+
         if ($parentType = $type->getParentType()) {
             $imports->addImport(
                 $parentType->getFullyQualifiedNamespace(false),
diff --git a/src/Utilities/NameUtils.php b/src/Utilities/NameUtils.php
index b657deda..a2dd8011 100644
--- a/src/Utilities/NameUtils.php
+++ b/src/Utilities/NameUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Utilities/TypeHintUtils.php b/src/Utilities/TypeHintUtils.php
index baa8af99..11f40fd2 100644
--- a/src/Utilities/TypeHintUtils.php
+++ b/src/Utilities/TypeHintUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version.php b/src/Version.php
index 8105f529..a0a9dcde 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/Version/DefaultConfig.php b/src/Version/DefaultConfig.php
index cd588511..954d67e2 100644
--- a/src/Version/DefaultConfig.php
+++ b/src/Version/DefaultConfig.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/Version/DefaultConfigKeyEnum.php b/src/Version/DefaultConfigKeyEnum.php
index 3249ab16..76e7869b 100644
--- a/src/Version/DefaultConfigKeyEnum.php
+++ b/src/Version/DefaultConfigKeyEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/src/Version/Definition.php b/src/Version/Definition.php
index 43152d42..9c4f5f24 100644
--- a/src/Version/Definition.php
+++ b/src/Version/Definition.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php b/src/Version/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php
index bcbc2353..698b9dca 100644
--- a/src/Version/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php
+++ b/src/Version/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/AnnotationElementTypeDecorator.php b/src/Version/Definition/Decorator/AnnotationElementTypeDecorator.php
index 542453fa..2278b050 100644
--- a/src/Version/Definition/Decorator/AnnotationElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/AnnotationElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/AnyElementTypeDecorator.php b/src/Version/Definition/Decorator/AnyElementTypeDecorator.php
index f9861451..8b0b5ab0 100644
--- a/src/Version/Definition/Decorator/AnyElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/AnyElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/AttributeElementTypeDecorator.php b/src/Version/Definition/Decorator/AttributeElementTypeDecorator.php
index 9a250976..1924a9e3 100644
--- a/src/Version/Definition/Decorator/AttributeElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/AttributeElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php b/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php
index c7e23e74..73dc7cf5 100644
--- a/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php
+++ b/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/ChoiceElementTypeDecorator.php b/src/Version/Definition/Decorator/ChoiceElementTypeDecorator.php
index ecbba92e..f846510c 100644
--- a/src/Version/Definition/Decorator/ChoiceElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/ChoiceElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/ComplexContentElementTypeDecorator.php b/src/Version/Definition/Decorator/ComplexContentElementTypeDecorator.php
index 9c555270..edc83131 100644
--- a/src/Version/Definition/Decorator/ComplexContentElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/ComplexContentElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/ComplexTypeElementTypeDecorator.php b/src/Version/Definition/Decorator/ComplexTypeElementTypeDecorator.php
index 93708d04..25a04e74 100644
--- a/src/Version/Definition/Decorator/ComplexTypeElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/ComplexTypeElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/ElementElementTypeDecorator.php b/src/Version/Definition/Decorator/ElementElementTypeDecorator.php
index 1d5eab2d..4bf965cb 100644
--- a/src/Version/Definition/Decorator/ElementElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/ElementElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/ExtensionElementTypeDecorator.php b/src/Version/Definition/Decorator/ExtensionElementTypeDecorator.php
index a3f132ad..8ef37c57 100644
--- a/src/Version/Definition/Decorator/ExtensionElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/ExtensionElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/RestrictionElementTypeDecorator.php b/src/Version/Definition/Decorator/RestrictionElementTypeDecorator.php
index cbd25689..124fe18b 100644
--- a/src/Version/Definition/Decorator/RestrictionElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/RestrictionElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/SequenceElementTypeDecorator.php b/src/Version/Definition/Decorator/SequenceElementTypeDecorator.php
index a604ced3..1ad3a2a0 100644
--- a/src/Version/Definition/Decorator/SequenceElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/SequenceElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/SimpleContentElementTypeDecorator.php b/src/Version/Definition/Decorator/SimpleContentElementTypeDecorator.php
index 255efcb3..e4385d15 100644
--- a/src/Version/Definition/Decorator/SimpleContentElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/SimpleContentElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/SimpleTypeElementPropertyDecorator.php b/src/Version/Definition/Decorator/SimpleTypeElementPropertyDecorator.php
index cad47826..6233100f 100644
--- a/src/Version/Definition/Decorator/SimpleTypeElementPropertyDecorator.php
+++ b/src/Version/Definition/Decorator/SimpleTypeElementPropertyDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/SimpleTypeElementTypeDecorator.php b/src/Version/Definition/Decorator/SimpleTypeElementTypeDecorator.php
index c1d36ae1..a3142789 100644
--- a/src/Version/Definition/Decorator/SimpleTypeElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/SimpleTypeElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Decorator/UnionElementTypeDecorator.php b/src/Version/Definition/Decorator/UnionElementTypeDecorator.php
index 78da84fa..fad6d7b9 100644
--- a/src/Version/Definition/Decorator/UnionElementTypeDecorator.php
+++ b/src/Version/Definition/Decorator/UnionElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/DocumentationTrait.php b/src/Version/Definition/DocumentationTrait.php
index 59d9b235..4b8fdd26 100644
--- a/src/Version/Definition/DocumentationTrait.php
+++ b/src/Version/Definition/DocumentationTrait.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Enumeration.php b/src/Version/Definition/Enumeration.php
index 4e46c77e..38c76cfa 100644
--- a/src/Version/Definition/Enumeration.php
+++ b/src/Version/Definition/Enumeration.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Enumeration/EnumerationValue.php b/src/Version/Definition/Enumeration/EnumerationValue.php
index 495a88ec..3c287f11 100644
--- a/src/Version/Definition/Enumeration/EnumerationValue.php
+++ b/src/Version/Definition/Enumeration/EnumerationValue.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Enumeration;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Properties.php b/src/Version/Definition/Properties.php
index 47d7d82a..9194d5eb 100644
--- a/src/Version/Definition/Properties.php
+++ b/src/Version/Definition/Properties.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Property.php b/src/Version/Definition/Property.php
index f4032ba4..52c6e604 100644
--- a/src/Version/Definition/Property.php
+++ b/src/Version/Definition/Property.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/SourceTrait.php b/src/Version/Definition/SourceTrait.php
index 170c9fbe..88ba52d9 100644
--- a/src/Version/Definition/SourceTrait.php
+++ b/src/Version/Definition/SourceTrait.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Type.php b/src/Version/Definition/Type.php
index f7fbda06..0dfcd9b7 100644
--- a/src/Version/Definition/Type.php
+++ b/src/Version/Definition/Type.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/TypeDecorationValidator.php b/src/Version/Definition/TypeDecorationValidator.php
index de285b78..da77ff1c 100644
--- a/src/Version/Definition/TypeDecorationValidator.php
+++ b/src/Version/Definition/TypeDecorationValidator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/TypeDecorator.php b/src/Version/Definition/TypeDecorator.php
index 27f46912..8562753e 100644
--- a/src/Version/Definition/TypeDecorator.php
+++ b/src/Version/Definition/TypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/TypeExtractor.php b/src/Version/Definition/TypeExtractor.php
index e0ec8cb0..d0b6f3d9 100644
--- a/src/Version/Definition/TypeExtractor.php
+++ b/src/Version/Definition/TypeExtractor.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/TypePropertyDecorator.php b/src/Version/Definition/TypePropertyDecorator.php
index 059d150d..ca5fc516 100644
--- a/src/Version/Definition/TypePropertyDecorator.php
+++ b/src/Version/Definition/TypePropertyDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/Version/Definition/Types.php b/src/Version/Definition/Types.php
index c424aed8..7a13abbb 100644
--- a/src/Version/Definition/Types.php
+++ b/src/Version/Definition/Types.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
@@ -216,7 +216,7 @@ public function getContainerType(Version $version): null|Type
     {
         if (!isset($this->containerType)) {
             foreach ($this->types as $type) {
-                if ($type->getKind()->isContainer($version)) {
+                if ($type->getKind()->isResourceContainer($version)) {
                     $this->containerType = $type;
                     break;
                 }
@@ -232,7 +232,7 @@ public function getContainerType(Version $version): null|Type
     public function isContainedType(Type $type): bool
     {
         // only bother with actual Resource types.
-        if ($type->getKind()->isContainer($type->getVersion())) {
+        if ($type->getKind()->isResourceContainer($type->getVersion())) {
             return false;
         }
         $container = $this->getContainerType($type->getVersion());
diff --git a/src/Version/SourceMetadata.php b/src/Version/SourceMetadata.php
index 69684b12..2b2325ab 100644
--- a/src/Version/SourceMetadata.php
+++ b/src/Version/SourceMetadata.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-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.
diff --git a/src/VersionKeys.php b/src/VersionKeys.php
index a5b87ed5..8a4acd18 100644
--- a/src/VersionKeys.php
+++ b/src/VersionKeys.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_autoloader.php b/template/core/class_autoloader.php
index bb4414e1..0329ccda 100644
--- a/template/core/class_autoloader.php
+++ b/template/core/class_autoloader.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_constants.php b/template/core/class_constants.php
index ebd6fa18..92e3b952 100644
--- a/template/core/class_constants.php
+++ b/template/core/class_constants.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_factory.php b/template/core/class_factory.php
index 73894142..062186ad 100644
--- a/template/core/class_factory.php
+++ b/template/core/class_factory.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_factory_config.php b/template/core/class_factory_config.php
index e462313f..026f6106 100644
--- a/template/core/class_factory_config.php
+++ b/template/core/class_factory_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_factory_version_config.php b/template/core/class_factory_version_config.php
index c5c2626f..969274dc 100644
--- a/template/core/class_factory_version_config.php
+++ b/template/core/class_factory_version_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_response_parser.php b/template/core/class_response_parser.php
index f652ac39..1b8d356c 100644
--- a/template/core/class_response_parser.php
+++ b/template/core/class_response_parser.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/class_version_config.php b/template/core/class_version_config.php
index e799cbd1..caa05b74 100644
--- a/template/core/class_version_config.php
+++ b/template/core/class_version_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/class_client.php b/template/core/client/class_client.php
index 0ee9abaa..3c0bc3a4 100644
--- a/template/core/client/class_client.php
+++ b/template/core/client/class_client.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/class_config.php b/template/core/client/class_config.php
index a4cb9e91..96afaa3e 100644
--- a/template/core/client/class_config.php
+++ b/template/core/client/class_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/class_request.php b/template/core/client/class_request.php
index 0693f41a..9539b96e 100644
--- a/template/core/client/class_request.php
+++ b/template/core/client/class_request.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/class_response.php b/template/core/client/class_response.php
index 8eab828c..3bf475c0 100644
--- a/template/core/client/class_response.php
+++ b/template/core/client/class_response.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/class_response_headers.php b/template/core/client/class_response_headers.php
index a4bd5f37..aeee9b19 100644
--- a/template/core/client/class_response_headers.php
+++ b/template/core/client/class_response_headers.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/enum_http_method.php b/template/core/client/enum_http_method.php
index 50f126e2..86ba5957 100644
--- a/template/core/client/enum_http_method.php
+++ b/template/core/client/enum_http_method.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/enum_response_format.php b/template/core/client/enum_response_format.php
index 59779eba..f36ee437 100644
--- a/template/core/client/enum_response_format.php
+++ b/template/core/client/enum_response_format.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/enum_sort_direction.php b/template/core/client/enum_sort_direction.php
index ea16c862..8d3b6aa0 100644
--- a/template/core/client/enum_sort_direction.php
+++ b/template/core/client/enum_sort_direction.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/exception_abstract_client.php b/template/core/client/exception_abstract_client.php
index 1d07158c..8c7e7633 100644
--- a/template/core/client/exception_abstract_client.php
+++ b/template/core/client/exception_abstract_client.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/exception_client_error.php b/template/core/client/exception_client_error.php
index 36e7a67a..61fe0cf6 100644
--- a/template/core/client/exception_client_error.php
+++ b/template/core/client/exception_client_error.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/exception_unexpected_response_code.php b/template/core/client/exception_unexpected_response_code.php
index 4d499195..f60b7fad 100644
--- a/template/core/client/exception_unexpected_response_code.php
+++ b/template/core/client/exception_unexpected_response_code.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/client/interface_client.php b/template/core/client/interface_client.php
index e60043b5..77ef9735 100644
--- a/template/core/client/interface_client.php
+++ b/template/core/client/interface_client.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/encoding/class_serialize_config.php b/template/core/encoding/class_serialize_config.php
index 3a2e9cf9..5da91474 100644
--- a/template/core/encoding/class_serialize_config.php
+++ b/template/core/encoding/class_serialize_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/encoding/class_unserialize_config.php b/template/core/encoding/class_unserialize_config.php
index 8f54a099..b01b09f4 100644
--- a/template/core/encoding/class_unserialize_config.php
+++ b/template/core/encoding/class_unserialize_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/encoding/class_xml_writer.php b/template/core/encoding/class_xml_writer.php
index bfb9b7e8..313a549c 100644
--- a/template/core/encoding/class_xml_writer.php
+++ b/template/core/encoding/class_xml_writer.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/encoding/enum_serialize_config_key.php b/template/core/encoding/enum_serialize_config_key.php
index d364f0b8..e0602767 100644
--- a/template/core/encoding/enum_serialize_config_key.php
+++ b/template/core/encoding/enum_serialize_config_key.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/encoding/enum_unserialize_config_key.php b/template/core/encoding/enum_unserialize_config_key.php
index bc7e2b12..8d043e77 100644
--- a/template/core/encoding/enum_unserialize_config_key.php
+++ b/template/core/encoding/enum_unserialize_config_key.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/encoding/enum_xml_location.php b/template/core/encoding/enum_xml_location.php
index f8a32d9b..49dac7a5 100644
--- a/template/core/encoding/enum_xml_location.php
+++ b/template/core/encoding/enum_xml_location.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/enum_factory_config_key.php b/template/core/enum_factory_config_key.php
index 873c8b54..0e6b07e2 100644
--- a/template/core/enum_factory_config_key.php
+++ b/template/core/enum_factory_config_key.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/enum_version.php b/template/core/enum_version.php
index 3ada9c79..9a5f6194 100644
--- a/template/core/enum_version.php
+++ b/template/core/enum_version.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/enum_version_config_key.php b/template/core/enum_version_config_key.php
index 68a6ad45..4aafa982 100644
--- a/template/core/enum_version_config_key.php
+++ b/template/core/enum_version_config_key.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_comment_container.php b/template/core/interface_comment_container.php
index 66c4e24d..1f97276d 100644
--- a/template/core/interface_comment_container.php
+++ b/template/core/interface_comment_container.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_contained_type.php b/template/core/interface_contained_type.php
index 3d62f68d..88140f79 100644
--- a/template/core/interface_contained_type.php
+++ b/template/core/interface_contained_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_primitive_type.php b/template/core/interface_primitive_type.php
index ecac7e13..514558b4 100644
--- a/template/core/interface_primitive_type.php
+++ b/template/core/interface_primitive_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_type.php b/template/core/interface_type.php
index c2e86b45..2341d791 100644
--- a/template/core/interface_type.php
+++ b/template/core/interface_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_version.php b/template/core/interface_version.php
index 9dc6de0e..b66cc9ca 100644
--- a/template/core/interface_version.php
+++ b/template/core/interface_version.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_version_config.php b/template/core/interface_version_config.php
index 1db4a8f5..0c4eafd6 100644
--- a/template/core/interface_version_config.php
+++ b/template/core/interface_version_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/interface_version_type_map.php b/template/core/interface_version_type_map.php
index dcf8ffe1..24476954 100644
--- a/template/core/interface_version_type_map.php
+++ b/template/core/interface_version_type_map.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/tests/test_class_factory_config.php b/template/core/tests/test_class_factory_config.php
index 379943ad..0a0f5498 100644
--- a/template/core/tests/test_class_factory_config.php
+++ b/template/core/tests/test_class_factory_config.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/trait_comment_container.php b/template/core/trait_comment_container.php
index a9c9af2b..6beec158 100644
--- a/template/core/trait_comment_container.php
+++ b/template/core/trait_comment_container.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2022 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/trait_source_xml_namespace.php b/template/core/trait_source_xml_namespace.php
index 019e537c..c6aa2d17 100644
--- a/template/core/trait_source_xml_namespace.php
+++ b/template/core/trait_source_xml_namespace.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/core/validation/class_validator.php b/template/core/validation/class_validator.php
index 7712ea84..af161d21 100644
--- a/template/core/validation/class_validator.php
+++ b/template/core/validation/class_validator.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/class_autoloader.php b/template/versions/core/class_autoloader.php
index 5a6da8e6..376351c1 100644
--- a/template/versions/core/class_autoloader.php
+++ b/template/versions/core/class_autoloader.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/class_version.php b/template/versions/core/class_version.php
index 9f3b9a30..738ee16e 100644
--- a/template/versions/core/class_version.php
+++ b/template/versions/core/class_version.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/class_version_api_client.php b/template/versions/core/class_version_api_client.php
index 84e9744f..fc03e469 100644
--- a/template/versions/core/class_version_api_client.php
+++ b/template/versions/core/class_version_api_client.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -192,7 +192,7 @@ protected function _requireOK(<?php echo PHPFHIR_CLIENT_CLASSNAME_RESPONSE; ?> $
     }
 <?php foreach($types->getChildrenOf('Resource') as $rsc) :
     $typeKind = $rsc->getKind();
-    if ($typeKind->isContainer($version) || $rsc->getFHIRName() === 'Bundle') { continue; }
+    if ($typeKind->isResourceContainer($version) || $rsc->getFHIRName() === 'Bundle') { continue; }
 
     $rscName = $rsc->getFHIRName();
     $rscNameLen = strlen($rscName);
diff --git a/template/versions/core/class_version_constants.php b/template/versions/core/class_version_constants.php
index 172f7d2a..b8cd86ce 100644
--- a/template/versions/core/class_version_constants.php
+++ b/template/versions/core/class_version_constants.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/class_version_type_map.php b/template/versions/core/class_version_type_map.php
index cc307ca1..33864665 100644
--- a/template/versions/core/class_version_type_map.php
+++ b/template/versions/core/class_version_type_map.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -146,7 +146,6 @@ public static function isContainableResource(string|array|\SimpleXMLElement|<?ph
      * @return string Fully qualified class name of contained resource type
      */
     public static function getContainedTypeClassNameFromXML(\SimpleXMLElement $node): string
-
     {
         $typeName = $node->getName();
         $className = self::getContainedTypeClassName($typeName);
@@ -161,7 +160,6 @@ public static function getContainedTypeClassNameFromXML(\SimpleXMLElement $node)
      * @return string Fully qualified class name of contained resource type
      */
     public static function getContainedTypeClassNameFromArray(array $data): string
-
     {
         $resourceType = null;
         if (isset($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_RESOURCE_TYPE])) {
diff --git a/template/versions/core/enum_version_type.php b/template/versions/core/enum_version_type.php
index 432f2ed8..b8a1f144 100644
--- a/template/versions/core/enum_version_type.php
+++ b/template/versions/core/enum_version_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/interface_version_contained_type.php b/template/versions/core/interface_version_contained_type.php
index 6cc1710c..3b8a5d95 100644
--- a/template/versions/core/interface_version_contained_type.php
+++ b/template/versions/core/interface_version_contained_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/tests/test_class_constants.php b/template/versions/core/tests/test_class_constants.php
index d4c78ce2..6df8e446 100644
--- a/template/versions/core/tests/test_class_constants.php
+++ b/template/versions/core/tests/test_class_constants.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2022 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/core/tests/test_class_version_type_map.php b/template/versions/core/tests/test_class_version_type_map.php
index 925e7130..7f5b9fb9 100644
--- a/template/versions/core/tests/test_class_version_type_map.php
+++ b/template/versions/core/tests/test_class_version_type_map.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2022 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/class_default.php b/template/versions/types/class_default.php
index 488e3a01..142fa17c 100644
--- a/template/versions/types/class_default.php
+++ b/template/versions/types/class_default.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -36,11 +36,7 @@
         'version' => $version,
         'type' => $type,
     ]
-); ?>
-
-    // name of FHIR type this class describes
-    public const FHIR_TYPE_NAME = <?php echo $type->getTypeNameConst(true); ?>;
-<?php
+);
 
 // -- property field name constants
 if ($type->hasLocalProperties()) :
@@ -99,10 +95,10 @@
 
 // -- end field properties
 ?>
-
+<?php if ($type->hasLocalProperties()) : ?>
     /** @var array */
     private array $_xmlLocations = [];
-
+<?php endif; ?>
 <?php echo require_with(
     PHPFHIR_TEMPLATE_VERSION_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'constructor.php',
     [
diff --git a/template/versions/types/class_resource_container.php b/template/versions/types/class_resource_container.php
new file mode 100644
index 00000000..cd587f44
--- /dev/null
+++ b/template/versions/types/class_resource_container.php
@@ -0,0 +1,191 @@
+<?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\Version $version */
+/** @var \DCarbone\PHPFHIR\Version\Definition\Types $types */
+/** @var \DCarbone\PHPFHIR\Version\Definition\Type $type */
+
+use DCarbone\PHPFHIR\Utilities\NameUtils;
+
+$config = $version->getConfig();
+$coreFiles = $config->getCoreFiles();
+
+$xmlWriterClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_XML_WRITER);
+$serializeConfigClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG);
+$unserializeConfigClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG);
+
+$versionCoreFiles = $version->getCoreFiles();
+
+$versionContainedTypeInterface = $versionCoreFiles->getCoreFileByEntityName(PHPFHIR_INTERFACE_VERSION_CONTAINED_TYPE);
+$versionTypeMapClass = $versionCoreFiles->getCoreFileByEntityName(PHPFHIR_CLASSNAME_VERSION_TYPE_MAP);
+
+ob_start();
+
+// build file header
+echo require_with(
+    PHPFHIR_TEMPLATE_VERSION_TYPES_DIR . DIRECTORY_SEPARATOR . 'header.php',
+    [
+        'version' => $version,
+        'type' => $type,
+    ]
+); ?>
+
+    /** @var null|<?php echo $versionContainedTypeInterface->getFullyQualifiedName(true); ?> */
+    private null|<?php echo $versionContainedTypeInterface->getEntityName(); ?> $containedType = null;
+
+    /**
+     * <?php echo $type->getClassName(); ?> Constructor
+     * @param null|array|<?php echo $versionContainedTypeInterface->getFullyQualifiedName(true); ?> $data
+     */
+    public function __construct(null|array|<?php echo $versionContainedTypeInterface->getEntityName(); ?> $data = null)
+    {
+        if (null === $data || [] === $data) {
+            return;
+        }
+
+        if ($data instanceof <?php echo $versionContainedTypeInterface->getEntityName(); ?>) {
+            $this->setContainedType($data);
+            return;
+        }
+
+        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]);
+            }
+        }
+        $class = <?php echo $versionTypeMapClass->getEntityName(); ?>::getContainedTypeClassNameFromArray($data);
+        $this->setContainedType(new $class($data[$class::FHIR_TYPE_NAME]));
+    }
+
+
+    public function _getFHIRTypeName(): string
+    {
+        return self::FHIR_TYPE_NAME;
+    }
+
+    /**
+     * TODO: empty, pending validation system overhaul
+     */
+    public function _getValidationRules(): array
+    {
+        return [];
+    }
+
+    /**
+     * TODO: empty, pending validation system overhaul
+     */
+    public function _getValidationErrors(): array
+    {
+        return [];
+    }
+
+    /**
+     * @return null|<?php echo $versionContainedTypeInterface->getFullyQualifiedName(true); ?>
+
+     */
+    public function getContainedType(): null|<?php echo $versionContainedTypeInterface->getEntityName(); ?>
+
+    {
+        return $this->containedType;
+    }
+
+    /**
+     * @param null|<?php echo $versionContainedTypeInterface->getFullyQualifiedName(true); ?> $containedType
+     * @return static
+     */
+    public function setContainedType(null|<?php echo $versionContainedTypeInterface->getEntityName(); ?> $containedType): self
+    {
+        $this->containedType = $containedType;
+        return $this;
+    }
+
+<?php
+// unserialize portion
+echo require_with(
+        PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'header.php',
+    [
+        'version' => $version,
+        'type' => $type,
+    ]
+);
+?>
+        foreach ($element->children() as $child) {
+            /** @var <?php echo $versionContainedTypeInterface->getFullyQualifiedName(true); ?> $class */
+            $class = <?php echo $versionTypeMapClass->getEntityName(); ?>::getContainedTypeClassNameFromXML($child);
+            $type->setContainedType($class::xmlUnserialize($child, null, $config));
+            break;
+        }
+        return $type;
+    }
+
+    /**
+     * @param null|<?php echo $xmlWriterClass->getFullyQualifiedName(true); ?> $xw
+     * @param null|<?php echo $serializeConfigClass->getFullyQualifiedName(true); ?> $config
+     * @return <?php echo $xmlWriterClass->getFullyQualifiedName(true); ?>
+
+     */
+    public function xmlSerialize(null|<?php echo PHPFHIR_ENCODING_CLASSNAME_XML_WRITER; ?> $xw = null, null|<?php echo PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG; ?> $config = null): <?php echo PHPFHIR_ENCODING_CLASSNAME_XML_WRITER; ?>
+
+    {
+        $containedType = $this->getContainedType();
+        if (null !== $containedType) {
+            return $containedType->xmlSerialize($xw, $config);
+        }
+        if (null === $xw) {
+            $xw = new <?php echo PHPFHIR_ENCODING_CLASSNAME_XML_WRITER; ?>();
+        }
+        if (!$xw->isOpen()) {
+            $xw->openMemory();
+        }
+        if (!$xw->isDocStarted()) {
+            $docStarted = true;
+            $xw->startDocument();
+        }
+        if (null === $config) {
+            $config = (new <?php echo PHPFHIR_CLASSNAME_VERSION; ?>())->getConfig()->getSerializeConfig();
+        }
+        if (!$xw->isRootOpen()) {
+            $rootOpened = true;
+            $xw->openRootNode($config, '<?php echo NameUtils::getTypeXMLElementName($type); ?>', $this->_getSourceXMLNS());
+        }
+        if (isset($rootOpened) && $rootOpened) {
+            $xw->endElement();
+        }
+        if (isset($docStarted) && $docStarted) {
+            $xw->endDocument();
+        }
+        return $xw;
+    }
+
+    public function __toString(): string
+    {
+        return self::FHIR_TYPE_NAME;
+    }
+
+    /**
+     * @return null|object
+     */
+    public function jsonSerialize(): mixed
+    {
+        return $this->getContainedType();
+    }
+}
+<?php
+return ob_get_clean();
diff --git a/template/versions/types/class_xhtml.php b/template/versions/types/class_xhtml.php
index 688bddca..a5186174 100644
--- a/template/versions/types/class_xhtml.php
+++ b/template/versions/types/class_xhtml.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -22,13 +22,6 @@
 /** @var \DCarbone\PHPFHIR\Version\Definition\Types $types */
 /** @var \DCarbone\PHPFHIR\Version\Definition\Type $type */
 
-$imports = $type->getImports();
-
-$imports->addCoreFileImportsByName(
-    PHPFHIR_ENCODING_CLASSNAME_XML_WRITER,
-    PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG,
-);
-
 $config = $version->getConfig();
 $coreFiles = $config->getCoreFiles();
 
@@ -162,9 +155,6 @@ public function getXMLReader(int $libxmlOpts): null|\XMLReader
     [
         'version' => $version,
         'type' => $type,
-        'typeKind' => $type->getKind(),
-        'parentType' => null,
-        'typeClassName' => $type->getClassName()
     ]
 );
 ?>
diff --git a/template/versions/types/header.php b/template/versions/types/header.php
index 557b912c..f5ef6953 100644
--- a/template/versions/types/header.php
+++ b/template/versions/types/header.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -50,6 +50,11 @@
 {<?php if ([] !== $traits) : ?>
 
     use <?php echo implode(",\n        ", array_keys($traits)); ?>;
-<?php endif;
+<?php endif; ?>
+
 
+    // name of FHIR type this class describes
+    public const FHIR_TYPE_NAME = <?php echo $type->getTypeNameConst(true); ?>;
+
+<?php
 return ob_get_clean();
diff --git a/template/versions/types/methods/constructor.php b/template/versions/types/methods/constructor.php
index c042433d..2062a5f5 100644
--- a/template/versions/types/methods/constructor.php
+++ b/template/versions/types/methods/constructor.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -27,8 +27,7 @@
 $typeImports = $type->getImports();
 
 $parentType = $type->getParentType();
-
-$localProperties = $type->getProperties()->getLocalPropertiesIterator();
+$properties = $type->getProperties();
 
 // used in a few places below.
 $valueProperty = $type->getProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME);
@@ -109,7 +108,7 @@ public function __construct(<?php echo TypeHintUtils::propertySetterTypeHint($ve
                 $this->_addFHIRComment($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS]);
             }
         }<?php endif; ?>
-<?php foreach ($localProperties as $property) :
+<?php foreach ($properties->getLocalPropertiesGenerator() as $property) :
     if ($property->isOverloaded()) {
         continue;
     }
@@ -130,20 +129,20 @@ public function __construct(<?php echo TypeHintUtils::propertySetterTypeHint($ve
     public function __construct(null|array<?php if ($type->isValueContainer()) : ?>|<?php echo TypeHintUtils::propertySetterTypeHint($version, $valueProperty, false); endif; ?> $data = null)
     {
         if (null === $data || [] === $data) {
-<?php if ($type->hasConcreteParent()) : ?>
+<?php if ($type->hasParent()) : ?>
             parent::__construct(null);
 <?php endif; ?>
             return;
-        }
-<?php if ($type->isValueContainer()) : ?>
+        }<?php if ($type->isValueContainer()) : ?>
+
         if (!is_array($data)) {
-<?php if ($type->hasConcreteParent()) : ?>
+<?php if ($type->hasParent()) : ?>
             parent::__construct(null);
 <?php endif; ?>
             $this->setValue($data);
             return;
-        }
-<?php endif; if ($type->hasParentWithLocalProperties()) : // add parent constructor call ?>
+        }<?php endif; if ($type->hasParentWithLocalProperties() || $type->hasCommentContainerParent()) : // add parent constructor call ?>
+
         parent::__construct($data);<?php endif; ?><?php if ($type->isCommentContainer() && !$type->hasCommentContainerParent()) : // only parse comments if parent isn't already doing it. ?>
 
         if (isset($data[<?php echo PHPFHIR_CLASSNAME_CONSTANTS; ?>::JSON_FIELD_FHIR_COMMENTS])) {
@@ -154,7 +153,7 @@ public function __construct(null|array<?php if ($type->isValueContainer()) : ?>|
             }
         }<?php endif; ?>
 
-<?php foreach($localProperties as $property) :
+<?php foreach($properties->getLocalPropertiesGenerator() as $property) :
     if ($property->isOverloaded()) {
         continue;
     }
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 a205362c..a4399709 100644
--- a/template/versions/types/methods/constructors/default_property_setter_call.php
+++ b/template/versions/types/methods/constructors/default_property_setter_call.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/methods/constructors/property_setter_default.php b/template/versions/types/methods/constructors/property_setter_default.php
index c11aa0a5..6a62d163 100644
--- a/template/versions/types/methods/constructors/property_setter_default.php
+++ b/template/versions/types/methods/constructors/property_setter_default.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/methods/constructors/property_setter_primitive.php b/template/versions/types/methods/constructors/property_setter_primitive.php
index 57896caa..1d01b346 100644
--- a/template/versions/types/methods/constructors/property_setter_primitive.php
+++ b/template/versions/types/methods/constructors/property_setter_primitive.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/methods/constructors/property_setter_primitive_container.php b/template/versions/types/methods/constructors/property_setter_primitive_container.php
index 4482a87d..fd41260b 100644
--- a/template/versions/types/methods/constructors/property_setter_primitive_container.php
+++ b/template/versions/types/methods/constructors/property_setter_primitive_container.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/methods/constructors/resource_container_property_setter_call.php b/template/versions/types/methods/constructors/resource_container_property_setter_call.php
index ff07b48c..47c2ec24 100644
--- a/template/versions/types/methods/constructors/resource_container_property_setter_call.php
+++ b/template/versions/types/methods/constructors/resource_container_property_setter_call.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/declaration.php b/template/versions/types/properties/declaration.php
index b0ae1bad..8a01374a 100644
--- a/template/versions/types/properties/declaration.php
+++ b/template/versions/types/properties/declaration.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/default.php b/template/versions/types/properties/methods/default.php
index c5aed99f..41602d81 100644
--- a/template/versions/types/properties/methods/default.php
+++ b/template/versions/types/properties/methods/default.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -150,7 +150,7 @@ public function set<?php echo ucfirst($propertyName); ?>(array $<?php echo $prop
         return $this;
     }
 <?php   endif;
-    elseif ($propertyTypeKind->isContainer($version)) : ?>
+    elseif ($propertyTypeKind->isResourceContainer($version)) : ?>
 
     /**<?php if ('' !== $documentation) : ?>
 
diff --git a/template/versions/types/properties/methods/primitive.php b/template/versions/types/properties/methods/primitive.php
index 19435d0e..91cc5004 100644
--- a/template/versions/types/properties/methods/primitive.php
+++ b/template/versions/types/properties/methods/primitive.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/base64_binary_type.php b/template/versions/types/properties/methods/primitive/base64_binary_type.php
index b5f2a09a..e8ec714d 100644
--- a/template/versions/types/properties/methods/primitive/base64_binary_type.php
+++ b/template/versions/types/properties/methods/primitive/base64_binary_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/bool_type.php b/template/versions/types/properties/methods/primitive/bool_type.php
index f8e5fac5..291ce291 100644
--- a/template/versions/types/properties/methods/primitive/bool_type.php
+++ b/template/versions/types/properties/methods/primitive/bool_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/date_type.php b/template/versions/types/properties/methods/primitive/date_type.php
index 77a03494..f56ca30c 100644
--- a/template/versions/types/properties/methods/primitive/date_type.php
+++ b/template/versions/types/properties/methods/primitive/date_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/datetime_type.php b/template/versions/types/properties/methods/primitive/datetime_type.php
index 7739f0c8..17fc33d6 100644
--- a/template/versions/types/properties/methods/primitive/datetime_type.php
+++ b/template/versions/types/properties/methods/primitive/datetime_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/decimal_type.php b/template/versions/types/properties/methods/primitive/decimal_type.php
index f651f9a7..c5ba6877 100644
--- a/template/versions/types/properties/methods/primitive/decimal_type.php
+++ b/template/versions/types/properties/methods/primitive/decimal_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/instant_type.php b/template/versions/types/properties/methods/primitive/instant_type.php
index 16cd0fbb..89011827 100644
--- a/template/versions/types/properties/methods/primitive/instant_type.php
+++ b/template/versions/types/properties/methods/primitive/instant_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/integer_type.php b/template/versions/types/properties/methods/primitive/integer_type.php
index b5cfae7c..8e546030 100644
--- a/template/versions/types/properties/methods/primitive/integer_type.php
+++ b/template/versions/types/properties/methods/primitive/integer_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/string_type.php b/template/versions/types/properties/methods/primitive/string_type.php
index 6f1c4e0b..273035f4 100644
--- a/template/versions/types/properties/methods/primitive/string_type.php
+++ b/template/versions/types/properties/methods/primitive/string_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/time_type.php b/template/versions/types/properties/methods/primitive/time_type.php
index 49be2453..0d1690df 100644
--- a/template/versions/types/properties/methods/primitive/time_type.php
+++ b/template/versions/types/properties/methods/primitive/time_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/properties/methods/primitive/unsigned_integer_type.php b/template/versions/types/properties/methods/primitive/unsigned_integer_type.php
index ae5ea7d2..dd35e024 100644
--- a/template/versions/types/properties/methods/primitive/unsigned_integer_type.php
+++ b/template/versions/types/properties/methods/primitive/unsigned_integer_type.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/serialization/json.php b/template/versions/types/serialization/json.php
index 0c6a0cd9..5b5a04d7 100644
--- a/template/versions/types/serialization/json.php
+++ b/template/versions/types/serialization/json.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -33,7 +33,7 @@
             'type'     => $type,
         ]
     );
-elseif ($typeKind->isContainer($version)) :
+elseif ($typeKind->isResourceContainer($version)) :
     echo require_with(
         PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'resource_container.php',
         [
diff --git a/template/versions/types/serialization/json/default.php b/template/versions/types/serialization/json/default.php
index 195cbe57..b92273b0 100644
--- a/template/versions/types/serialization/json/default.php
+++ b/template/versions/types/serialization/json/default.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/serialization/json/primitive.php b/template/versions/types/serialization/json/primitive.php
index 354066e9..afc9c003 100644
--- a/template/versions/types/serialization/json/primitive.php
+++ b/template/versions/types/serialization/json/primitive.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/serialization/json/resource_container.php b/template/versions/types/serialization/json/resource_container.php
index fb29edf8..2345d53f 100644
--- a/template/versions/types/serialization/json/resource_container.php
+++ b/template/versions/types/serialization/json/resource_container.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/serialization/xml.php b/template/versions/types/serialization/xml.php
index fec83514..112f20a6 100644
--- a/template/versions/types/serialization/xml.php
+++ b/template/versions/types/serialization/xml.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -78,7 +78,7 @@
         );
     }
 } ?>
-        if (isset($openedRoot) && $openedRoot) {
+        if (isset($rootOpened) && $rootOpened) {
             $xw->endElement();
         }
         if (isset($docStarted) && $docStarted) {
diff --git a/template/versions/types/serialization/xml/serialize/body.php b/template/versions/types/serialization/xml/serialize/body.php
index 222d098a..45c3941b 100644
--- a/template/versions/types/serialization/xml/serialize/body.php
+++ b/template/versions/types/serialization/xml/serialize/body.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -78,7 +78,7 @@
     if (null !== $pt) :
         $ptk = $pt->getKind();
         // ... and IS a container
-        if ($ptk->isContainer($version)) :
+        if ($ptk->isResourceContainer($version)) :
             if ($property->isCollection()) : ?>
         foreach($this-><?php echo $property->getGetterName(); ?>() as $v) {
             $xw->startElement(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 c525630a..df5792a9 100644
--- a/template/versions/types/serialization/xml/serialize/header.php
+++ b/template/versions/types/serialization/xml/serialize/header.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -51,7 +51,7 @@ public function xmlSerialize(null|<?php echo PHPFHIR_ENCODING_CLASSNAME_XML_WRIT
             $config = (new <?php echo PHPFHIR_CLASSNAME_VERSION; ?>())->getConfig()->getSerializeConfig();
         }
         if (!$xw->isRootOpen()) {
-            $openedRoot = true;
+            $rootOpened = true;
             $xw->openRootNode($config, '<?php echo NameUtils::getTypeXMLElementName($type); ?>', $this->_getSourceXMLNS());
         }
 <?php return ob_get_clean();
\ No newline at end of file
diff --git a/template/versions/types/serialization/xml/serialize/resource_container.php b/template/versions/types/serialization/xml/serialize/resource_container.php
index 9c902e57..12635882 100644
--- a/template/versions/types/serialization/xml/serialize/resource_container.php
+++ b/template/versions/types/serialization/xml/serialize/resource_container.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -56,7 +56,7 @@ public function xmlSerialize(null|<?php echo PHPFHIR_ENCODING_CLASSNAME_XML_WRIT
         }
 <?php endforeach; ?>
         if (!$xw->isRootOpen()) {
-            $openedRoot = true;
+            $rootOpened = true;
             $xw->openRootNode($config, '<?php echo NameUtils::getTypeXMLElementName($type); ?>', $this->_getSourceXMLNS());
         }
 <?php
diff --git a/template/versions/types/serialization/xml/unserialize/body.php b/template/versions/types/serialization/xml/unserialize/body.php
index 53ca8433..b9426d92 100644
--- a/template/versions/types/serialization/xml/unserialize/body.php
+++ b/template/versions/types/serialization/xml/unserialize/body.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
@@ -33,7 +33,7 @@
     if (null !== $propType) :
         $propTypeKind = $propType->getKind();
 
-        if ($propTypeKind->isContainer($version)) : ?>
+        if ($propTypeKind->isResourceContainer($version)) : ?>
             if (self::<?php echo $propConst; ?> === $childName) {
                 foreach ($n->children() as $nn) {
                     $typeClassName = <?php echo PHPFHIR_CLASSNAME_VERSION_TYPE_MAP; ?>::getContainedTypeClassNameFromXML($nn);
diff --git a/template/versions/types/serialization/xml/unserialize/header.php b/template/versions/types/serialization/xml/unserialize/header.php
index a362cdeb..98110c34 100644
--- a/template/versions/types/serialization/xml/unserialize/header.php
+++ b/template/versions/types/serialization/xml/unserialize/header.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/tests/integration/class.php b/template/versions/types/tests/integration/class.php
index 3d825cf3..a3483bc9 100644
--- a/template/versions/types/tests/integration/class.php
+++ b/template/versions/types/tests/integration/class.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/tests/unit/class.php b/template/versions/types/tests/unit/class.php
index ea110018..10205f71 100644
--- a/template/versions/types/tests/unit/class.php
+++ b/template/versions/types/tests/unit/class.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/tests/validation/class.php b/template/versions/types/tests/validation/class.php
index a02ad909..2f6a40a1 100644
--- a/template/versions/types/tests/validation/class.php
+++ b/template/versions/types/tests/validation/class.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.
diff --git a/template/versions/types/validation/methods.php b/template/versions/types/validation/methods.php
index 3ae535fc..3b834f83 100644
--- a/template/versions/types/validation/methods.php
+++ b/template/versions/types/validation/methods.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * 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.