diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..506f37c
--- /dev/null
+++ b/.config/checkstyle/checkstyle.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+	<!-- Only check code -->
+	<property name="fileExtensions" value="java"/>
+	<property name="severity" value="error"/>
+
+	<property name="tabWidth" value="4"/>
+
+	<module name="SuppressionFilter">
+		<property name="file" value=".config/checkstyle/suppressions.xml"/>
+	</module>
+
+	<module name="FileLength"/>
+	<module name="LineLength">
+		<property name="max" value="120"/>
+		<property name="fileExtensions" value="java"/>
+		<!-- Ignore default + links in comments -->
+		<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
+	</module>
+	<module name="NewlineAtEndOfFile"/>
+
+	<module name="RegexpSingleline">
+		<!-- Ignore inside block comments (*) -->
+		<property name="format" value="[^\s\*][\s]{1,}$"/>
+		<property name="minimum" value="0"/>
+		<property name="maximum" value="0"/>
+		<property name="message" value="Line has trailing whitespaces"/>
+	</module>
+
+	<!-- Generated code -->
+	<module name="SuppressionSingleFilter">
+		<property name="checks" value="."/>
+		<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
+	</module>
+	<module name="SuppressionSingleFilter">
+		<property name="checks" value="."/>
+		<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
+	</module>
+	<!-- Test code -->
+	<module name="SuppressionSingleFilter">
+		<property name="checks" value="MagicNumberCheck"/>
+		<property name="files" value="[\\/]test[\\/].*\.java$"/>
+	</module>
+	<module name="SuppressWarningsFilter"/>
+
+	<module name="TreeWalker">
+		<!-- Checks - sorted alphabetically -->
+		<module name="ArrayTypeStyle"/>
+		<module name="AvoidStarImport"/>
+		<module name="ConstantName"/>
+		<module name="DefaultComesLast"/>
+		<module name="EmptyBlock"/>
+		<module name="EmptyCatchBlock"/>
+		<module name="EmptyForInitializerPad"/>
+		<module name="EmptyForIteratorPad"/>
+		<module name="EmptyStatement"/>
+		<module name="EqualsHashCode"/>
+		<module name="ExplicitInitialization">
+			<property name="severity" value="info"/>
+		</module>
+		<module name="FinalClass"/>
+		<module name="FinalParameters"/>
+		<module name="GenericWhitespace"/>
+		<module name="HideUtilityClassConstructor"/>
+		<module name="IllegalImport"/>
+		<module name="InterfaceIsType"/>
+		<module name="JavadocStyle">
+			<property name="checkFirstSentence" value="false"/>
+		</module>
+		<module name="LeftCurly">
+			<!-- Default minus Lambda -->
+			<property name="tokens" value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, 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"/>
+			<property name="option" value="nl"/>
+		</module>
+		<module name="LocalFinalVariableName"/>
+		<module name="LocalVariableName"/>
+		<module name="MagicNumber">
+			<property name="ignoreAnnotation" value="true"/>
+			<property name="ignoreFieldDeclaration" value="true"/>
+			<property name="ignoreHashCodeMethod" value="true"/>
+			<!-- Defaults + other common constant values (e.g. time) -->
+			<property name="ignoreNumbers" value="-1, 0, 1, 2, 3, 4, 5, 10, 12, 24, 31, 60, 100, 1000"/>
+		</module>
+		<module name="MemberName"/>
+		<module name="MethodLength"/>
+		<module name="MethodName"/>
+		<module name="MethodParamPad"/>
+		<module name="MissingDeprecated"/>
+		<module name="MissingOverride"/>
+		<module name="MissingSwitchDefault"/>
+		<module name="ModifierOrder"/>
+		<module name="NeedBraces"/>
+		<module name="NoClone"/>
+		<module name="NoFinalizer"/>
+		<module name="NonEmptyAtclauseDescription"/>
+		<module name="NoWhitespaceAfter"/>
+		<module name="NoWhitespaceBefore"/>
+		<module name="OneStatementPerLine"/>
+		<module name="OneTopLevelClass"/>
+		<module name="OperatorWrap"/>
+		<module name="OuterTypeNumber"/>
+		<module name="PackageName"/>
+		<module name="ParameterName"/>
+		<module name="ParenPad"/>
+		<module name="RedundantImport"/>
+		<module name="RequireThis"/>
+		<module name="RightCurly">
+			<property name="option" value="alone"/>
+		</module>
+		<module name="SimplifyBooleanExpression"/>
+		<module name="StaticVariableName"/>
+		<module name="StringLiteralEquality"/>
+		<module name="SuppressWarningsHolder"/>
+		<module name="TodoComment">
+			<property name="severity" value="info"/>
+		</module>
+		<module name="TypecastParenPad"/>
+		<module name="TypeName"/>
+		<module name="UnusedImports"/>
+		<module name="UpperEll"/>
+		<module name="VisibilityModifier">
+			<property name="packageAllowed" value="true"/>
+			<property name="protectedAllowed" value="true"/>
+		</module>
+		<module name="WhitespaceAfter">
+			<property name="tokens" value="COMMA,SEMI"/>
+		</module>
+		<module name="WhitespaceAround">
+			<property name="tokens"
+					  value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,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,TYPE_EXTENSION_AND"/>
+		</module>
+
+		<!-- Filter -->
+		<module name="SuppressionCommentFilter">
+			<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
+			<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
+		</module>
+	</module>
+</module>
diff --git a/.config/checkstyle/suppressions.xml b/.config/checkstyle/suppressions.xml
new file mode 100644
index 0000000..16d385e
--- /dev/null
+++ b/.config/checkstyle/suppressions.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+</suppressions>
diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
index c23ac42..c7b324d 100644
--- a/.github/workflows/checkBuild.yml
+++ b/.github/workflows/checkBuild.yml
@@ -6,10 +6,16 @@ on:
     branches: [ develop ]
     paths-ignore: 
       - '**.md'
