diff --git a/CHECKSTYLE.md b/CHECKSTYLE.md
new file mode 100644
index 00000000..ea69e7ee
--- /dev/null
+++ b/CHECKSTYLE.md
@@ -0,0 +1,41 @@
+# Checkstyle Configuration
+
+This project uses [Checkstyle](https://checkstyle.org/) to enforce coding standards based on the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
+
+## Configuration
+
+The Checkstyle configuration is defined in `checkstyle.xml`, which extends Google Checks with additional rules:
+
+- **Copyright Header Check**: All Java source files must include a copyright header in the format:
+  ```java
+  /*
+   * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
+   */
+  ```
+
+## Running Checkstyle
+
+Checkstyle runs automatically during the Maven `validate` phase. You can also run it manually:
+
+```bash
+# Check for violations
+./mvnw checkstyle:check
+
+# Generate a report
+./mvnw checkstyle:checkstyle
+```
+
+## Updating Copyright Year
+
+When updating the copyright year in the future:
+
+1. Update all Java source files using find/replace:
+   ```bash
+   find . -name "*.java" -type f -exec sed -i 's/Copyright 2016-YYYY/Copyright 2016-NEW_YEAR/g' {} \;
+   ```
+
+2. Update the `checkstyle.xml` RegexpHeader pattern to match the new year
+
+3. Update the LICENSE file copyright year
+
+4. Run `./mvnw checkstyle:check` to verify all files are updated correctly
diff --git a/LICENSE b/LICENSE
index 6cce9ea8..a86c20d7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014-2023 Berry Cloud Ltd
+   Copyright 2014-2025 Berry Cloud Ltd
 
    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/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 00000000..e42cbd30
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,384 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration based on Google coding conventions with added copyright header check.
+    
+    This configuration extends the Google Java Style guide (compatible with Checkstyle 10.6.0)
+    and adds enforcement of copyright headers with the current year (2025).
+ -->
+
+<module name="Checker">
+  <module name="SuppressWarningsFilter"/>
+
+  <property name="charset" value="UTF-8"/>
+
+  <property name="severity" value="warning"/>
+
+  <property name="fileExtensions" value="java, properties, xml"/>
+  
+  <!-- Copyright header check -->
+  <module name="RegexpHeader">
+    <property name="header" value="^/\*\n \* Copyright 2016-2025 Berry Cloud Ltd\. All rights reserved\.\n \*/\n$"/>
+    <property name="fileExtensions" value="java"/>
+    <message key="header.mismatch" value="Copyright header must be: '/* Copyright 2016-2025 Berry Cloud Ltd. All rights reserved. */'"/>
+  </module>
+  
+  <!-- Excludes all 'module-info.java' files              -->
+  <!-- See https://checkstyle.org/config_filefilters.html -->
+  <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="module\-info\.java$"/>
+  </module>
+  <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
+  <module name="SuppressionFilter">
+    <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
+           default="checkstyle-suppressions.xml" />
+    <property name="optional" value="true"/>
+  </module>
+
+  <!-- Checks for whitespace                               -->
+  <!-- See http://checkstyle.org/config_whitespace.html -->
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+
+  <module name="LineLength">
+    <property name="fileExtensions" value="java"/>
+    <property name="max" value="100"/>
+    <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+  </module>
+
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+    <module name="IllegalTokenText">
+      <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+      <property name="format"
+               value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+      <property name="message"
+               value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+    </module>
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowEscapesForControlCharacters" value="true"/>
+      <property name="allowByTailComment" value="true"/>
+      <property name="allowNonPrintableEscapes" value="true"/>
+    </module>
+    <module name="AvoidStarImport"/>
+    <module name="OneTopLevelClass"/>
+    <module name="NoLineWrap">
+      <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="option" value="TEXT"/>
+      <property name="tokens"
+               value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+    </module>
+    <module name="NeedBraces">
+      <property name="tokens"
+               value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+    </module>
+    <module name="LeftCurly">
+      <property name="tokens"
+               value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
+                    INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
+                    LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
+                    OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
+    </module>
+    <module name="RightCurly">
+      <property name="id" value="RightCurlySame"/>
+      <property name="tokens"
+               value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
+                    LITERAL_DO"/>
+    </module>
+    <module name="RightCurly">
+      <property name="id" value="RightCurlyAlone"/>
+      <property name="option" value="alone"/>
+      <property name="tokens"
+               value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
+                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
+                    COMPACT_CTOR_DEF"/>
+    </module>
+    <module name="SuppressionXpathSingleFilter">
+      <!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
+      <property name="id" value="RightCurlyAlone"/>
+      <property name="query" value="//RCURLY[parent::SLIST[count(./*)=1]
+                                     or preceding-sibling::*[last()][self::LCURLY]]"/>
+    </module>
+    <module name="WhitespaceAfter">
+      <property name="tokens"
+               value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
+                    LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
+                    LITERAL_YIELD, LITERAL_CASE"/>
+    </module>
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyLambdas" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <property name="ignoreEnhancedForColon" value="false"/>
+      <property name="tokens"
+               value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
+                    BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
+                    LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
+                    LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
+                    LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
+                    NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
+                    SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+      <message key="ws.notFollowed"
+              value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
+               may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+      <message key="ws.notPreceded"
+              value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+    </module>
+    <module name="OneStatementPerLine"/>
+    <module name="MultipleVariableDeclarations"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="FallThrough"/>
+    <module name="UpperEll"/>
+    <module name="ModifierOrder"/>
+    <module name="EmptyLineSeparator">
+      <property name="tokens"
+               value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
+                    COMPACT_CTOR_DEF"/>
+      <property name="allowNoEmptyLineBetweenFields" value="true"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="id" value="SeparatorWrapDot"/>
+      <property name="tokens" value="DOT"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="id" value="SeparatorWrapComma"/>
+      <property name="tokens" value="COMMA"/>
+      <property name="option" value="EOL"/>
+    </module>
+    <module name="SeparatorWrap">
+      <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/259 -->
+      <property name="id" value="SeparatorWrapEllipsis"/>
+      <property name="tokens" value="ELLIPSIS"/>
+      <property name="option" value="EOL"/>
+    </module>
+    <module name="SeparatorWrap">
+      <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
+      <property name="id" value="SeparatorWrapArrayDeclarator"/>
+      <property name="tokens" value="ARRAY_DECLARATOR"/>
+      <property name="option" value="EOL"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="id" value="SeparatorWrapMethodRef"/>
+      <property name="tokens" value="METHOD_REF"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="PackageName">
+      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+      <message key="name.invalidPattern"
+             value="Package name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="TypeName">
+      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                    ANNOTATION_DEF, RECORD_DEF"/>
+      <message key="name.invalidPattern"
+             value="Type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="MemberName">
+      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+      <message key="name.invalidPattern"
+             value="Member name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="ParameterName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+             value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="LambdaParameterName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+             value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="CatchParameterName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+             value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+             value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="PatternVariableName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+             value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="ClassTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+             value="Class type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="RecordComponentName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+               value="Record component name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="RecordTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+               value="Record type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="MethodTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+             value="Method type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="InterfaceTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+             value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="NoFinalizer"/>
+    <module name="GenericWhitespace">
+      <message key="ws.followed"
+             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+      <message key="ws.preceded"
+             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+      <message key="ws.illegalFollow"
+             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+      <message key="ws.notPreceded"
+             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+    </module>
+    <module name="Indentation">
+      <property name="basicOffset" value="2"/>
+      <property name="braceAdjustment" value="2"/>
+      <property name="caseIndent" value="2"/>
+      <property name="throwsIndent" value="4"/>
+      <property name="lineWrappingIndentation" value="4"/>
+      <property name="arrayInitIndent" value="2"/>
+    </module>
+    <module name="AbbreviationAsWordInName">
+      <property name="ignoreFinal" value="false"/>
+      <property name="allowedAbbreviationLength" value="0"/>
+      <property name="tokens"
+               value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
+                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
+                    RECORD_COMPONENT_DEF"/>
+    </module>
+    <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+    <module name="OverloadMethodsDeclarationOrder"/>
+    <module name="VariableDeclarationUsageDistance"/>
+    <module name="CustomImportOrder">
+      <property name="sortImportsInGroupAlphabetically" value="true"/>
+      <property name="separateLineBetweenGroups" value="true"/>
+      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+      <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
+    </module>
+    <module name="MethodParamPad">
+      <property name="tokens"
+               value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="tokens"
+               value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
+                    LABELED_STAT, METHOD_REF"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+    <module name="ParenPad">
+      <property name="tokens"
+               value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
+                    EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
+                    METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
+                    RECORD_DEF"/>
+    </module>
+    <module name="OperatorWrap">
+      <property name="option" value="NL"/>
+      <property name="tokens"
+               value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
+                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
+                    TYPE_EXTENSION_AND "/>
+    </module>
+    <module name="AnnotationLocation">
+      <property name="id" value="AnnotationLocationMostCases"/>
+      <property name="tokens"
+               value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
+                      RECORD_DEF, COMPACT_CTOR_DEF"/>
+    </module>
+    <module name="AnnotationLocation">
+      <property name="id" value="AnnotationLocationVariables"/>
+      <property name="tokens" value="VARIABLE_DEF"/>
+      <property name="allowSamelineMultipleAnnotations" value="true"/>
+    </module>
+    <module name="NonEmptyAtclauseDescription"/>
+    <module name="InvalidJavadocPosition"/>
+    <module name="JavadocTagContinuationIndentation"/>
+    <module name="SummaryJavadoc">
+      <property name="forbiddenSummaryFragments"
+               value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+    </module>
+    <module name="JavadocParagraph"/>
+    <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+    <module name="AtclauseOrder">
+      <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+      <property name="target"
+               value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+    </module>
+    <module name="JavadocMethod">
+      <property name="accessModifiers" value="public"/>
+      <property name="allowMissingParamTags" value="true"/>
+      <property name="allowMissingReturnTag" value="true"/>
+      <property name="allowedAnnotations" value="Override, Test"/>
+      <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
+    </module>
+    <module name="MissingJavadocMethod">
+      <property name="scope" value="public"/>
+      <property name="minLineCount" value="2"/>
+      <property name="allowedAnnotations" value="Override, Test"/>
+      <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
+                                   COMPACT_CTOR_DEF"/>
+    </module>
+    <module name="MissingJavadocType">
+      <property name="scope" value="protected"/>
+      <property name="tokens"
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                      RECORD_DEF, ANNOTATION_DEF"/>
+      <property name="excludeScope" value="nothing"/>
+    </module>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-z0-9]\w*$"/>
+      <message key="name.invalidPattern"
+             value="Method name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="SingleLineJavadoc"/>
+    <module name="EmptyCatchBlock">
+      <property name="exceptionVariableName" value="expected"/>
+    </module>
+    <module name="CommentsIndentation">
+      <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
+    </module>
+    <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
+    <module name="SuppressionXpathFilter">
+      <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
+             default="checkstyle-xpath-suppressions.xml" />
+      <property name="optional" value="true"/>
+    </module>
+    <module name="SuppressWarningsHolder" />
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)" />
+      <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)" />
+      <property name="checkFormat" value="$1" />
+    </module>
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="CHECKSTYLE.SUPPRESS\: ([\w\|]+)"/>
+      <!-- $1 refers to the first match group in the regex defined in commentFormat -->
+      <property name="checkFormat" value="$1"/>
+      <!-- The check is suppressed in the next line of code after the comment -->
+      <property name="influenceFormat" value="1"/>
+    </module>
+  </module>
+</module>
diff --git a/pom.xml b/pom.xml
index b7380438..1c4e59a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,8 +229,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>${checkstyle.version}</version>
+          </dependency>
+        </dependencies>
         <configuration>