+      - '.config/**'
+      - '.idea/**'
+      - 'assets/**'
   pull_request:
     branches: [ develop ]
     paths-ignore: 
       - '**.md'
+      - '.config/**'
+      - '.idea/**'
+      - 'assets/**'
 
 env:
   PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
@@ -21,14 +27,14 @@ jobs:
 
     strategy:
       matrix:
-        java: [17]
+        java: [17, 21]
         distribution: [temurin]
 
     steps:
     - uses: actions/checkout@v4
       
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}
@@ -56,8 +62,29 @@ jobs:
         fi
 
     - name: Upload demo files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: demo-files-java-${{ matrix.java }}
         path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
         if-no-files-found: error
+
+  code-style:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: [17]
+        distribution: [temurin]
+
+    steps:
+    - uses: actions/checkout@v4
+      
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: ${{ matrix.distribution }}
+        java-version: ${{ matrix.java }}
+        cache: 'maven'
+
+    - name: Run Checkstyle
+      run: mvn -B checkstyle:check -P checkstyle -T2C
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2ae4d2..e03a52d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
       
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -101,7 +101,7 @@ jobs:
           Add the following lines to your pom:
           ```XML
           <dependency>
-             <groupId>com.xdev-software</groupId>
+             <groupId>software.xdev</groupId>
              <artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
              <version>${{ steps.version.outputs.release }}</version>
           </dependency>
@@ -120,7 +120,7 @@ jobs:
         git pull
     
     - name: Set up JDK Apache Maven Central
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         java-version: '17'
         distribution: 'temurin'
@@ -133,8 +133,8 @@ jobs:
     - name: Publish to Apache Maven Central
       run: mvn -B deploy -Possrh
       env:
-        MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
-        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
@@ -152,7 +152,7 @@ jobs:
         git pull
 
     - name: Setup - Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -163,7 +163,7 @@ jobs:
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Upload licenses - Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dependencies-licenses
         path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index f7c82af..a255e87 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -6,14 +6,16 @@ on:
     branches: [ develop ]
     paths-ignore: 
       - '**.md'
+      - '.config/**'
+      - '.idea/**'
       - 'assets/**'
-      - 'config/**'
   pull_request:
     types: [opened, synchronize, reopened]
     paths-ignore: 
       - '**.md'
+      - '.config/**'
+      - '.idea/**'
       - 'assets/**'
-      - 'config/**'
 
 env:
   SONARCLOUD_ORG: ${{ github.event.organization.login }}
@@ -31,20 +33,20 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index d2a8e2f..4e883f8 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
     
     - name: Set up JDK OSSRH
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
         java-version: '17'
@@ -27,6 +27,6 @@ jobs:
       run: mvn -B deploy -Possrh
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
-        MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
-        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
index 8c139da..a325e2b 100644
--- a/.github/workflows/update-from-template.yml
+++ b/.github/workflows/update-from-template.yml
@@ -86,9 +86,8 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh_pr_up() { 
-            gh pr create "$@" || gh pr edit "$@" 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
           }
           gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
-            -H "${{ env.UPDATE_BRANCH }}" \
             --title "Update from template" \
             --body "An automated PR to sync changes from the template into this repo"
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index f68c212..9a5d4ff 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.1</checkstyleVersion>
+    <checkstyleVersion>10.12.5</checkstyleVersion>
     <scanScope>JavaOnlyWithTests</scanScope>
     <suppressErrors>true</suppressErrors>
     <copyLibs>true</copyLibs>
@@ -13,7 +13,7 @@
       <list>
         <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
         <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="1d81ed75-9d2a-4a5a-8852-5fc05c1396b5" type="PROJECT_RELATIVE" scope="All" description="XDEV Checks">$PROJECT_DIR$/config/checkstyle/checkstyle.xml</ConfigurationLocation>
+        <ConfigurationLocation id="1d81ed75-9d2a-4a5a-8852-5fc05c1396b5" type="PROJECT_RELATIVE" scope="All" description="XDEV Checks">$PROJECT_DIR$/.config/checkstyle/checkstyle.xml</ConfigurationLocation>
       </list>
     </option>
   </component>
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ffd40bd..65b8cb4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -17,6 +17,8 @@
           <emptyLine />
           <package name="javax" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="jakarta" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="org" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com" withSubpackages="true" static="false" />
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index afc2252..9683e4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven
 
 ### Recommended setup
diff --git a/README.md b/README.md
index 4925345..1967520 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,14 @@
-[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/microstream-afs-ibm-cos?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/microstream-afs-ibm-cos)
+[![Latest version](https://img.shields.io/maven-central/v/software.xdev/microstream-afs-ibm-cos?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/microstream-afs-ibm-cos)
 [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/microstream-afs-ibm-cos/checkBuild.yml?branch=develop)](https://github.com/xdev-software/microstream-afs-ibm-cos/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_microstream-afs-ibm-cos&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_microstream-afs-ibm-cos)
 
 # microstream-afs-ibm-cos
 
-A connector for [MicroStream](https://microstream.one/) which allows storing data in
-the [IBM Cloud Object Storage](https://www.ibm.com/cloud/object-storage).
+A connector for [MicroStream](https://microstream.one/) which allows storing data in the [IBM Cloud Object Storage](https://www.ibm.com/cloud/object-storage).
 
 It uses the [IBM-provided Java SDK](https://github.com/IBM/ibm-cos-sdk-java).
 
-The connector works virtually identical to
-the [AWS S3 Connector](https://docs.microstream.one/manual/storage/storage-targets/blob-stores/aws-s3.html) of
-MicroStream
-but for IBM COS instead of AWS S3.
+The connector works virtually identical to the [AWS S3 Connector](https://docs.microstream.one/manual/storage/storage-targets/blob-stores/aws-s3.html) of MicroStream but for IBM COS instead of AWS S3.
 
 ## Installation
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
deleted file mode 100644
index 710e3e6..0000000
--- a/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
-    Checkstyle-Configuration: XDEV Checks
-    Description: none
--->
-<module name="Checker">
-  <property name="severity" value="warning"/>
-  <module name="TreeWalker">
-    <property name="tabWidth" value="4"/>
-    
-    
-    <module name="JavadocType">
-      <property name="severity" value="ignore"/>
-      <property name="scope" value="protected"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="JavadocVariable">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="JavadocStyle">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="ConstantName">
-      <property name="id" value="ConstantName"/>
-      <property name="format" value="^[A-Z_][A-Z0-9]*(_[A-Z0-9]*)*$"/>
-    </module>
-    <module name="LocalFinalVariableName">
-      <property name="id" value="LocalFinalVariableName"/>
-      <property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
-    </module>
-    <module name="LocalVariableName">
-      <property name="id" value="LocalVariableName"/>
-      <property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
-    </module>
-    <module name="MemberName">
-      <property name="id" value="MemberName"/>
-      <property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
-    </module>
-    <module name="MethodName">
-      <property name="id" value="MethodName"/>
-      <property name="format" value="^[a-zA-Z_][a-zA-Z0-9_]*$"/>
-      <message key="name.invalidPattern" value="'{0}'' entspricht nicht dem Muster ''{1}''."/>
-    </module>
-    <module name="PackageName">
-      <property name="id" value="PackageName"/>
-    </module>
-    <module name="ParameterName">
-      <property name="id" value="ParameterName"/>
-      <property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
-    </module>
-    <module name="StaticVariableName">
-      <property name="id" value="StaticVariableName"/>
-      <property name="format" value="^[a-z_][a-zA-Z0-9_]*$"/>
-    </module>
-    <module name="TypeName">
-      <property name="id" value="TypeName"/>
-      <property name="format" value="^[A-Z_][a-zA-Z0-9_]*$"/>
-    </module>
-    <module name="AvoidStarImport">
-      <property name="id" value="AvoidStarImport"/>
-    </module>
-    <module name="IllegalImport">
-      <property name="id" value="IllegalImport"/>
-    </module>
-    <module name="RedundantImport">
-      <property name="id" value="RedundantImport"/>
-    </module>
-    <module name="UnusedImports">
-      <property name="id" value="UnusedImports"/>
-      <message key="import.unused" value="Nicht benutzter import - {0}."/>
-    </module>
-    <module name="MethodLength">
-      <property name="id" value="MethodLength"/>
-    </module>
-   
-    <module name="MethodParamPad">
-      <property name="severity" value="ignore"/>
-      <property name="id" value="MethodParamPad"/>
-      <property name="tokens" value="LITERAL_NEW"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="NoWhitespaceAfter">
-      <property name="severity" value="warning"/>
-      <property name="id" value="NoWhitespaceAfter"/>
-      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS,TYPECAST"/>
-    </module>
-    <module name="NoWhitespaceBefore">
-      <property name="id" value="NoWhitespaceBefore"/>
-      <property name="tokens" value="POST_DEC,POST_INC"/>
-    </module>
-    <module name="OperatorWrap">
-      <property name="id" value="OperatorWrap"/>
-    </module>
-    <module name="ParenPad">
-      <property name="id" value="ParenPad"/>
-      <property name="tokens" value="ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_DEF,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,QUESTION"/>
-    </module>
-    <module name="TypecastParenPad">
-      <property name="id" value="TypecastParenPad"/>
-      <property name="tokens" value="RPAREN,TYPECAST"/>
-    </module>
-    <module name="WhitespaceAfter">
-      <property name="id" value="WhitespaceAfter"/>
-      <property name="tokens" value="COMMA,SEMI"/>
-    </module>
-    <module name="WhitespaceAround">
-      <property name="id" value="WhitespaceAround"/>
-      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,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,TYPE_EXTENSION_AND"/>
-    </module>
-    <module name="ModifierOrder">
-      <property name="id" value="ModifierOrder"/>
-    </module>
-    <module name="EmptyBlock">
-      <property name="id" value="EmptyBlock"/>
-    </module>
-    <module name="LeftCurly">
-      <property name="id" value="LeftCurly"/>
-      <property name="option" value="nl"/>
-    </module>
-    <module name="NeedBraces">
-      <property name="id" value="NeedBraces"/>
-    </module>
-    <module name="RightCurly">
-      <property name="id" value="RightCurly"/>
-      <property name="option" value="alone"/>
-      <property name="tokens" value="LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT"/>
-      <message key="line.same" value="''{0}'' in Spalte {1} sollte auf der gleichen Linie wie der nächste Teil einer Multi-Block-Anweisung (eine, die direkt mehrere Blöcke enthält: if/else-if/else oder try/catch/finally) sein."/>
-    </module>
-    <module name="EmptyStatement">
-      <property name="id" value="EmptyStatement"/>
-    </module>
-    <module name="EqualsHashCode">
-      <property name="id" value="EqualsHashCode"/>
-    </module>
-    <module name="MagicNumber">
-      <property name="id" value="MagicNumber"/>
-      <property name="constantWaiverParentToken" value="TYPECAST,METHOD_CALL,EXPR,ARRAY_INIT,UNARY_MINUS,UNARY_PLUS,ELIST,STAR,ASSIGN,PLUS,MINUS,DIV,LITERAL_NEW"/>
-    </module>
-    <module name="MissingSwitchDefault">
-      <message key="missing.switch.default" value="MissingSwitchDefault: switch ohne &quot;default&quot;."/>
-    </module>
-    <module name="SimplifyBooleanExpression">
-      <property name="id" value="SimplifyBooleanExpression"/>
-    </module>
-    <module name="HideUtilityClassConstructor">
-      <property name="id" value="HideUtilityClassConstructor"/>
-    </module>
-    <module name="InterfaceIsType">
-      <property name="id" value="InterfaceIsType"/>
-    </module>
-    <module name="VisibilityModifier">
-      <property name="severity" value="warning"/>
-      <property name="id" value="VisibilityModifier"/>
-      <property name="packageAllowed" value="true"/>
-      <property name="protectedAllowed" value="true"/>
-    </module>
-    <module name="ArrayTypeStyle">
-      <property name="id" value="ArrayTypeStyle"/>
-    </module>
-    <module name="FinalParameters">
-      <property name="id" value="FinalParameters"/>
-    </module>
-    <module name="TodoComment">
-      <property name="severity" value="ignore"/>
-      <message key="todo.match" value="TodoComment: Kommentar entspricht to-do-Format ''{0}''."/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="UpperEll">
-      <property name="id" value="UpperEll"/>
-    </module>
-    <module name="RequireThis">
-      <property name="severity" value="warning"/>
-      <property name="id" value="RequireThis"/>
-    </module>
-    <module name="FinalClass">
-      <property name="severity" value="warning"/>
-      <property name="id" value="FinalClass"/>
-    </module>
-    <module name="GenericWhitespace">
-      <property name="severity" value="ignore"/>
-      <property name="id" value="GenericWhitespace"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="warning"/>
-    </module>
-    <module name="EmptyCatchBlock">
-      <property name="id" value="EmptyCatchBlock"/>
-    </module>
-    <module name="NonEmptyAtclauseDescription">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="AbstractClassName">
-      <property name="id" value="AbstractClassName"/>
-      <property name="format" value="^Abstract.*$"/>
-    </module>
-    <module name="OuterTypeNumber">
-      <property name="id" value="OuterTypeNumber"/>
-    </module>
-    <module name="DefaultComesLast">
-      <property name="id" value="DefaultComesLast"/>
-    </module>
-    <module name="ExplicitInitialization">
-      <property name="severity" value="ignore"/>
-      <property name="id" value="ExplicitInitialization"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="NoClone">
-      <property name="id" value="NoClone"/>
-    </module>
-    <module name="NoFinalizer">
-      <property name="id" value="NoFinalizer"/>
-    </module>
-    <module name="StringLiteralEquality">
-      <property name="id" value="StringLiteralEquality"/>
-    </module>
-    <module name="OneStatementPerLine">
-      <property name="id" value="OneStatementPerLine"/>
-    </module>
-    <module name="EmptyForInitializerPad">
-      <property name="id" value="EmptyForInitializerPad"/>
-    </module>
-    <module name="EmptyForIteratorPad">
-      <property name="id" value="EmptyForIteratorPad"/>
-    </module>
-    <module name="OneTopLevelClass">
-      <property name="id" value="OneTopLevelClass"/>
-    </module>
-	<module name="IllegalType">
-		<!-- java.util.Optional should not be used for parameters. See https://rules.sonarsource.com/java/RSPEC-3553 -->
-   		<property name="tokens" value="PARAMETER_DEF"/>
-   		<property name="illegalClassNames" value="java.util.Optional"/>
-   		<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-   	</module>
-   	<module name="SuppressionCommentFilter">
-	    <metadata name="net.sf.eclipsecs.core.comment" value="Specific Check"/>
-	    <property name="offCommentFormat" value="CHECKSTYLE\.OFF\: *([\w\|]+)"/>
-	    <property name="onCommentFormat" value="CHECKSTYLE\.ON\: *([\w\|]+)"/>
-	    <property name="checkFormat" value="$1"/>
-	</module>
-	<module name="SuppressionCommentFilter">
-	    <metadata name="net.sf.eclipsecs.core.comment" value="All Checks"/>
-	</module>
-   	
-  </module>
-  <module name="LineLength">
-     <property name="severity" value="ignore"/>
-     <property name="id" value="LineLength"/>
-     <property name="max" value="120"/>
-     <property name="tabWidth" value="4"/>
-     <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-   </module>
-  <module name="JavadocPackage">
-    <property name="severity" value="ignore"/>
-    <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-  </module>
-  <module name="NewlineAtEndOfFile">
-    <property name="id" value="NewlineAtEndOfFile"/>
-  </module>
-  <module name="Translation">
-    <property name="id" value="Translation"/>
-    <message key="general.exception" value="general exception"/>
-    <message key="general.fileNotFound" value="file not found"/>
-  </module>
-  <module name="FileLength">
-    <property name="severity" value="ignore"/>
-    <property name="id" value="FileLength"/>
-    <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-  </module>
-  <module name="RegexpSingleline">
-    <metadata name="net.sf.eclipsecs.core.comment" value="Inlined Tabs"/>
-    <property name="format" value="^(/*)\t*?[^\n\t/]+?\t"/>
-    <property name="message" value="Inlined Tab"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-  <module name="RegexpSingleline">
-    <metadata name="net.sf.eclipsecs.core.comment" value="CheckStyle Off Grund"/>
-    <property name="format" value="CHECKSTYLE\.OFF\: *([\w\|]+)\s*$"/>
-    <property name="message" value="Begründung fehlt (bitte aussagekräftig)"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-  <module name="RegexpSingleline">
-    <metadata name="net.sf.eclipsecs.core.comment" value="CheckStyle All Off Grund"/>
-    <property name="format" value="CHECKSTYLE\:OFF\s*$"/>
-    <property name="message" value="Begründung fehlt (bitte aussagekräftig)"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-  <module name="SuppressionSingleFilter">
-     <property name="checks" value="."/>
-     <property name="files" value="[\\/]srcgen[\\/].*\.java$"/>
-   </module>
-   <module name="SuppressionSingleFilter">
-     <property name="checks" value="."/>
-     <property name="files" value="[\\/]resources[\\/].*\.sql$"/>
-   </module>
-   <module name="SuppressionSingleFilter">
-     <property name="checks" value="."/>
-     <property name="files" value="[\\/]software.xdev[\\/].*\.java$"/>
-   </module>
-   <module name="SuppressionSingleFilter">
-     <property name="checks" value="MagicNumberCheck"/>
-     <property name="files" value="[\\/]test[\\/].*\.java$"/>
-   </module>
-   
-   
-</module>
diff --git a/microstream-afs-ibm-cos-demo/pom.xml b/microstream-afs-ibm-cos-demo/pom.xml
index b16e334..62c7c4a 100644
--- a/microstream-afs-ibm-cos-demo/pom.xml
+++ b/microstream-afs-ibm-cos-demo/pom.xml
@@ -1,95 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.xdev-software</groupId>
-    <artifactId>microstream-afs-ibm-cos-demo</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-    <packaging>jar</packaging>
+	<groupId>software.xdev</groupId>
+	<artifactId>microstream-afs-ibm-cos-demo</artifactId>
+	<version>1.0.2-SNAPSHOT</version>
+	<packaging>jar</packaging>
 
-    <inceptionYear>2023</inceptionYear>
+	<inceptionYear>2023</inceptionYear>
 
-    <organization>
-        <name>XDEV Software</name>
-        <url>https://xdev.software</url>
-    </organization>
+	<organization>
+		<name>XDEV Software</name>
+		<url>https://xdev.software</url>
+	</organization>
 
+	<properties>
+		<javaVersion>11</javaVersion>
+		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
-    <properties>
-        <!-- Keep this compatible with EclipseStore -->
-        <javaVersion>11</javaVersion>
-        <maven.compiler.release>${javaVersion}</maven.compiler.release>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <one.microstream.version>08.01.01-MS-GA</one.microstream.version>
-        <mainClass>software.xdev.microstream.App</mainClass>
-    </properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.xdev-software</groupId>
-            <artifactId>microstream-afs-ibm-cos</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+		<mainClass>software.xdev.Application</mainClass>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>2.0.9</version>
-        </dependency>
+		<one.microstream.version>08.01.01-MS-GA</one.microstream.version>
+	</properties>
 
-        <dependency>
-            <groupId>one.microstream</groupId>
-            <artifactId>microstream-storage-embedded</artifactId>
-            <version>${one.microstream.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>software.xdev</groupId>
+			<artifactId>standard-maven-template</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
-    <build>
-        <finalName>${project.artifactId}</finalName>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>2.0.9</version>
+		</dependency>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
-                <configuration>
-                    <release>${maven.compiler.release}</release>
-                    <compilerArgs>
-                        <arg>-proc:none</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>${mainClass}</mainClass>
-                        </manifest>
-                        <manifestEntries>
-                            <Multi-Release>true</Multi-Release>
-                        </manifestEntries>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <appendAssemblyId>false</appendAssemblyId>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase> <!-- bind to the packaging phase -->
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+		<dependency>
+			<groupId>one.microstream</groupId>
+			<artifactId>microstream-storage-embedded</artifactId>
+			<version>${one.microstream.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.12.1</version>
+				<configuration>
+					<release>${maven.compiler.release}</release>
+					<compilerArgs>
+						<arg>-proc:none</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.6.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>${mainClass}</mainClass>
+						</manifest>
+						<manifestEntries>
+							<Multi-Release>true</Multi-Release>
+						</manifestEntries>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id> <!-- this is used for inheritance merges -->
+						<phase>package</phase> <!-- bind to the packaging phase -->
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>checkstyle</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
+						<version>3.3.1</version>
+						<dependencies>
+							<dependency>
+								<groupId>com.puppycrawl.tools</groupId>
+								<artifactId>checkstyle</artifactId>
+								<version>10.12.7</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/microstream-afs-ibm-cos/pom.xml b/microstream-afs-ibm-cos/pom.xml
index 1192ae5..a454244 100644
--- a/microstream-afs-ibm-cos/pom.xml
+++ b/microstream-afs-ibm-cos/pom.xml
@@ -1,246 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.xdev-software</groupId>
-    <artifactId>microstream-afs-ibm-cos</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>microstream-afs-ibm-cos</name>
-    <description>microstream-afs-ibm-cos</description>
-    <url>https://github.com/xdev-software/microstream-afs-ibm-cos</url>
-
-    <scm>
-        <url>https://github.com/xdev-software/microstream-afs-ibm-cos</url>
-        <connection>https://github.com/xdev-software/microstream-afs-ibm-cos.git</connection>
-    </scm>
-
-    <inceptionYear>2023</inceptionYear>
-
-    <organization>
-        <name>XDEV Software</name>
-        <url>https://xdev.software</url>
-    </organization>
-
-    <developers>
-        <developer>
-            <name>XDEV Software</name>
-            <organization>XDEV Software</organization>
-            <url>https://xdev.software</url>
-        </developer>
-    </developers>
-
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-
-    <properties>
-        <!-- Keep this compatible with EclipseStore -->
-        <javaVersion>11</javaVersion>
-        <maven.compiler.release>${javaVersion}</maven.compiler.release>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <ibm.java.sdk.version>2.13.2</ibm.java.sdk.version>
-        <one.microstream.version>08.01.01-MS-GA</one.microstream.version>
-    </properties>
-
-    <repositories>
-        <!-- The order of definitions matters. Explicitly defining central here
-            to make sure it has the highest priority. -->
-        <repository>
-            <id>central</id>
-            <url>https://repo.maven.apache.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ibm.cos</groupId>
-            <artifactId>ibm-cos-java-sdk-core</artifactId>
-            <version>${ibm.java.sdk.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ibm.cos</groupId>
-            <artifactId>ibm-cos-java-sdk-s3</artifactId>
-            <version>${ibm.java.sdk.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>one.microstream</groupId>
-            <artifactId>microstream-afs-blobstore</artifactId>
-            <version>${one.microstream.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>one.microstream</groupId>
-            <artifactId>microstream-configuration</artifactId>
-            <version>${one.microstream.version}</version>
-        </dependency>
-    </dependencies>
-
-    <pluginRepositories>
-        <!-- The order of definitions matters. Explicitly defining central here
-            to make sure it has the highest priority. -->
-        <pluginRepository>
-            <id>central</id>
-            <url>https://repo.maven.apache.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>4.3</version>
-                <configuration>
-                    <properties>
-                        <email>${project.organization.url}</email>
-                    </properties>
-                    <licenseSets>
-                        <licenseSet>
-                            <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
-                            <includes>
-                                <include>src/main/java/**</include>
-                                <include>src/test/java/**</include>
-                            </includes>
-                        </licenseSet>
-                    </licenseSets>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>first</id>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
-                <configuration>
-                    <release>${maven.compiler.release}</release>
-                    <compilerArgs>
-                        <arg>-proc:none</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <quiet>true</quiet>
-                    <doclint>none</doclint>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>ossrh</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <!-- Fixes "gpg: signing failed: Inappropriate ioctl for device" -->
-                                    <!-- Prevent `gpg` from using pinentry programs -->
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <!-- Sometimes OSSRH is really slow -->
-                            <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>software.xdev</groupId>
+	<artifactId>microstream-afs-ibm-cos</artifactId>
+	<version>1.0.2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>microstream-afs-ibm-cos</name>
+	<description>microstream-afs-ibm-cos</description>
+	<url>https://github.com/xdev-software/microstream-afs-ibm-cos</url>
+
+	<scm>
+		<url>https://github.com/xdev-software/microstream-afs-ibm-cos</url>
+		<connection>https://github.com/xdev-software/microstream-afs-ibm-cos.git</connection>
+	</scm>
+
+	<inceptionYear>2023</inceptionYear>
+
+	<organization>
+		<name>XDEV Software</name>
+		<url>https://xdev.software</url>
+	</organization>
+
+	<developers>
+		<developer>
+			<name>XDEV Software</name>
+			<organization>XDEV Software</organization>
+			<url>https://xdev.software</url>
+		</developer>
+	</developers>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<properties>
+		<javaVersion>11</javaVersion>
+		<maven.compiler.release>${javaVersion}</maven.compiler.release>
+
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+		<ibm.java.sdk.version>2.13.2</ibm.java.sdk.version>
+		<one.microstream.version>08.01.01-MS-GA</one.microstream.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.ibm.cos</groupId>
+			<artifactId>ibm-cos-java-sdk-core</artifactId>
+			<version>${ibm.java.sdk.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.ibm.cos</groupId>
+			<artifactId>ibm-cos-java-sdk-s3</artifactId>
+			<version>${ibm.java.sdk.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>one.microstream</groupId>
+			<artifactId>microstream-afs-blobstore</artifactId>
+			<version>${one.microstream.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>one.microstream</groupId>
+			<artifactId>microstream-configuration</artifactId>
+			<version>${one.microstream.version}</version>
+		</dependency>
+	</dependencies>
+
+	<repositories>
+		<!-- The order of definitions matters. Explicitly defining central here 
+			to make sure it has the highest priority. -->
+		<repository>
+			<id>central</id>
+			<url>https://repo.maven.apache.org/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<!-- The order of definitions matters. Explicitly defining central here 
+			to make sure it has the highest priority. -->
+		<pluginRepository>
+			<id>central</id>
+			<url>https://repo.maven.apache.org/maven2</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>ossrh</id>
+			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.mycila</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>4.3</version>
+				<configuration>
+					<properties>
+						<email>${project.organization.url}</email>
+					</properties>
+					<licenseSets>
+						<licenseSet>
+							<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+							<includes>
+								<include>src/main/java/**</include>
+								<include>src/test/java/**</include>
+							</includes>
+						</licenseSet>
+					</licenseSets>
+				</configuration>
+				<executions>
+					<execution>
+						<id>first</id>
+						<goals>
+							<goal>format</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.12.1</version>
+				<configuration>
+					<release>${maven.compiler.release}</release>
+					<compilerArgs>
+						<arg>-proc:none</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.6.3</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<quiet>true</quiet>
+					<doclint>none</doclint>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>ossrh</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>3.1.0</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+								<configuration>
+									<!-- Fixes "gpg: signing failed: Inappropriate ioctl for device" -->
+									<!-- Prevent `gpg` from using pinentry programs -->
+									<gpgArguments>
+										<arg>--pinentry-mode</arg>
+										<arg>loopback</arg>
+									</gpgArguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<!-- Sometimes OSSRH is really slow -->
+							<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>checkstyle</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
+						<version>3.3.1</version>
+						<dependencies>
+							<dependency>
+								<groupId>com.puppycrawl.tools</groupId>
+								<artifactId>checkstyle</artifactId>
+								<version>10.12.7</version>
+							</dependency>
+						</dependencies>
+						<configuration>
+							<configLocation>../.config/checkstyle/checkstyle.xml</configLocation>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 942f68d..b157525 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,29 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.xdev-software</groupId>
-    <artifactId>microstream-afs-ibm-cos-root</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-    <packaging>pom</packaging>
+	<groupId>software.xdev</groupId>
+	<artifactId>microstream-afs-ibm-cos-root</artifactId>
+	<version>1.0.2-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
-    <organization>
-        <name>XDEV Software</name>
-        <url>https://xdev.software</url>
-    </organization>
+	<organization>
+		<name>XDEV Software</name>
+		<url>https://xdev.software</url>
+	</organization>
 
-    <modules>
-        <module>microstream-afs-ibm-cos</module>
-        <module>microstream-afs-ibm-cos-demo</module>
-    </modules>
+	<modules>
+		<module>microstream-afs-ibm-cos</module>
+		<module>microstream-afs-ibm-cos-demo</module>
+	</modules>
 
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<profiles>
+		<profile>
+			<!-- Disable checkstyle in root module as there is nothing to check -->
+			<id>checkstyle</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
+						<version>3.3.1</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>