-          <configLocation>google_checks.xml</configLocation>
+          <configLocation>checkstyle.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <failOnViolation>true</failOnViolation>
           <violationSeverity>warning</violationSeverity>
diff --git a/samples/core/src/main/java/dev/learning/xapi/samples/core/ExampleState.java b/samples/core/src/main/java/dev/learning/xapi/samples/core/ExampleState.java
index a0c1307f..62fd85c3 100644
--- a/samples/core/src/main/java/dev/learning/xapi/samples/core/ExampleState.java
+++ b/samples/core/src/main/java/dev/learning/xapi/samples/core/ExampleState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.core;
diff --git a/samples/delete-activity-profile/src/main/java/dev/learning/xapi/samples/deleteactivityprofile/DeleteActivityProfileApplication.java b/samples/delete-activity-profile/src/main/java/dev/learning/xapi/samples/deleteactivityprofile/DeleteActivityProfileApplication.java
index 1f0e20e5..afd13463 100644
--- a/samples/delete-activity-profile/src/main/java/dev/learning/xapi/samples/deleteactivityprofile/DeleteActivityProfileApplication.java
+++ b/samples/delete-activity-profile/src/main/java/dev/learning/xapi/samples/deleteactivityprofile/DeleteActivityProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.deleteactivityprofile;
diff --git a/samples/delete-agent-profile/src/main/java/dev/learning/xapi/samples/deleteagentprofile/DeleteAgentProfileApplication.java b/samples/delete-agent-profile/src/main/java/dev/learning/xapi/samples/deleteagentprofile/DeleteAgentProfileApplication.java
index 15ddb221..09a74183 100644
--- a/samples/delete-agent-profile/src/main/java/dev/learning/xapi/samples/deleteagentprofile/DeleteAgentProfileApplication.java
+++ b/samples/delete-agent-profile/src/main/java/dev/learning/xapi/samples/deleteagentprofile/DeleteAgentProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.deleteagentprofile;
diff --git a/samples/delete-state/src/main/java/dev/learning/xapi/samples/deletestate/DeleteStateApplication.java b/samples/delete-state/src/main/java/dev/learning/xapi/samples/deletestate/DeleteStateApplication.java
index adf6c7af..7e5e5774 100644
--- a/samples/delete-state/src/main/java/dev/learning/xapi/samples/deletestate/DeleteStateApplication.java
+++ b/samples/delete-state/src/main/java/dev/learning/xapi/samples/deletestate/DeleteStateApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.deletestate;
diff --git a/samples/delete-states/src/main/java/dev/learning/xapi/samples/deletestates/DeleteStatesApplication.java b/samples/delete-states/src/main/java/dev/learning/xapi/samples/deletestates/DeleteStatesApplication.java
index f46985db..8913a3fb 100644
--- a/samples/delete-states/src/main/java/dev/learning/xapi/samples/deletestates/DeleteStatesApplication.java
+++ b/samples/delete-states/src/main/java/dev/learning/xapi/samples/deletestates/DeleteStatesApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.deletestates;
diff --git a/samples/get-about/src/main/java/dev/learning/xapi/samples/getabout/GetAboutApplication.java b/samples/get-about/src/main/java/dev/learning/xapi/samples/getabout/GetAboutApplication.java
index cf2fcd40..81888cd3 100644
--- a/samples/get-about/src/main/java/dev/learning/xapi/samples/getabout/GetAboutApplication.java
+++ b/samples/get-about/src/main/java/dev/learning/xapi/samples/getabout/GetAboutApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getabout;
diff --git a/samples/get-activity-profile/src/main/java/dev/learning/xapi/samples/getactivityprofile/GetActivityProfileApplication.java b/samples/get-activity-profile/src/main/java/dev/learning/xapi/samples/getactivityprofile/GetActivityProfileApplication.java
index 2dfceb9b..a6f5e6be 100644
--- a/samples/get-activity-profile/src/main/java/dev/learning/xapi/samples/getactivityprofile/GetActivityProfileApplication.java
+++ b/samples/get-activity-profile/src/main/java/dev/learning/xapi/samples/getactivityprofile/GetActivityProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getactivityprofile;
diff --git a/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java b/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java
index 2604d71d..b9f77875 100644
--- a/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java
+++ b/samples/get-activity-profiles/src/main/java/dev/learning/xapi/samples/getactivityprofiles/GetActivityProfilesApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getactivityprofiles;
diff --git a/samples/get-activity/src/main/java/dev/learning/xapi/samples/getactivity/GetActivityApplication.java b/samples/get-activity/src/main/java/dev/learning/xapi/samples/getactivity/GetActivityApplication.java
index 1f951dfb..f4eff29f 100644
--- a/samples/get-activity/src/main/java/dev/learning/xapi/samples/getactivity/GetActivityApplication.java
+++ b/samples/get-activity/src/main/java/dev/learning/xapi/samples/getactivity/GetActivityApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getactivity;
diff --git a/samples/get-agent-profile/src/main/java/dev/learning/xapi/samples/getagentprofile/GetAgentProfileApplication.java b/samples/get-agent-profile/src/main/java/dev/learning/xapi/samples/getagentprofile/GetAgentProfileApplication.java
index 5eac0322..19051f8a 100644
--- a/samples/get-agent-profile/src/main/java/dev/learning/xapi/samples/getagentprofile/GetAgentProfileApplication.java
+++ b/samples/get-agent-profile/src/main/java/dev/learning/xapi/samples/getagentprofile/GetAgentProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getagentprofile;
diff --git a/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java b/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java
index 46351550..a0e0df72 100644
--- a/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java
+++ b/samples/get-agent-profiles/src/main/java/dev/learning/xapi/samples/getagentprofiles/GetAgentProfilesApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getagentprofiles;
diff --git a/samples/get-agents/src/main/java/dev/learning/xapi/samples/getagents/GetAgentsApplication.java b/samples/get-agents/src/main/java/dev/learning/xapi/samples/getagents/GetAgentsApplication.java
index fa89cefd..c0cc5f1c 100644
--- a/samples/get-agents/src/main/java/dev/learning/xapi/samples/getagents/GetAgentsApplication.java
+++ b/samples/get-agents/src/main/java/dev/learning/xapi/samples/getagents/GetAgentsApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getagents;
diff --git a/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java b/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java
index 3692eeba..d1a9f583 100644
--- a/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java
+++ b/samples/get-more-statements/src/main/java/dev/learning/xapi/samples/getmorestatements/GetMoreStatementsApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getmorestatements;
diff --git a/samples/get-state/src/main/java/dev/learning/xapi/samples/getstate/GetStateApplication.java b/samples/get-state/src/main/java/dev/learning/xapi/samples/getstate/GetStateApplication.java
index d59967a2..a2d9d886 100644
--- a/samples/get-state/src/main/java/dev/learning/xapi/samples/getstate/GetStateApplication.java
+++ b/samples/get-state/src/main/java/dev/learning/xapi/samples/getstate/GetStateApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getstate;
diff --git a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
index dc2b7eda..61a6b73b 100644
--- a/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
+++ b/samples/get-statement-iterator/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementIteratorApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getstatements;
diff --git a/samples/get-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/GetStatementWithAttachmentApplication.java b/samples/get-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/GetStatementWithAttachmentApplication.java
index 0ca96fa7..2893c9de 100644
--- a/samples/get-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/GetStatementWithAttachmentApplication.java
+++ b/samples/get-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/GetStatementWithAttachmentApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.poststatement;
diff --git a/samples/get-statement/src/main/java/dev/learning/xapi/samples/getstatement/GetStatementApplication.java b/samples/get-statement/src/main/java/dev/learning/xapi/samples/getstatement/GetStatementApplication.java
index 53cb88a1..b5eac2da 100644
--- a/samples/get-statement/src/main/java/dev/learning/xapi/samples/getstatement/GetStatementApplication.java
+++ b/samples/get-statement/src/main/java/dev/learning/xapi/samples/getstatement/GetStatementApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getstatement;
diff --git a/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java b/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
index 1c7f3789..5cd9fc7a 100644
--- a/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
+++ b/samples/get-statements/src/main/java/dev/learning/xapi/samples/getstatements/GetStatementsApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getstatements;
diff --git a/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java b/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java
index 25ff61fe..3728742d 100644
--- a/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java
+++ b/samples/get-states/src/main/java/dev/learning/xapi/samples/getstates/GetStatesApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getstates;
diff --git a/samples/get-voided-statement/src/main/java/dev/learning/xapi/samples/getvoidedstatement/GetVoidedStatementApplication.java b/samples/get-voided-statement/src/main/java/dev/learning/xapi/samples/getvoidedstatement/GetVoidedStatementApplication.java
index a96dbaf2..3b2db86d 100644
--- a/samples/get-voided-statement/src/main/java/dev/learning/xapi/samples/getvoidedstatement/GetVoidedStatementApplication.java
+++ b/samples/get-voided-statement/src/main/java/dev/learning/xapi/samples/getvoidedstatement/GetVoidedStatementApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.getvoidedstatement;
diff --git a/samples/post-activity-profile/src/main/java/dev/learning/xapi/samples/postactivityprofile/PostActivityProfileApplication.java b/samples/post-activity-profile/src/main/java/dev/learning/xapi/samples/postactivityprofile/PostActivityProfileApplication.java
index f99d14c5..337b9102 100644
--- a/samples/post-activity-profile/src/main/java/dev/learning/xapi/samples/postactivityprofile/PostActivityProfileApplication.java
+++ b/samples/post-activity-profile/src/main/java/dev/learning/xapi/samples/postactivityprofile/PostActivityProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.postactivityprofile;
diff --git a/samples/post-agent-profile/src/main/java/dev/learning/xapi/samples/postagentprofile/PostAgentProfileApplication.java b/samples/post-agent-profile/src/main/java/dev/learning/xapi/samples/postagentprofile/PostAgentProfileApplication.java
index 569ccf79..d5263332 100644
--- a/samples/post-agent-profile/src/main/java/dev/learning/xapi/samples/postagentprofile/PostAgentProfileApplication.java
+++ b/samples/post-agent-profile/src/main/java/dev/learning/xapi/samples/postagentprofile/PostAgentProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.postagentprofile;
diff --git a/samples/post-signed-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostSignedStatementApplication.java b/samples/post-signed-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostSignedStatementApplication.java
index 0aa6de99..2be12be9 100644
--- a/samples/post-signed-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostSignedStatementApplication.java
+++ b/samples/post-signed-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostSignedStatementApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.poststatement;
diff --git a/samples/post-state/src/main/java/dev/learning/xapi/samples/poststate/PostStateApplication.java b/samples/post-state/src/main/java/dev/learning/xapi/samples/poststate/PostStateApplication.java
index 952bc5c2..cc1d05c5 100644
--- a/samples/post-state/src/main/java/dev/learning/xapi/samples/poststate/PostStateApplication.java
+++ b/samples/post-state/src/main/java/dev/learning/xapi/samples/poststate/PostStateApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.poststate;
diff --git a/samples/post-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementWithAttachmentApplication.java b/samples/post-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementWithAttachmentApplication.java
index b967dba7..d05cd2e7 100644
--- a/samples/post-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementWithAttachmentApplication.java
+++ b/samples/post-statement-with-attachment/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementWithAttachmentApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.poststatement;
diff --git a/samples/post-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementApplication.java b/samples/post-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementApplication.java
index e9763e80..44d40be2 100644
--- a/samples/post-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementApplication.java
+++ b/samples/post-statement/src/main/java/dev/learning/xapi/samples/poststatement/PostStatementApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.poststatement;
diff --git a/samples/post-statements/src/main/java/dev/learning/xapi/samples/poststatements/PostStatementsApplication.java b/samples/post-statements/src/main/java/dev/learning/xapi/samples/poststatements/PostStatementsApplication.java
index 6a0cfd39..8d640c7b 100644
--- a/samples/post-statements/src/main/java/dev/learning/xapi/samples/poststatements/PostStatementsApplication.java
+++ b/samples/post-statements/src/main/java/dev/learning/xapi/samples/poststatements/PostStatementsApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.poststatements;
diff --git a/samples/put-activity-profile/src/main/java/dev/learning/xapi/samples/putactivityprofile/PutActivityProfileApplication.java b/samples/put-activity-profile/src/main/java/dev/learning/xapi/samples/putactivityprofile/PutActivityProfileApplication.java
index 70fd40b5..eaed9830 100644
--- a/samples/put-activity-profile/src/main/java/dev/learning/xapi/samples/putactivityprofile/PutActivityProfileApplication.java
+++ b/samples/put-activity-profile/src/main/java/dev/learning/xapi/samples/putactivityprofile/PutActivityProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.putactivityprofile;
diff --git a/samples/put-agent-profile/src/main/java/dev/learning/xapi/samples/putagentprofile/PutAgentProfileApplication.java b/samples/put-agent-profile/src/main/java/dev/learning/xapi/samples/putagentprofile/PutAgentProfileApplication.java
index 2be716eb..f81aa1e0 100644
--- a/samples/put-agent-profile/src/main/java/dev/learning/xapi/samples/putagentprofile/PutAgentProfileApplication.java
+++ b/samples/put-agent-profile/src/main/java/dev/learning/xapi/samples/putagentprofile/PutAgentProfileApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.putagentprofile;
diff --git a/samples/put-state/src/main/java/dev/learning/xapi/samples/putstate/PutStateApplication.java b/samples/put-state/src/main/java/dev/learning/xapi/samples/putstate/PutStateApplication.java
index 6a61c1d2..257bfa1b 100644
--- a/samples/put-state/src/main/java/dev/learning/xapi/samples/putstate/PutStateApplication.java
+++ b/samples/put-state/src/main/java/dev/learning/xapi/samples/putstate/PutStateApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.putstate;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/InstantConverter.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/InstantConverter.java
index 1b8a5f71..4cc359cd 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/InstantConverter.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/InstantConverter.java
@@ -1,5 +1,5 @@
 /*
- * /* Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/ServerControllerAdvice.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/ServerControllerAdvice.java
index 3cb9a9cc..1b07d136 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/ServerControllerAdvice.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/ServerControllerAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java
index d97a3994..7abe261f 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java
index a40ddb28..5d58cc33 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementRepository.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementRepository.java
index c711132b..4c5cb0a9 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementRepository.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java
index 78ddacbb..bf16fbf2 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java
index 593ee901..4779b19e 100644
--- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java
+++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java b/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java
index 1c9bf598..2109fe2e 100644
--- a/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java
+++ b/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.samples.xapiserver;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/ActivityProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/ActivityProfileRequest.java
index 5ae563fd..4cacaac5 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/ActivityProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/ActivityProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java
index 99633bd3..f2832d94 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/AttachmentHttpMessageWriter.java b/xapi-client/src/main/java/dev/learning/xapi/client/AttachmentHttpMessageWriter.java
index 54ae1552..31d237c5 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/AttachmentHttpMessageWriter.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/AttachmentHttpMessageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteActivityProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteActivityProfileRequest.java
index ad4eda45..50770b9d 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteActivityProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteActivityProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteAgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteAgentProfileRequest.java
index 2d09f66a..c172d629 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteAgentProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteAgentProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStateRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStateRequest.java
index 29642267..d9654222 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStateRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStatesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStatesRequest.java
index b0ab28d7..f693d4a3 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStatesRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/DeleteStatesRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfileRequest.java
index 052d7757..f5dbbbee 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfilesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfilesRequest.java
index b4b4f2d9..7d3dc41d 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfilesRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityProfilesRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityRequest.java
index 81a86e0f..ef6679d8 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetActivityRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfileRequest.java
index 4e4cab75..af62be08 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java
index 4a3fc667..a7100890 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java
index be438bfb..4befeb0f 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetMoreStatementsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetMoreStatementsRequest.java
index 97a80c8c..9972baeb 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetMoreStatementsRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetMoreStatementsRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStateRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStateRequest.java
index 24f5e666..e99d62df 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStateRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementRequest.java
index ec25885b..534b3e5a 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java
index b8aba64a..ebdfb8a6 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatesRequest.java
index ef6abaf1..5689e9b5 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatesRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatesRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetVoidedStatementRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetVoidedStatementRequest.java
index 49e21ee6..c76273c4 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/GetVoidedStatementRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetVoidedStatementRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/MissingResponseBodyException.java b/xapi-client/src/main/java/dev/learning/xapi/client/MissingResponseBodyException.java
index 8e9af431..63dd84a7 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/MissingResponseBodyException.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/MissingResponseBodyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PostActivityProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PostActivityProfileRequest.java
index 820f2c22..21f34a77 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PostActivityProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PostActivityProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PostAgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PostAgentProfileRequest.java
index d221eccf..e3fd70dc 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PostAgentProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PostAgentProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PostStateRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PostStateRequest.java
index 8298bfd2..b96fdf93 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PostStateRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PostStateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementRequest.java
index 2fa65029..568a6ce1 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementsRequest.java
index 8e9751d9..ba854c90 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementsRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PostStatementsRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PutActivityProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PutActivityProfileRequest.java
index f71ac1fb..c79774f6 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PutActivityProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PutActivityProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PutAgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PutAgentProfileRequest.java
index ec1632ea..ace9706e 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PutAgentProfileRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PutAgentProfileRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/PutStateRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/PutStateRequest.java
index a5b791ed..b64780f6 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/PutStateRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/PutStateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/Request.java b/xapi-client/src/main/java/dev/learning/xapi/client/Request.java
index 1ea7d76c..70ed0829 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/Request.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/StateRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/StateRequest.java
index bc8f2470..2213a285 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/StateRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/StateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageReader.java b/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageReader.java
index ddab596a..4e65ac16 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageReader.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageWriter.java b/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageWriter.java
index 5cb1232c..2969fe99 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageWriter.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/StatementHttpMessageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java
index 07fee652..036ff112 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java
index e3fb9812..815e5cab 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java
index ab2438ac..3196a45e 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client.configuration;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientConfigurer.java b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientConfigurer.java
index 049250db..45b08018 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientConfigurer.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client.configuration;
diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientProperties.java b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientProperties.java
index 8b186487..9d4f4c0d 100644
--- a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientProperties.java
+++ b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.client.configuration;
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java
index 9bfe01ca..c87e3baa 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteActivityProfileRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java
index 1bd1477f..11fd3933 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStateRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java
index 22fa9a33..cf90a651 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/DeleteStatesRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java
index 5477e25a..98c4cdea 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetActivityProfilesRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java
index f27469bd..3a1b9385 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetMoreStatementsRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java
index 022ec00f..7d27e6c9 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetStateRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java
index 17d9cfb9..c7fa6fe8 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatementsRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java
index 38a5e744..8bd48f04 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/GetStatesRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java
index cd93f763..c4e62f07 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/PostStateRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java
index 69367a3f..29096f73 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/PutStateRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/TestApp.java b/xapi-client/src/test/java/dev/learning/xapi/client/TestApp.java
index e03afd41..746ea8ac 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/TestApp.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/TestApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientMultipartTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientMultipartTests.java
index b331b249..f80f72c8 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientMultipartTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientMultipartTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
index 26e88e7e..9b9c112e 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/XapiClientTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java
index d236eaca..41321311 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client.configuration;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java
index 503e56ff..a59b803a 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client.configuration;
 
diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java
index f3f20da6..bbef6ff7 100644
--- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java
+++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 package dev.learning.xapi.client.configuration;
 
diff --git a/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java
index 7b3e5bdc..3aa9cb3d 100644
--- a/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java
+++ b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.autoconfigure.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java
index 02253f2e..8677f613 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java
index 6f1dd054..eeaf8f1a 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java
index 5e53d7b2..e6772f3f 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java
index 356791e9..b30147af 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java
index a8928979..3570ffd1 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java
index fa5bfedb..39d9ca58 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java
index 1b047ddf..83c19808 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java
index 164a640d..9314ac7b 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java
index 83db6eaa..c6846fb6 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java
index 11d4bc42..92927bc0 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson.model.strict;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/XapiTimestamp.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/XapiTimestamp.java
index afc4120b..7555a522 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/XapiTimestamp.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/XapiTimestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.jackson.model.strict;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/About.java b/xapi-model/src/main/java/dev/learning/xapi/model/About.java
index 314cf7f7..3b0e3ea0 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/About.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/About.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Account.java b/xapi-model/src/main/java/dev/learning/xapi/model/Account.java
index 759bf261..38812fe5 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Account.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Account.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java b/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java
index 244f427e..841991b5 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java
index 4c7dd03c..1738bc4e 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java
index 2ddb8bd0..d5359a89 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java b/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java
index d05bba4e..bbaf8a7d 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java
index a0ae44c9..0cadc0a6 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java b/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java
index 44481a12..dcca1fdf 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Context.java b/xapi-model/src/main/java/dev/learning/xapi/model/Context.java
index 2be3c0aa..209c3de9 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Context.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java b/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java
index 01073764..303f73b1 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/CoreStatement.java b/xapi-model/src/main/java/dev/learning/xapi/model/CoreStatement.java
index 374d5b3f..11fd173c 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/CoreStatement.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/CoreStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Group.java b/xapi-model/src/main/java/dev/learning/xapi/model/Group.java
index 76e959dc..ec88f7c1 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Group.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Group.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java
index b42bc529..43ce4338 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java
index 24bae2f5..e52843a8 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java b/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java
index 9b3002fd..5db5af6f 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Person.java b/xapi-model/src/main/java/dev/learning/xapi/model/Person.java
index 6df4a8bd..c2ceafc6 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Person.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Result.java b/xapi-model/src/main/java/dev/learning/xapi/model/Result.java
index f6d63ebd..b392cce9 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Result.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Result.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Score.java b/xapi-model/src/main/java/dev/learning/xapi/model/Score.java
index 23268322..c286cc91 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Score.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Score.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java
index edcee8ed..89e38730 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementFormat.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementFormat.java
index 558cd21c..348159d1 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementFormat.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java
index a8631923..b8bda813 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementReference.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementReference.java
index 9899c937..c9a5afdd 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementReference.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java
index 3a474d6c..646ba7ee 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java
index 15119d31..e3b656e3 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java
index bb8d20f4..a4ef7d83 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java b/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java
index c90fd87c..60c30b82 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/HasScheme.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/HasScheme.java
index 6ef315a8..327d7585 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/HasScheme.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/HasScheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Mbox.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Mbox.java
index c598f22e..07ec4350 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Mbox.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Mbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/NotUndetermined.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/NotUndetermined.java
index 54386307..fc68e993 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/NotUndetermined.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/NotUndetermined.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ScaledScore.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ScaledScore.java
index 00c88a3c..9680b5e0 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ScaledScore.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ScaledScore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Statements.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Statements.java
index 6967005a..f5d04375 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Statements.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Statements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/VaildScore.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/VaildScore.java
index 4340d388..26fccf91 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/VaildScore.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/VaildScore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActivityDefinition.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActivityDefinition.java
index 9f89823a..9e2d2f33 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActivityDefinition.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActivityDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActor.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActor.java
index a9074bd9..ac2f085e 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActor.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidActor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidAuthority.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidAuthority.java
index 119fd24b..491c9fe3 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidAuthority.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidAuthority.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementPlatform.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementPlatform.java
index c3d832e6..6d64846e 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementPlatform.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementPlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementRevision.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementRevision.java
index 5782966d..10a38fe0 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementRevision.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementRevision.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementVerb.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementVerb.java
index ac518a9a..79f0822c 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementVerb.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/ValidStatementVerb.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Variant.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Variant.java
index fab4b35d..3b0ff13b 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Variant.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/constraints/Variant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.constraints;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/DisableableValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/DisableableValidator.java
index 3a1bbe42..ab9c766e 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/DisableableValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/DisableableValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.disableable;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/ValidatorDisabler.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/ValidatorDisabler.java
index 344a28e6..c7b511b6 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/ValidatorDisabler.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/disableable/ValidatorDisabler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.disableable;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidator.java
index 6f2a0050..5e37c1fd 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActorValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActorValidator.java
index 53c9fcae..59feb850 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActorValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActorValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidator.java
index 362233ff..c45751e5 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUri.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUri.java
index 48a1170d..237a28b6 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUri.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUri.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/MboxValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/MboxValidator.java
index fd5da13c..907866d4 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/MboxValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/MboxValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidator.java
index 6bf82017..1b6ce694 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidator.java
index 95b19347..054f454b 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidator.java
index a1da16a9..8b9a4a13 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidator.java
index 8e9df58e..873cdb5a 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidator.java
index b0bf6328..0aeb3c67 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidator.java
index 30fba1c1..4dfbf113 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidator.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidator.java
index d3abdc7b..eba8a9d8 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidator.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuid.java b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuid.java
index 259e869f..f0d6775f 100644
--- a/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuid.java
+++ b/xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java
index 730231e2..92b16e8b 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java
index 6b7e8978..efe2b1e2 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java
index 6548d05a..090f0788 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java
index 1f0e805d..6e0aa9b2 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java
index 659641eb..f5af9530 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java
index 7a2d0280..a079ba13 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java
index 081475b4..74337026 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java
index 2b75c365..68c22820 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java
index 817cbb91..8b5b6e84 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java
index 391fbb1e..a2a04c9d 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java
index a7835802..b1a31c5d 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java
index 9564ad29..c7e6b1ba 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java
index 53dd9a34..ed69abf0 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java
index 24f25d54..930e8ea3 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java
index 72c7d166..e916f56b 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java
index d7066785..398e545c 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java
index a2f92411..089f821c 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java
index 8fd165f0..973ace80 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java
index ad165786..00656796 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java
index 78deed8c..f8b137a7 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java
index caadcb2c..0a7c3d66 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java
index 057f76ec..623c3672 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java
index a664301f..4400d414 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java
index 7d822df8..c68f0be5 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java
index c7d4d4e5..6cbc7260 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java
index 92ecb75f..37d0a878 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java
index 9f6a36df..4212060c 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidatorTests.java
index 41b7b854..b8565508 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidatorTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java
index 7dd31096..6677ae26 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java
index b67dfa9c..1af99dd1 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java
index 93d4ffd4..11c5f79f 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidatorTest.java
index 71dbe129..c5307e21 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidatorTest.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementsValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;
diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java
index 7db20f55..c051a69f 100644
--- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java
+++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
+ * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved.
  */
 
 package dev.learning.xapi.model.validation.internal.validators;