diff --git a/.cursor/rules/ascii-source.mdc b/.cursor/rules/ascii-source.mdc
new file mode 100644
index 0000000..ad837c1
--- /dev/null
+++ b/.cursor/rules/ascii-source.mdc
@@ -0,0 +1,22 @@
+---
+description: Tracked source and docs must be ASCII only
+alwaysApply: true
+---
+
+# ASCII source
+
+Every file you **add or edit** must be **ASCII only** (bytes 0x00-0x7F). Scan touched paths before finishing.
+
+Replace:
+
+| Non-ASCII          | ASCII       |
+| ------------------ | ----------- |
+| em/en dash, minus  | `-`         |
+| ellipsis           | `...`       |
+| curly quotes       | `'` / `"`   |
+| arrows             | `->` / `<-` |
+| non-breaking space | space       |
+
+Do not introduce Unicode symbols, emoji, or locale punctuation in code, comments, XML, or docs.
+
+WSDL/XSD copied from the licensed toolkit may contain non-ASCII. Do not add more. Prefer ASCII in files you author.
diff --git a/.cursor/rules/documentation-standards.mdc b/.cursor/rules/documentation-standards.mdc
index 1aae57e..c756526 100644
--- a/.cursor/rules/documentation-standards.mdc
+++ b/.cursor/rules/documentation-standards.mdc
@@ -1,5 +1,5 @@
 ---
-description: Documentation and build scripts — implementor-first, Maven Central default, no secrets
+description: Documentation and build scripts - implementor-first, Maven Central default, no secrets
 alwaysApply: true
 ---
 
@@ -10,13 +10,13 @@ Applies when writing or editing **README**, **CONTRIBUTING**, integrator guides,
 ## Priority: implementors
 
 - Primary audience: developers **consuming** published Maven artifacts.
-- Contributor/maintainer workflow lives in **CONTRIBUTING.md**, **MAINTAINERS.md**, or labelled subsections — not mixed into the integrator main flow.
-- Do not duplicate agent workflow in README or CONTRIBUTING (**AGENTS.md** → `.cursor/rules/`).
+- Contributor/maintainer workflow lives in **CONTRIBUTING.md**, **MAINTAINERS.md**, or labelled subsections - not mixed into the integrator main flow.
+- Do not duplicate agent workflow in README or CONTRIBUTING (**AGENTS.md** -> `.cursor/rules/`).
 
 ## Default narrative: Maven Central
 
-- Write as if **released** coordinates are on Maven Central (no SNAPSHOT, sibling-repo checkout, or `-P…` profiles in the main integrator path).
-- Use **version numbers** in integrator docs — not Git branch names.
+- Write as if **released** coordinates are on Maven Central (no SNAPSHOT, sibling-repo checkout, or `-P...` profiles in the main integrator path).
+- Use **version numbers** in integrator docs - not Git branch names.
 - SNAPSHOT installs, optional Maven profiles, licensed WSDL for source builds, and sibling `mvn install` belong under **Local development** / **Local builds** only.
 
 ## Structure
@@ -30,8 +30,8 @@ Applies when writing or editing **README**, **CONTRIBUTING**, integrator guides,
 ## Paths
 
 - **Relative paths only** (e.g. `wsdls/xml`, `./certs/<folder>/`, `pom.xml` beside repo root).
-- **Never** hardcode machine paths (`C:\…`, `/Users/…`, `~/`, worktree folders) in tracked docs.
-- Override only when strictly required to remove ambiguity — say why.
+- **Never** hardcode machine paths (`C:\...`, `/Users/...`, `~/`, worktree folders) in tracked docs.
+- Override only when strictly required to remove ambiguity - say why.
 
 ## Current state only
 
@@ -39,12 +39,16 @@ Applies when writing or editing **README**, **CONTRIBUTING**, integrator guides,
 - Describe **what is true now**; omit "removed", "used to", and repo archaeology in integrator material.
 - **CHANGELOG** entries: current release capabilities; avoid branch names and migration essays in new notes.
 
-## Secrets — MUST NOT
+## Secrets - MUST NOT
 
 - **Never** put real or plausible **passwords**, **tokens**, **API keys**, **private keys**, or **keystore passphrases** in tracked files (code, comments, examples, docs).
 - Use placeholders (`<pkcs12-password>`), empty values in `.example` files, or "from your registration pack".
 - See **SECURITY.md**.
 
+## ASCII source
+
+All tracked files you add or change must be **ASCII only**. See **`ascii-source.mdc`**.
+
 ## Override
 
 These rules may be overridden **only when necessary** to clear ambiguity (e.g. maintainer branch mapping in **MAINTAINERS.md** or `.cursor/rules/`, clearly labelled maintainer-only).
diff --git a/.cursor/rules/hi-wsdl-project.mdc b/.cursor/rules/hi-wsdl-project.mdc
index e28a1de..202fcb4 100644
--- a/.cursor/rules/hi-wsdl-project.mdc
+++ b/.cursor/rules/hi-wsdl-project.mdc
@@ -5,35 +5,40 @@ alwaysApply: true
 
 # hi-wsdl-java
 
-Maven artifact **`au.gov.nehta:hi-wsdl`** — HI B2B WSDL resources and pre-generated JAX-WS/JAXB types. **Not** facade clients (**hi-b2b-client-java**).
+Maven artifact **`au.gov.nehta:hi-wsdl`** - HI B2B WSDL resources and pre-generated JAX-WS/JAXB types. **Not** facade clients (**hi-b2b-client-java**).
 
 ## Documentation
 
-Follow **`documentation-standards.mdc`**. Integrator docs use **version numbers** — not Git branch names.
+Follow **`documentation-standards.mdc`**. Integrator docs use **version numbers** - not Git branch names.
+
+The **first number** of **`au.gov.nehta:hi-wsdl`** is the **Java SE** target. Downstream artifacts that pin this coordinate to **`${project.version}`** (including **`hi-b2b-client`**) use the same version.
 
 | Version | Java | XML stack | `Service` stubs |
-| ------- | ---- | --------- | ----------------- |
-| **1.6.3** | 8 | **javax** | **14** (standard HI B2B) |
-| **1.6.5** | 11 | **Jakarta** | **14** (standard HI B2B) |
-| **1.7.0** | 11 | **Jakarta** | **26** (full MCA) |
+| ------- | ---- | -------- | --------------- |
+| **8.0.0** | 8 | **javax** | **14** (standard HI B2B) |
+| **11.0.0** | 11 | **Jakarta** | **26** (full MCA) |
+| **17.0.0** | 17 | **Jakarta** | **26** (full MCA) |
+| **21.0.0** | 21 | **Jakarta** | **26** (full MCA) |
+| **24.0.0** | 24 | **Jakarta** | **26** (full MCA) |
 
-**Git branch mapping (maintainers only — never in integrator docs):**
+**Git branch mapping (maintainers only - never in integrator docs):**
 
-| Version | Git branch |
-| ------- | ---------- |
-| **1.6.3** | `java-8-javax` |
-| **1.6.5** | `java-11-jakarta` |
-| **1.7.0** | `java-11-jakarta-full-wsdl` |
+| Version | Official Git branch |
+| ------- | ------------------- |
+| **8.0.0** | `java-8` |
+| **11.0.0** | `java-11` |
+| **17.0.0** | `java-17` |
+| **21.0.0** | `java-21` |
+| **24.0.0** | `java-24` |
 
-## This checkout
+## This 24.0.0 line
 
-**`1.6.3-SNAPSHOT`**: Java **8**, **`javax`** committed types, **14** services (standard HI B2B), `src/main/resources/HI_*.wsdl`, `hi_override/` xmldsig package. Sources frozen — no **`wsimport`** in this POM.
+**`24.0.0-SNAPSHOT`**: Java **24**, **Jakarta** committed types, **26** services (full MCA), `src/main/resources/HI_*.wsdl`, `hi_override/` xmldsig package. Default build compiles committed sources. Regen (**`-Pregenerate-sources`**) requires licensed **`wsdls/xml/`** locally. See **MAINTAINERS.md**.
 
 ## Build
 
-- JDK **8+**, from repo root: `mvn -B "-Dgpg.skip=true" clean verify` (quote `-D` on PowerShell).
-- Default build uses **committed** `src/main/java` — no wsimport.
-- Type regeneration for new HI releases is on **`1.6.5`** / **`1.7.0`** lines.
+- JDK **24**, from repo root: `mvn -B "-Dgpg.skip=true" clean verify` (quote `-D` on PowerShell).
+- Default build uses **committed** `src/main/java` - no wsimport.
 
 ## vs hi-b2b-client-java
 
@@ -42,11 +47,11 @@ Follow **`documentation-standards.mdc`**. Integrator docs use **version numbers*
 | Delivers | WSDL on classpath + generated types | Facade clients, TLS, signing |
 | Artifact | `hi-wsdl` | `hi-b2b-client` |
 
-Align **`hi-wsdl`** and **`hi-b2b-client`** versions per release line table.
+Publish **`hi-wsdl`** first. Consumers that pin **`${project.version}`** (including **`hi-b2b-client`**) use the same coordinate on each line (**8.0.0**, **11.0.0**, **17.0.0**, **21.0.0**, **24.0.0**, and so on).
 
 ## Doc split
 
 - **`documentation-standards.mdc`**: implementor-first, Maven Central default, local/OS sections, relative paths, no secrets
 - **`README.md`**: integrators (Maven Central default)
-- **`CONTRIBUTING.md`**: build from source, local SNAPSHOT, OS wrappers
+- **`CONTRIBUTING.md`**: build from source, local SNAPSHOT, regeneration notes
 - **`MAINTAINERS.md`**: POM / type-regeneration internals
diff --git a/.cursor/rules/multi-branch-worktrees.mdc b/.cursor/rules/multi-branch-worktrees.mdc
index e4396f0..aa0018b 100644
--- a/.cursor/rules/multi-branch-worktrees.mdc
+++ b/.cursor/rules/multi-branch-worktrees.mdc
@@ -3,13 +3,13 @@ description: Use git worktree when editing multiple branches of the same reposit
 alwaysApply: true
 ---
 
-# Multi-branch work — use git worktree
+# Multi-branch work - use git worktree
 
-When a task requires **changes on two or more branches of the same Git repository**, use **`git worktree`** — do **not** hop branches with `git checkout` while carrying uncommitted edits or stashes.
+When a task requires **changes on two or more branches of the same Git repository**, use **`git worktree`** - do **not** hop branches with `git checkout` while carrying uncommitted edits or stashes.
 
 ## When this applies
 
-- Same-repo edits across release lines (e.g. `java-8-javax`, `java-11-jakarta`, `master`)
+- Same-repo edits across release lines (e.g. `java-8`, `java-11`)
 - Applying the same fix to several branches before commit
 - Comparing or building two branches side by side
 
@@ -22,7 +22,7 @@ When a task requires **changes on two or more branches of the same Git repositor
 ## Workflow
 
 1. **Primary clone** stays on the main working branch; do not stash-and-hop to edit other branches.
-2. **Add a worktree per extra branch** (paths are local — never commit them to tracked docs):
+2. **Add a worktree per extra branch** (paths are local - never commit them to tracked docs):
 
    ```bash
    git worktree add ../<repo>-<branch-slug> <branch>
@@ -34,18 +34,12 @@ When a task requires **changes on two or more branches of the same Git repositor
 ## Do not
 
 - `git checkout` other branches with uncommitted changes (Git will block or force stash churn).
-- Stash the same files across multiple branch switches — causes merge conflicts on `stash pop`.
+- Stash the same files across multiple branch switches - causes merge conflicts on `stash pop`.
 - Put worktree directory paths in README, CONTRIBUTING, or other tracked docs (see repo **`worktrees.mdc`** / **`documentation-standards.mdc`**).
 
 ## Example (maintainer-local paths only)
 
 ```bash
-# In hi-wsdl-java primary clone (on java-11-jakarta-full-wsdl)
-git worktree add ../hi-wsdl-java-java-8-javax java-8-javax
-git worktree add ../hi-wsdl-java-java-11-jakarta java-11-jakarta
-
-# Apply edits in each ../hi-wsdl-java-* folder; commit per branch
-# When finished:
-git worktree remove ../hi-wsdl-java-java-8-javax
-git worktree remove ../hi-wsdl-java-java-11-jakarta
+git worktree add <path> java-8
+git worktree add <path> java-11
 ```
diff --git a/.cursor/rules/worktrees.mdc b/.cursor/rules/worktrees.mdc
index 07f208a..dd04afc 100644
--- a/.cursor/rules/worktrees.mdc
+++ b/.cursor/rules/worktrees.mdc
@@ -13,7 +13,7 @@ Follow **`documentation-standards.mdc`** (implementor-first, Maven Central defau
 
 | Doc | Audience | Use |
 | --- | -------- | --- |
-| **README**, integrator guides | Implementors | **Maven version** (`1.7.0`), Central coordinates, runtime config |
+| **README**, integrator guides | Implementors | **Maven version** (`24.0.0`), Central coordinates, JAR contents (WSDL + types) |
 | **CONTRIBUTING** | Contributors | Build from source, **Local builds**, OS-specific steps |
 | **MAINTAINERS**, **`.cursor/rules/`** | Maintainers | POM/wsimport internals; **branch mapping** only when labelled maintainer-only |
 
@@ -21,13 +21,13 @@ Integrator docs: **version numbers**, not Git branch names. Local/SNAPSHOT/profi
 
 ## Do not put in tracked docs
 
-- Hardcoded worktree or machine paths (`wt/`, `C:\…`, `/Users/…`, `~/`, `this worktree`, `primary clone`)
+- Hardcoded worktree or machine paths (`wt/`, `C:\...`, `/Users/...`, `~/`, `this worktree`, `primary clone`)
 - References to **`wt/README.md`** or other local-only layout files
-- “Open folder X to switch branches” — IDE/local workflow, not repo documentation
+- "Open folder X to switch branches" - IDE/local workflow, not repo documentation
 
 ## Allowed (maintainer-only, when labelled)
 
-- **Git branch mapping** table (version → branch) in **MAINTAINERS.md** or agent rules
+- **Git branch mapping** table (version -> branch) in **MAINTAINERS.md** or agent rules
 - Generic worktree example only: `git worktree add <path> <branch>` (placeholder **`<path>`**, never a committed example)
 - Optional **untracked** local notes outside the repo
 
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..894f287
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,25 @@
+# https://editorconfig.org - aligns with .gitattributes (LF default; CRLF for *.bat / *.cmd)
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{java,xml,xsd,wsdl,properties,txt,json,groovy,py}]
+indent_style = space
+indent_size = 4
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.bat]
+end_of_line = crlf
+
+[*.cmd]
+end_of_line = crlf
diff --git a/.gitattributes b/.gitattributes
index b068fb2..a9b56b9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,10 +1,5 @@
-# Text files: LF in the index and on checkout (see *.bat / *.cmd below for CRLF).
-# Windows: git config core.autocrlf false once per clone so Git does not fight these rules.
-# After changing this file: git add --renormalize .
-# Optional (less diff noise if old blobs had stray CR): git config diff.ignoreCrAtEol true
 * text=auto eol=lf
 
-# Never treat these as text (no CRLF/LF conversion)
 *.class binary
 *.dll binary
 *.ear binary
@@ -22,6 +17,5 @@
 *.woff2 binary
 *.zip binary
 
-# cmd.exe reliably parses these with CRLF; keep them out of LF normalization churn
 *.bat text eol=crlf
 *.cmd text eol=crlf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..d7298d5
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,23 @@
+name: CI
+
+on:
+  push:
+    branches: [ java-24 ]
+  pull_request:
+    branches: [ java-24 ]
+
+permissions:
+  contents: read
+
+jobs:
+  verify:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: "24"
+          cache: maven
+      - name: Maven verify
+        run: mvn -B "-Dgpg.skip=true" clean verify
diff --git a/.gitignore b/.gitignore
index 8113f7f..7e0e899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,27 @@
-# Maven
 /target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-
-# Java
-*.class
-*.log
-hs_err_pid*
-
-# IDE / editor
 /.idea/
 *.iml
-*.ipr
-*.iws
-.vscode/
-.classpath
-.project
-.settings/
-bin/
-
-# OS
-.DS_Store
-Thumbs.db
-*.swp
-*.orig
-*~
 
-# Local secrets / keystores
+# Local secrets (never commit populated copies)
+/local.properties
 local.properties
 /settings.xml
+settings.xml
+
+# Licensed HI WSDL/XSD tree for wsimport regeneration (see wsdls/readme.txt)
+/wsdls/*
+!/wsdls/readme.txt
+
+/certs/
 *.jks
 *.keystore
 *.p12
+
+# Editor / agent / OS noise (not part of the published tree)
+.DS_Store
+Thumbs.db
+*.swp
+*.orig
+*~
+.vscode/
+hi-wsdl-java.code-workspace
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c5f3f6b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/AGENTS.md b/AGENTS.md
index 0cdae66..2c2b9ce 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,9 +4,10 @@ Rules: `.cursor/rules/*.mdc`. Do not duplicate in README or CONTRIBUTING.
 
 | Concern | Rule |
 |---------|------|
+| ASCII only in authored files | `ascii-source.mdc` |
 | Documentation and build scripts (implementor-first, Central, local, OS, paths, no secrets) | `documentation-standards.mdc` |
 | HI WSDL scope, build, version lines | `hi-wsdl-project.mdc` |
 | Worktrees local only; versions in integrator docs | `worktrees.mdc` |
-| Multi-branch edits in one repo — use worktree, not checkout/stash | `multi-branch-worktrees.mdc` |
+| Multi-branch edits in one repo - use worktree, not checkout/stash | `multi-branch-worktrees.mdc` |
 
 Contributors (humans): README, CONTRIBUTING, MAINTAINERS, SECURITY, CHANGELOG.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2375385..f6550f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,55 @@
 # Change Log/Revision History
 
-= 1.6.4 =
-======
-- Messages `searchIHI` JAXB `propOrder`: `electronicCommunication` before `dateOfBirth` so Consumer Search IHI (including batch sync) request XML matches the HI Service message schema.
-
-= 1.6.3-SNAPSHOT =
-======
-- **`1.6.3`** line: Java **8** / **`javax`** committed types and classpath WSDL (**14** `Service` stubs, standard HI B2B scope).
-- POM: Eclipse EE4J stack alignment — compile **`jaxb-api`** / **`jaxws-api`** only; **`maven-enforcer-plugin`** bans legacy Metro **`webservices-*`** bundles. Consuming apps use **`jaxws-rt` 2.3.7** at runtime.
-- Build plugins and dependency versions updated to latest Java **8**–compatible releases (aligned with **hi-b2b-client-java** **`1.6.3`** tooling where applicable).
-- **`maven-javadoc-plugin`:** **`doclint=none`**, **`quiet=true`**, **`failOnWarnings=false`**, **`detectOfflineLinks=false`**.
-
-= 1.6.2 =
+= 24.0.0 =
+=======
+- Maven **`au.gov.nehta:hi-wsdl`** **24.0.0** (Java **24** / **Jakarta**, **26** `Service` stubs, full MCA). The first number of the Maven version is the targeted Java SE version. Consumers that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) use the same coordinate.
+- Compile: **`jakarta.xml.bind-api` 4.0.5**, **`jakarta.xml.ws-api` 4.0.3**. Runtime guidance: consumers add **`jaxws-rt` 4.0.5** (not packaged in this JAR). **`jaxws-maven-plugin` 4.0.5** for **`-Pregenerate-sources`** on JDK 17+.
+- Messages `searchIHI`: `electronicCommunication` before `dateOfBirth` (international address before unstructured) so Consumer Search IHI (including batch) request XML matches the HI Service message schema.
+- Interface `searchIHI`: optional `electronicCommunication` before `dateOfBirth` and `australianUnstructuredStreetAddress` before `internationalAddress` on **`HI_ConsumerSearchIHIInterface-3.0`**.
+- **Tests:** **`JakartaStackTest`**, **`SearchIhiPropOrderTest`**, **`SearchForProviderIndividualPropOrderTest`**, **`AustralianStreetAddressPropOrderTest`**, **`InternationalAddressPropOrderTest`**, **`WsdlStubContractTest`**, **`HiWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`**. Stub count remains **26**.
+
+= 21.0.0 =
+=======
+- Maven **`au.gov.nehta:hi-wsdl`** **21.0.0** (Java **21** / **Jakarta**, **26** `Service` stubs, full MCA). The first number of the Maven version is the targeted Java SE version. Consumers that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) use the same coordinate.
+- Compile: **`jakarta.xml.bind-api` 4.0.5**, **`jakarta.xml.ws-api` 4.0.3**. Runtime guidance: consumers add **`jaxws-rt` 4.0.5** (not packaged in this JAR). **`jaxws-maven-plugin` 4.0.5** for **`-Pregenerate-sources`** on JDK 17+.
+- Messages `searchIHI`: `electronicCommunication` before `dateOfBirth` (international address before unstructured) so Consumer Search IHI (including batch) request XML matches the HI Service message schema.
+- Interface `searchIHI`: optional `electronicCommunication` before `dateOfBirth` and `australianUnstructuredStreetAddress` before `internationalAddress` on **`HI_ConsumerSearchIHIInterface-3.0`**.
+- **Tests:** **`JakartaStackTest`**, **`SearchIhiPropOrderTest`**, **`SearchForProviderIndividualPropOrderTest`**, **`AustralianStreetAddressPropOrderTest`**, **`InternationalAddressPropOrderTest`**, **`WsdlStubContractTest`**, **`HiWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`**. Stub count remains **26**.
+
+= 17.0.0 =
+=======
+- Maven **`au.gov.nehta:hi-wsdl`** **17.0.0** (Java **17** / **Jakarta**, **26** `Service` stubs, full MCA). The first number of the Maven version is the targeted Java SE version. Consumers that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) use the same coordinate.
+- Compile: **`jakarta.xml.bind-api` 4.0.5**, **`jakarta.xml.ws-api` 4.0.3**. Runtime guidance: consumers add **`jaxws-rt` 4.0.5** (not packaged in this JAR). **`jaxws-maven-plugin` 4.0.5** for **`-Pregenerate-sources`** on JDK 17+.
+- Messages `searchIHI`: `electronicCommunication` before `dateOfBirth` (international address before unstructured) so Consumer Search IHI (including batch) request XML matches the HI Service message schema.
+- Interface `searchIHI`: optional `electronicCommunication` before `dateOfBirth` and `australianUnstructuredStreetAddress` before `internationalAddress` on **`HI_ConsumerSearchIHIInterface-3.0`**.
+- **Tests:** **`JakartaStackTest`**, **`SearchIhiPropOrderTest`**, **`SearchForProviderIndividualPropOrderTest`**, **`AustralianStreetAddressPropOrderTest`**, **`InternationalAddressPropOrderTest`**, **`WsdlStubContractTest`**, **`HiWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`**. Stub count remains **26**.
+
+= 11.0.0 =
+=======
+- Maven **`au.gov.nehta:hi-wsdl`** **11.0.0** (Java **11** / **Jakarta**, **26** `Service` stubs, full MCA). The first number of the Maven version is the targeted Java SE version. Consumers that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) use the same coordinate.
+- Runtime guidance: consumers add **`jaxws-rt` 4.0.5** (not packaged in this JAR).
+- Messages `searchIHI`: `electronicCommunication` before `dateOfBirth` (international address before unstructured) so Consumer Search IHI (including batch) request XML matches the HI Service message schema.
+- Interface `searchIHI`: optional `electronicCommunication` before `dateOfBirth` and `australianUnstructuredStreetAddress` before `internationalAddress` on **`HI_ConsumerSearchIHIInterface-3.0`**.
+- **Tests:** **`SearchIhiPropOrderTest`**, **`SearchForProviderIndividualPropOrderTest`**, **`AustralianStreetAddressPropOrderTest`**, **`InternationalAddressPropOrderTest`**, **`WsdlStubContractTest`**, **`HiWsdlArtifactTest`**, **`GeneratedWsdlBindingsTest`**.
+
+= 1.7.0
+=========
+24 Apr 2026
+- **Version:** Maven **`au.gov.nehta:hi-wsdl`** **1.7.0-SNAPSHOT** (aligns with **hi-b2b-client-java** 1.7 line; SCM tag **`HEAD`** until release).
+- **Scope:** Full MCA - **26** primary HI B2B **`@WebServiceClient`** services (Java **11**, Jakarta XML WS / Bind).
+- **POM:** lean compile deps (**`jakarta.xml.bind-api` 4.0.5**, **`jakarta.xml.ws-api` 4.0.3** only); **`jaxws-rt`** not in the published JAR (consumers add **`jaxws-rt` 4.0.5** at runtime). **`maven-enforcer-plugin`** bans legacy Metro / **`javax`** JAX-WS.
+- **`-Pregenerate-sources`:** **26** **`wsimport`** executions; licensed tree at **`wsdls/xml/`** (**`hi.wsdl.tree.root`**); **`jaxb-xjc` 4.0.9** for valid schema-fragment Javadoc; **`hi_override`** XMLDSig aligned with **1.6.5** line.
+- **Tests:** **`HiWsdlArtifactTest`** asserts **26** classpath WSDLs and **26** **`@WebServiceClient`** stubs; **`GeneratedWsdlBindingsTest`** smoke bindings.
+- **New/regenerated services:** ConsumerSearchIHIBatchAsync 3.0; ConsumerUpdateIHI 3.2; ConsumerNotifyDuplicate/Replica 3.2; ConsumerResolveProvisional 3.0.2; ConsumerCreate(Merge|Update)Provisional 3.0; ConsumerCreateUnverified 3.0.2; ConsumerCreateVerifiedIHI 4.0; ProviderSearch/Manage TDS ProviderIndividual 5.1; plus related message/core packages. **ProviderMatchProviderAdministrativeIndividual** remains out of scope (virtual service; not a published HI B2B interface in this artifact).
+- **Documentation:** version-first release-lines table (**1.6.3** / **1.6.5** / **1.7.0**); README, CONTRIBUTING, MAINTAINERS, SECURITY, **`wsdls/readme.txt`**, build scripts, `.github/workflows/ci.yml`.
+- GPG signing skipped by default (**`-Dgpg.skip=true`**); enable for release with **`-Dgpg.skip=false`**.
+
+= 1.6.2
 =========
 13 Dec 2021
 - Included WSDL files in correct location as per David Shepherdson merge request
 
-= 1.6.1 =
+= 1.6.1
 =========
 12 Feb 2021
 - Converted to Maven
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e4a8ca9..eb00d3b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,8 +4,17 @@
 
 ## Prerequisites
 
-- **JDK 8+** with **`JAVA_HOME`** set.
+- **JDK 24+** with **`JAVA_HOME`** set (see **`maven.compiler.release`** in **`pom.xml`**).
 - **Maven 3.6+** on **`PATH`**.
+- Licensed HI WSDL/XSD tree at **`wsdls/xml/`** only when **regenerating** Jakarta stubs from WSDL (not required for default **`mvn verify`**). See **`wsdls/readme.txt`**.
+
+Dependencies resolve from **[Maven Central](https://central.sonatype.com/)** unless you are installing a **local SNAPSHOT** (below). This POM has no sibling Maven modules.
+
+## Versioning
+
+The **first number** of **`au.gov.nehta:hi-wsdl`** is the **Java SE** version that this types JAR targets. **8.0.0** is **`javax`** with **14** `Service` stubs; **11.0.0** and later are **Jakarta** with **26** stubs. See **`README.md`**.
+
+Consumers that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) must use the **same** version as this **`pom.xml`**.
 
 ## Build
 
@@ -15,32 +24,46 @@ From the project root:
 mvn -B "-Dgpg.skip=true" clean verify
 ```
 
+Or use **`build.ps1`**, **`build.sh`**, or **`build.bat`**. Set **`MVN_SETTINGS`** if you must pass **`-s`** to Maven.
+
+This line (**`24.0.0`**) compiles **committed** types. Regeneration is a maintainer profile only (below).
+
 | Goal | Command |
 | ---- | ------- |
-| Compile + attach sources/Javadoc | `mvn -B "-Dgpg.skip=true" clean verify` |
+| Compile + unit tests | `mvn -B "-Dgpg.skip=true" clean verify` |
 | Skip tests | `mvn -B "-Dgpg.skip=true" clean verify "-DskipTests=true"` |
-| Install SNAPSHOT for sibling client build | `mvn -B "-Dgpg.skip=true" clean install` — required before **`hi-b2b-client-java`** **`verify`** when both repos are at matching **`*-SNAPSHOT`** versions |
+| Install SNAPSHOT to the local Maven repository | `mvn -B "-Dgpg.skip=true" clean install` |
+
+Default tests: **`JakartaStackTest`**, **`GeneratedWsdlBindingsTest`**, **`HiWsdlArtifactTest`**, **`WsdlStubContractTest`**, **`SearchIhiPropOrderTest`**, **`SearchForProviderIndividualPropOrderTest`**, **`AustralianStreetAddressPropOrderTest`**, **`InternationalAddressPropOrderTest`** (offline smoke tests; no licensed WSDL tree or network required).
 
 GPG signing is skipped by default (**`-Dgpg.skip=true`**). Release builds: **`-Dgpg.skip=false`**.
 
-## Dependencies
+## Local builds (unpublished artifacts)
 
-- Compile: **`javax.xml.bind:jaxb-api`** and **`javax.xml.ws:jaxws-api`** only.
-- Runtime SOAP stack: **`com.sun.xml.ws:jaxws-rt`** **2.3.7** in **consuming** applications.
-- **`maven-enforcer-plugin`** rejects Metro **`webservices-*`** coordinates on the classpath.
+**`mvn install`** here is enough for any unpublished consumer of **`au.gov.nehta:hi-wsdl`** at **`${project.version}`**. Integrators using GA versions from Maven Central do not need a source checkout.
 
-## Local builds (unpublished artifacts)
+## Regenerating Jakarta sources
+
+Generated Java under **`src/main/java`** is **committed**. Regeneration is maintainer-only and requires:
+
+1. Licensed toolkit copied to **`wsdls/xml/`** (contains **`wsdl/`**, **`schema/`**, **`binding/`** - same layout as **hi-b2b-client-java**).
+2. Jakarta **`wsimport`** tooling aligned with **`MAINTAINERS.md`** (**`jaxws-rt`** 4.0.x, Java 24).
 
-When co-developing with **`hi-b2b-client-java`**, install matching **`au.gov.nehta:hi-wsdl`** at **`${project.version}`** before the client **`verify`** (same SNAPSHOT or GA — see **README.md** release table).
+Regenerate committed types:
 
 ```text
-mvn -B "-Dgpg.skip=true" clean install
+mvn -B clean -Pregenerate-sources generate-sources process-sources "-Dhi.wsdl.sync.generated=true"
+mvn -B "-Dgpg.skip=true" clean verify
 ```
 
-Integrators using GA versions from Maven Central do not need a sibling checkout. Maintainer notes: **MAINTAINERS.md**.
+When HI interfaces change, copy updated flat **`HI_*.wsdl`** from the licensed tree into **`src/main/resources/`** before committing.
+
+The **`regenerate-sources`** profile runs **26** **`wsimport`** executions with **`jaxb-xjc` 4.0.9** (correct schema-fragment Javadoc from XJC). Update **CHANGELOG.md** after regeneration.
 
 ## Repository hygiene
 
-- **Do not commit** keystores, production HI URLs, populated **`settings.xml`** with release credentials, or the licensed ADHA MCA **`wsdls/xml`** download tree (**`1.6.5`** / **`1.7.0`** regeneration). See **SECURITY.md**.
-- **`1.6.3`:** generated Java under **`src/main/java`** is frozen — this POM has no **`wsimport`** / XJC profile.
+- **Do not commit** keystores, production HI URLs, populated **`settings.xml`** with release credentials, or the licensed ADHA MCA **`wsdls/xml`** download tree. See **SECURITY.md**.
+- **`24.0.0`:** generated Java under **`src/main/java`** is committed; use **`-Pregenerate-sources`** only when refreshing types from licensed WSDL.
 - **Line endings:** the repository uses **LF** (see **`.gitattributes`**). On **Windows**, run **`git config core.autocrlf false`** in your clone before committing.
+
+Maintainer notes: **MAINTAINERS.md**.
diff --git a/LICENSE.txt b/LICENSE.txt
index d37530a..f2db822 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,19 +1,233 @@
-NEHTA (as Licensor) grants You a licence to this Product subject to
-the terms of the Apache Licence (version 2.0), a copy of which is
-available at http://www.apache.org/licenses/LICENSE-2.0, and the
-following terms.
-
-This Product licensed under the Apache Licence and these terms is
-not at a production stage and is accordingly licensed for
-non-production use only.  This Product should in no circumstance be
-used for the processing of personal or patient data in a clinical
-or operational setting, or in the provision of medical or
-therapeutic advice or treatment in a clinical or operational
-setting.  In addition to clause 4(a) of the Apache Licence, You
-must provide a copy of these terms to a recipient of any Work or
-Derivative Works in addition to the Apache Licence to the extent
-that NEHTA is a Contributor in respect of those Works or Derivative
-Works.
+HI WSDL library (hi-wsdl-java) - licensing
+
+Copyright 2012 NEHTA
+Copyright 2021-2026 Australian Digital Health Agency (ADHA) and contributors.
+See notices in individual source files where they differ.
+
+Unless otherwise indicated, this work is licensed under the Apache License,
+Version 2.0. The complete license text is included below to satisfy section 4 of
+that license (recipients must receive a copy of this License with the Work).
+
+================================================================================
+Apache License, Version 2.0 (canonical text)
+================================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+================================================================================
+Additional terms - Australian Digital Health Agency Production Disclaimer
+================================================================================
+
+The Australian Digital Health Agency (as Licensor) grants You a
+licence to this Product subject to the terms of the Apache Licence
+(version 2.0), a copy of which is available at
+http://www.apache.org/licenses/LICENSE-2.0, and the following terms.
+
+This Product licensed under the Apache Licence and these terms may
+be used within production software systems. It nevertheless remains
+your responsibility to test and validate the use of this product
+within your software and the limitation of liability provisions in
+clause 8 of the Apache Licence continue to apply.
 
 Despite clause 7 of the Apache Licence, if a condition or warranty
 is implied by statute or law that cannot be excluded, then the
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index afa2e0e..516db57 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,55 +1,98 @@
-# Maintainer guide
+# Maintainer notes
+
+**Audience:** people changing the **`hi-wsdl`** build, generated types, WSDL layout, or release process - not library integrators. Integrators should use **README.md**, published Javadoc, and **`pom.xml`** coordinates.
 
 Paths are relative to the repository root (directory containing **`pom.xml`**).
 
-## Release lines
+## Versioning
+
+The **first number** of **`<version>`** is the **Java SE** target of **this** types JAR.
+
+| Maven version | Java SE |
+| ------------- | ------- |
+| **8.0.0** | **8** |
+| **11.0.0** | **11** |
+| **17.0.0** | **17** |
+| **21.0.0** | **21** |
+| **24.0.0** | **24** |
+
+**Documentation convention:** README, CONTRIBUTING, CHANGELOG, and integrator-facing text use **version numbers only** - never Git branch names.
 
-**Documentation convention:** README, CONTRIBUTING, CHANGELOG, and integrator-facing text use **version numbers only** — never Git branch names.
+| Version | Java | XML APIs | `Service` stubs |
+| ------- | ---- | -------- | --------------- |
+| **8.0.0** | 8 | **`javax.xml.ws`**, **`javax.xml.bind`** | **14** (standard HI B2B) |
+| **11.0.0** | 11 | **Jakarta** XML WS / Bind | **26** (full MCA) |
+| **17.0.0** | 17 | **Jakarta** XML WS / Bind | **26** (full MCA) |
+| **21.0.0** | 21 | **Jakarta** XML WS / Bind | **26** (full MCA) |
+| **24.0.0** | 24 | **Jakarta** XML WS / Bind | **26** (full MCA) |
 
-| Version | Java | APIs | `Service` stubs |
-| ------- | ---- | ---- | ----------------- |
-| **1.6.3** | 8 | **`javax.xml.ws`**, **`javax.xml.bind`** | **14** (standard HI B2B) |
-| **1.6.5** | 11 | **Jakarta** XML WS / Bind | **14** (standard HI B2B) |
-| **1.7.0** | 11 | **Jakarta** XML WS / Bind | **26** (full MCA) |
+**Git branch mapping (maintainers / checkout only - do not use in integrator docs):**
 
-**Git branch mapping (maintainers / checkout only — do not use in integrator docs):**
+| Version | Official Git branch |
+| ------- | ------------------- |
+| **8.0.0** | `java-8` |
+| **11.0.0** | `java-11` |
+| **17.0.0** | `java-17` |
+| **21.0.0** | `java-21` |
+| **24.0.0** | `java-24` |
 
-| Version | Git branch |
-| ------- | ---------- |
-| **1.6.3** | `java-8-javax` |
-| **1.6.5** | `java-11-jakarta` |
-| **1.7.0** | `java-11-jakarta-full-wsdl` |
+Artifact id stays **`hi-wsdl`**; the version distinguishes the Java SE line. Downstream projects that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) keep the **same** version and the **same** branch names on their matching line.
 
-**This checkout (`1.6.3-SNAPSHOT`):** Java **8**, committed **`javax`** generated types, **14** primary HI B2B **`@WebServiceClient`** services (no **`wsimport`** / XJC in this POM). **`hi-b2b-client`** **`1.6.3`** resolves **`hi-wsdl`** at **`${project.version}`** — **`mvn install`** here before an unpublished client **`verify`**. GA **`1.6.3`** pairs ship to Maven Central together. Type regeneration for new HI releases is on **`1.6.5`** / **`1.7.0`** lines.
+On a given branch, **do not change the first number** of **`<version>`**. Next GA on **`java-24`** is **`24.0.0.1`** (then **`24.0.1-SNAPSHOT`**), not **`25.x`**. A new Java SE target is a **new branch**, not a bump on this one.
+
+**This checkout (`24.0.0-SNAPSHOT`):** Java **24**, committed **Jakarta** generated types, **26** primary HI B2B **`@WebServiceClient`** services. Stack and **`.github/workflows/ci.yml`** (branch **`java-24`**, JDK **24**) below apply to **this line only**. Other branches keep their own **`pom.xml`**, CI branch filter, and JDK. Type regeneration uses **`-Pregenerate-sources`** and a local licensed **`wsdls/xml/`** tree.
 
 ## Artifact
 
-- **`au.gov.nehta:hi-wsdl`** — HI WSDL on the classpath + pre-generated JAX-WS/JAXB types.
+- **`au.gov.nehta:hi-wsdl`** - HI WSDL on the classpath + pre-generated JAX-WS/JAXB types.
 - **Not included:** facade clients, TLS/signing, or runtime filesystem WSDL resolution (**`HiWsdlArtifactRoot`** lives in **hi-b2b-client-java**).
 
-## Build (`1.6.3` line)
+## Layout
 
-- **`maven.compiler.release` 8**
-- Compile deps: **`jaxb-api` 2.3.1**, **`jaxws-api` 2.3.1** — no **`jaxws-rt`** in this POM
-- **`maven-enforcer-plugin`:** bans Metro **`webservices-rt`** / **`webservices-api`** / **`webservices-extra*`** / **`metro-*`** and all **`jakarta.xml.*`** / **`jakarta.jws`** API coordinates ( **`javax`** compile deps only)
-- Consumers (e.g. **hi-b2b-client**): **`com.sun.xml.ws:jaxws-rt` 2.3.7** (Eclipse EE4J, last **2.3.x** on Central for Java **8**)
-- **`maven-gpg-plugin`:** skipped unless **`-Dgpg.skip=false`**
-- **`maven-javadoc-plugin`:** **`doclint=none`**, **`verbose=false`**, **`quiet=true`**, **`failOnWarnings=false`**, **`detectOfflineLinks=false`**, **`source=${maven.compiler.release}`** (8).
-- **No source regeneration** on **`1.6.3`** — no licensed MCA **`wsdls/xml`** tree and no **`-Pregenerate-sources`** profile. **`src/main/java`** and **`hi_override/`** are committed as-is.
+| Path | Role |
+| ---- | ---- |
+| `src/main/resources/` | HI `HI_*.wsdl` (classpath root; packaged in JAR) |
+| `src/main/java/` | Committed generated types + `hi_override` XMLDSig |
+| `src/test/java/au/gov/nehta/hiwsdl/` | Offline binding smoke tests |
+| `wsdls/readme.txt` | Licensed WSDL tree staging instructions (tracked) |
+| `wsdls/xml/` | Local licensed WSDL/XSD for regeneration (**gitignored**) |
+| `pom.xml` (`-Pregenerate-sources`) | **26** **`wsimport`** executions; align with **hi-b2b-client-java** **24.0.0** when adding services |
+| `.github/workflows/ci.yml` | GitHub Actions **`mvn verify`** on **`java-24`**, JDK **24** |
+
+## Release scope (`24.0.0`)
+
+- **Goal:** Java **24** bytecode (`maven.compiler.release` **24**) with **Jakarta** generated types; **26** full MCA **`Service`** stubs.
+- The default lifecycle does **not** run **`wsimport`**. **`src/main/java`** and **`hi_override/`** are committed. Refresh with **`-Pregenerate-sources`**.
+
+## HI service coverage (`24.0.0`)
+
+**26** primary HI B2B interfaces (consumer 3.0-4.0, provider 3.2 / 5.0 / 5.1, TDS 5.1, batch async 5.1, etc.). Interface-only WSDL variants may also exist under **`src/main/resources`**.
+
+**ProviderMatchProviderAdministrativeIndividual** is intentionally out of scope (virtual service; not a published HI B2B interface in this artifact).
+
+## Contributors vs release publisher (`pom.xml`)
+
+**Contributors (PRs, ordinary commits):** Do not change **`<version>`** (stay on **`-SNAPSHOT`** unless the maintainer requests a bump), **`<scm><tag>`**, or **`distributionManagement`**. If a maintainer requests a SNAPSHOT bump on this branch, change only the trailing numbers (**`24.0.1-SNAPSHOT`**), never the Java SE digit. Leave **`maven-gpg-plugin`** **`skip`** **`true`** so default **`mvn verify`** does not require a signing key. Record user-visible work under **`CHANGELOG.md`** in the **`= <pom-version> =`** block that matches **`pom.xml`** **`<version>`**.
+
+**Release publisher:** In the release change set: set **`<version>`** to the GA coordinate (no **`-SNAPSHOT`**); set **`<scm><tag>`** to the Git tag you will publish (match existing tag naming). Move **`CHANGELOG.md`** bullets from the snapshot section into a new **`= <GA-version> =`** section; add a fresh **`-SNAPSHOT`** block for the next development cycle. Deploy via Sonatype Central Portal (**`central-publishing-maven-plugin`**; copy **`settings.xml.example`** -> **`settings.xml`**, server id **`central`**). See **Release** below.
 
 ## Release
 
-Publishing uses **`central-publishing-maven-plugin`** (Sonatype Central Portal). Copy **`settings.xml.example`** → **`settings.xml`**, server id **`central`**.
+Publishing uses **`central-publishing-maven-plugin`** (Sonatype Central Portal). Copy **`settings.xml.example`** -> **`settings.xml`**, server id **`central`**.
+
+**Parallel release lines (maintainers only):** each Git branch of **this** repository publishes a **different Maven version** of **`hi-wsdl`**. Integrators choose by coordinate, not branch name. The first number of that version is the targeted Java SE version. Run **`release:prepare` / `release:perform`** (or manual deploy) **on that branch** (not detached HEAD).
 
-**Parallel release lines (maintainers only):** each Git branch publishes a **different Maven version** — integrators choose by coordinate, not branch name.
+| Branch | Java | `hi-wsdl` | `Service` stubs |
+| ------ | ---- | --------- | --------------- |
+| **`java-8`** | 8 / javax | **8.0.0** | 14 |
+| **`java-11`** | 11 / Jakarta | **11.0.0** | 26 |
+| **`java-17`** | 17 / Jakarta | **17.0.0** | 26 |
+| **`java-21`** | 21 / Jakarta | **21.0.0** | 26 |
+| **`java-24`** | 24 / Jakarta | **24.0.0** | 26 |
 
-| Branch | Java | HI client / WSDL version | Facades |
-| ------ | ---- | ------------------------ | ------- |
-| **`java-8-javax`** | 8 / javax | **1.6.3** | 14 |
-| **`java-11-jakarta`** | 11 / Jakarta | **1.6.5** | 14 |
-| **`java-11-jakarta-full-wsdl`** | 11 / Jakarta | **1.7.0** | 26 |
+**Order:** publish **this artifact** first. Any consumer that depends on **`hi-wsdl`** at the same GA (including **`hi-b2b-client`**) cannot complete **`verify`** / **`release:perform`** until this coordinate is on Central (or installed locally).
 
-Release **`hi-wsdl`** and **`hi-b2b-client`** at the **same GA version** on the matching branch pair before integrators upgrade.
+**`-DdevelopmentVersion`:** keep the same first number as **`-DreleaseVersion`** (example on this line: **`24.0.0`** then **`24.0.1-SNAPSHOT`**).
 
 ### SNAPSHOT or manual GA
 
@@ -57,22 +100,51 @@ Release **`hi-wsdl`** and **`hi-b2b-client`** at the **same GA version** on the
 2. **`mvn -B "-Prelease" clean verify`**
 3. **`mvn -B "-Prelease" deploy`**
 
-Git/SCM settings for **`maven-release-plugin`** live in **`pom.xml`** properties (**`scm.repo.url`**, **`release.*`**). Tags default to **`{artifactId}-{version}`** (e.g. **`hi-wsdl-1.7.0`**).
+Git/SCM settings for **`maven-release-plugin`** live in **`pom.xml`** properties (**`scm.repo.url`**, **`release.*`**). Tags default to **`{artifactId}-{version}`** (e.g. **`hi-wsdl-24.0.0`**).
 
 ### Automated GA (`maven-release-plugin`)
 
 Run on the **target branch** with a **clean** working tree. The plugin commits version bumps, creates the release tag, deploys from the tag checkout, bumps to the next **`-SNAPSHOT`**, and **pushes branch + tag** (**`pushChanges`** / **`remoteTagging`** in **`pom.xml`**). Git remote credentials (SSH or HTTPS) must work non-interactively.
 
 ```text
-mvn -B "-Prelease" release:prepare release:perform -DreleaseVersion=1.7.0 -DdevelopmentVersion=1.7.1-SNAPSHOT -Dtag=hi-wsdl-1.7.0
+mvn -B "-Prelease" release:prepare release:perform -DreleaseVersion=24.0.0 -DdevelopmentVersion=24.0.1-SNAPSHOT -Dtag=hi-wsdl-24.0.0
 ```
 
-Replace versions and **`-Dtag`** for the branch you are on (**`hi-wsdl-1.6.5`**, **`hi-b2b-client-1.6.3`**, etc.). Omit **`-D…`** only if you accept interactive prompts.
+Replace **`-DreleaseVersion`**, **`-DdevelopmentVersion`**, and **`-Dtag`** for the branch you are on (same first number). Omit **`-D...`** only if you accept interactive prompts.
 
-**After success:** confirm the artifact on Central; repeat on the paired types/client repo. No extra Git steps unless push failed (then **`git push origin <branch>`** and **`git push origin <tag>`**).
+**After success:** confirm **`hi-wsdl`** GA on Central. Downstream artifacts that pin this coordinate can then cut their matching GA. No extra Git steps unless push failed; then from the release branch:
+
+`git push origin java-24` (or **`java-8`**, **`java-11`**, **`java-17`**, **`java-21`**) and **`git push origin <tag>`**.
 
 **`-Dgpg.skip=false`** is equivalent to **`-Prelease`** for signing.
 
+## Changelog and releases
+
+**`CHANGELOG.md`** uses **`= version =`** section headers. Match the snapshot header to **`pom.xml`** **`<version>`** until the publisher cuts GA.
+
+## New Java SE line
+
+When adding a line (e.g. Java **25**): create **`java-25`** in **this** repository from the nearest existing types line; set **`<version>`** first number to **25** (e.g. **`25.0.0-SNAPSHOT`**); set **`maven.compiler.release`**, JAX-WS / JAXB coordinates, CI **`java-version`** / branch filter, WSDL/stub inventory, and docs to that line. Do not retarget an existing branch.
+
+Consumers that pin **`hi-wsdl`** to **`${project.version}`** need a matching line of their own once this artifact exists.
+
+## Build (`24.0.0` line)
+
+This subsection is **this `java-24` checkout**. Other lines document their stack in their own **MAINTAINERS** / **`pom.xml`**.
+
+- **`maven.compiler.release` 24**
+- Compile deps: **`jakarta.xml.bind-api` 4.0.5**, **`jakarta.xml.ws-api` 4.0.3** - no **`jaxws-rt`** in the published JAR (**`test`** scope only, for **`GeneratedWsdlBindingsTest`**)
+- **`jaxws-rt` 4.0.5** for **`-Pregenerate-sources`** only (via **`jaxws-tools`** on **`jaxws-maven-plugin`** classpath; not a compile/runtime dependency of the published JAR)
+- Consuming applications add **`com.sun.xml.ws:jaxws-rt` 4.0.5** at runtime
+- Generated sources are **committed**; root POM has **no** default **`wsimport`** execution
+- **`maven-enforcer-plugin`:** bans legacy Metro **`webservices-*`** and **`javax.xml.ws` / `javax.xml.bind`**
+- **`maven-gpg-plugin`:** skipped unless **`-Dgpg.skip=false`**
+- **`maven-javadoc-plugin`:** **`doclint=none`**, **`verbose=false`**, **`quiet=true`**, **`failOnWarnings=false`**, **`detectOfflineLinks=false`**, **`source=${maven.compiler.release}`** (24). Do not hand-edit Javadoc in generated **`src/main/java`**.
+- **Regenerate committed types:** `mvn -B clean -Pregenerate-sources generate-sources process-sources "-Dhi.wsdl.sync.generated=true"` - licensed tree at **`hi.wsdl.tree.root`** (default **`wsdls/xml/`**). Copy updated **`HI_*.wsdl`** into **`src/main/resources/`** when interfaces change. Pins **`jaxb-xjc`** **4.0.9** and **`jaxws-maven-plugin`** **4.0.5**.
+- **`.github/workflows/ci.yml`:** GitHub Actions **`mvn verify`** on **`java-24`**, JDK **24**
+
+Align **`jaxws-rt`** with **hi-b2b-client-java** when bumping toolchain versions.
+
 ## Copyright
 
-Copyright 2012 NEHTA. Copyright 2021-2026 ADHA. Apache License 2.0 — see **LICENSE.txt**.
+Copyright 2012 NEHTA. Copyright 2021-2026 ADHA. Apache License 2.0 - see **LICENSE.txt**.
diff --git a/README.md b/README.md
index 765492e..6637320 100644
--- a/README.md
+++ b/README.md
@@ -1,75 +1,109 @@
 # HI WSDL library
 
-Maven artifact **`au.gov.nehta:hi-wsdl`** — HI B2B **WSDL resources** and **pre-generated JAX-WS / JAXB types** for Healthcare Identifiers (HI) client development.
+Maven artifact **`au.gov.nehta:hi-wsdl`** - HI B2B **WSDL resources** and **pre-generated Jakarta JAX-WS / JAXB types** for Healthcare Identifiers (HI) client development.
 
 For NEHTA facade clients, TLS, and signing, use **[hi-b2b-client-java](https://github.com/AuDigitalHealth/hi-b2b-client-java)**. This repository supplies the **generated type layer** and classpath WSDL only.
 
-## Release lines
-
-| Version | Java | XML stack | HI service scope |
-| ------- | ---- | --------- | ---------------- |
-| **1.6.4** | **8** | **`javax.*`** / EE4J **`jaxws-rt` 2.3.x** at runtime in consumers | Standard HI B2B — **14** `Service` stubs |
-| **1.6.6** | **11** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | Standard HI B2B — **14** `Service` stubs |
-| **1.7.1** | **11** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | Full MCA — **26** `Service` stubs |
-
-**This checkout** builds **`1.6.4-SNAPSHOT`** (Java **8** / **`javax`**) — **committed** generated types with **14** standard HI B2B services (no **`wsimport`** in the build).
-
 ## Dependency
 
-Published releases are consumed from **[Maven Central](https://central.sonatype.com/)** like any other dependency — no local build is required.
+Published releases are consumed from **[Maven Central](https://central.sonatype.com/)**. Use a **`<version>`** that matches your JDK (see **Versioning**).
 
 ```xml
 <dependency>
   <groupId>au.gov.nehta</groupId>
   <artifactId>hi-wsdl</artifactId>
-  <version>1.6.4</version>
+  <version>24.0.0</version>
 </dependency>
 ```
 
-Add Eclipse EE4J **`com.sun.xml.ws:jaxws-rt`** **2.3.7** at runtime in your application when you invoke SOAP endpoints ( **`javax.xml.ws`** / **`javax.xml.bind`** ). This JAR does not bundle **`jaxws-rt`**. 
+**This line (`24.0.0`):** Java **24**, **Jakarta** XML WS / Bind, **26** HI B2B **`Service`** stubs (full MCA), **committed** generated types (no **`wsimport`** in the default build). Compile dependencies: **`jakarta.xml.bind-api`** **4.0.5** and **`jakarta.xml.ws-api`** **4.0.3**. Add Eclipse EE4J **`com.sun.xml.ws:jaxws-rt`** **4.0.5** at runtime in your application when you invoke SOAP endpoints. This JAR does not bundle **`jaxws-rt`**.
+
+When **`hi-b2b-client`** is also on the classpath, use the **same** Maven version for both artifacts.
+
+---
+
+## Versioning
+
+The **first number** of the Maven version is the **Java SE** version that this types JAR targets. Downstream artifacts that pin **`hi-wsdl`** to **`${project.version}`** (including **`hi-b2b-client`**) use that same coordinate on a given line.
+
+| Maven version | Java SE | XML stack | `Service` stubs |
+| ------------- | ------- | --------- | --------------- |
+| **8.0.0** | **8** | **`javax.*`** / EE4J **`jaxws-rt` 2.3.x** at runtime in consumers | **14** (standard HI B2B) |
+| **11.0.0** | **11** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **26** (full MCA) |
+| **17.0.0** | **17** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **26** (full MCA) |
+| **21.0.0** | **21** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **26** (full MCA) |
+| **24.0.0** | **24** | **Jakarta** / EE4J **`jaxws-rt` 4.0.x** at runtime in consumers | **26** (full MCA) |
+
+Pick the coordinate that matches your JDK. Do not mix **`hi-wsdl`** versions with a consumer that expects a different line. All published versions are on **[Maven Central](https://central.sonatype.com/)**.
 
-Align **`hi-wsdl`** and **`hi-b2b-client`** at the **same version** when both are on the classpath (GA versions in the table above).
+---
+
+## Note
+
+The **24.0.0** JAR ships **Jakarta** types and the full MCA binding set (**26** `Service` stubs). **8.0.0** is **`javax`** with **14** stubs (standard HI B2B only).
+
+---
 
 ## Local development (SNAPSHOT)
 
-This repository builds **`1.6.4-SNAPSHOT`** on the Java **8** / **`javax`** line. **`hi-b2b-client-java`** declares **`au.gov.nehta:hi-wsdl`** at **`${project.version}`** — install this types JAR **first** when both checkouts are unpublished:
+This repository builds **`24.0.0-SNAPSHOT`**. The default lifecycle compiles **committed** types only. To make an unpublished JAR resolvable for other local projects:
 
 ```text
-# 1) hi-wsdl (1.6.4-SNAPSHOT — this repository)
 mvn -B "-Dgpg.skip=true" clean install
-
-# 2) hi-b2b-client (1.6.4-SNAPSHOT — matching version)
-mvn -B "-Dgpg.skip=true" clean verify
 ```
 
-If Maven warns that a **GA** POM is missing (for example **`1.6.4`** before Central publish), clear stale **`au/gov/nehta/hi-wsdl`** entries in your **local Maven repository** (folders with only **`.lastUpdated`** files) and reinstall the SNAPSHOT. **`mvn clean`** in one project does not clear the local repository cache.
+Consumers that declare **`au.gov.nehta:hi-wsdl`** at **`${project.version}`** (including **`hi-b2b-client-java`**) need that install (or a Central GA) before their **`verify`**.
+
+If Maven warns that a **GA** POM is missing (for example **`24.0.0`** before Central publish), clear stale **`au/gov/nehta/hi-wsdl`** entries in your **local Maven repository** (folders with only **`.lastUpdated`** files) and reinstall the SNAPSHOT. **`mvn clean`** in this project does not clear the local repository cache.
 
 ## What is in the JAR
 
 | Content | Location in repo |
 | ------- | ---------------- |
-| **14** primary binding WSDLs (classpath) | `src/main/resources/HI_*.wsdl` (plus supporting message/interface WSDLs in the same tree) |
-| Generated stubs (`javax`) | `src/main/java/` |
+| HI service WSDL (classpath) | `src/main/resources/HI_*.wsdl` |
+| Jakarta generated stubs | `src/main/java/` |
 | XMLDSig JAXB override | `src/main/java/hi_override/` |
 
+The published JAR includes WSDL on the classpath root (for example `/HI_ConsumerSearchIHI-3.0.wsdl`). Generated **`Service`** classes reference those locations.
+
+## Licensed WSDL tree (regeneration only)
+
+WSDL under **`src/main/resources`** references XSD paths resolved from the licensed toolkit layout at **`wsdls/xml/`** (not in public Git). Obtain the pack when **regenerating** types from WSDL:
+
+- [Healthcare Identifiers Integration Toolkit](https://developer.digitalhealth.gov.au/resources/healthcare-identifiers-integration-toolkit-v1-2) (Digital Health Developer Portal)
+- [HI Service for software developers](https://www.servicesaustralia.gov.au/healthcare-identifier-hi-service-for-software-developers) (Services Australia)
+
+A normal **`mvn verify`** on committed sources does **not** require a local licensed tree.
+
+Confirm your organisation's redistribution terms for HI WSDL before mirroring this repository.
+
 ## Building from source
 
-**Audience:** contributors changing this repository — not integrators adding a Maven dependency.
+**Audience:** contributors changing this repository - not integrators adding a Maven dependency.
 
-Prerequisites: **JDK 8+**, **Maven 3.6+**. All JAX-WS/JAXB types are **committed** in **`src/main/java`**; the build compiles them only (no codegen, no licensed MCA schema tree required).
+Prerequisites: **JDK 24+**, **Maven 3.6+**. Generated Java is **committed**; the default build does not run **`wsimport`**.
 
 ```text
 mvn -B "-Dgpg.skip=true" clean verify
 ```
 
-See **`CONTRIBUTING.md`** for optional **`mvn install`** when testing unpublished snapshots locally.
+Or **`build.ps1`**, **`build.sh`**, **`build.bat`**. See **`CONTRIBUTING.md`** for tests, regeneration, and optional **`mvn install`** when you need an unpublished snapshot in your local Maven cache.
 
-## Related repositories
+## When to use this artifact
 
-| Repository | Role |
-| ---------- | ---- |
-| [hi-b2b-client-java](https://github.com/AuDigitalHealth/hi-b2b-client-java) | HI facade clients |
-| [mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java) | MHR facades (separate domain) |
+| You need | Use |
+| -------- | --- |
+| HI JAXB/JAX-WS types + `HI_*.wsdl` on the classpath | **`hi-wsdl`** (this JAR) |
+| NEHTA facade clients, TLS, and signing | **[hi-b2b-client-java](https://github.com/AuDigitalHealth/hi-b2b-client-java)** |
+| My Health Record (PCEHR) only | **[mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java)** - separate domain |
+
+## Relationship to hi-b2b-client-java
+
+| | **hi-wsdl-java** (this repo) | **hi-b2b-client-java** |
+| --- | --- | --- |
+| Artifact | `hi-wsdl` | `hi-b2b-client` |
+| Facade clients | No | Yes (`au.gov.nehta.vendorlibrary.hi.*`) |
+| Codegen | **26** committed `Service` stubs; **`-Pregenerate-sources`** for maintainer refresh only | **`24.0.0`**: in-repo **`wsimport`** (26 executions) by default; optional **`-Phi-wsdl-artifact`** uses matching **`hi-wsdl`** from Maven Central |
 
 ## Documentation
 
@@ -81,6 +115,14 @@ See **`CONTRIBUTING.md`** for optional **`mvn install`** when testing unpublishe
 | **SECURITY.md** | Secrets and licensed material |
 | **CHANGELOG.md** | Release history |
 | **LICENSE.txt** | Apache License 2.0 + ADHA terms |
+| **wsdls/readme.txt** | Licensed WSDL tree staging (regeneration only) |
+
+## Related repositories
+
+| Repository | Role |
+| ---------- | ---- |
+| [hi-b2b-client-java](https://github.com/AuDigitalHealth/hi-b2b-client-java) | HI facade clients (depends on this artifact) |
+| [mhr-b2b-client-java](https://github.com/AuDigitalHealth/mhr-b2b-client-java) | MHR facades (separate domain) |
 
 ## License
 
diff --git a/SECURITY.md b/SECURITY.md
index a6e100d..1b5a484 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +1,20 @@
 # Security
 
+## If you integrate this library
+
+**`hi-wsdl`** provides WSDL resources and generated types. Do **not** embed mutual-TLS private keys, keystore passwords, or production HI endpoint URLs in **your** application's source control.
+
 ## Reporting issues
 
-Report security-sensitive findings through your organisation's usual channel for **ADHA / AuDigitalHealth** repositories (do not open a public issue with exploit details before it is triaged).
+For **security vulnerabilities in this library** (not routine support):
+
+1. Prefer **GitHub private vulnerability reporting** for this repository if it is enabled (**Security** tab -> **Report a vulnerability**).
+2. Otherwise use your organisation's channel for **ADHA / AuDigitalHealth** repositories. Do **not** post exploit details, live credentials, or production URLs in a **public issue** before triage.
 
 ## This repository
 
-- **Do not commit secrets to git.** That includes passwords, API tokens, private keys, real mutual-TLS keystores, production or staging HI endpoint URLs with embedded credentials, and Services Australia / vendor registration material — even inside comments, test fixtures, or tracked documentation.
-- **`local.properties`** is gitignored. Never commit real HI credentials or keystores.
-- **`settings.xml`** at the repository root is gitignored when it contains release credentials; do not commit populated copies. Use **`settings.xml.example`** as the template (server id **`central`**).
-- **Licensed MCA WSDL/XSD download tree:** on **`1.6.5`** and **`1.7.0`**, the full ADHA bundle under **`wsdls/xml/`** (or equivalent) must stay out of Git. This **`1.6.3`** line ships only the standard HI B2B binding WSDL set under **`src/main/resources/`** as published artifact content.
-- In property files, prefer **forward slashes** in filesystem paths so the same values work on **Windows**, **macOS**, and **Linux**.
+- **Do not commit secrets to git.** That includes passwords, API tokens, private keys, mutual-TLS keystores, and vendor registration material.
+- **Licensed MCA WSDL/XSD download tree:** on **Jakarta** regeneration lines (**11.0.0** and later), the full ADHA bundle under **`wsdls/xml/`** must stay out of Git. **`.gitignore`** excludes **`/wsdls/*`** except **`wsdls/readme.txt`**; verify with **`git status`** before every push. Obtain the toolkit from the [Healthcare Identifiers Integration Toolkit](https://developer.digitalhealth.gov.au/resources/healthcare-identifiers-integration-toolkit-v1-2) for local regeneration only.
+- **Do not commit** populated **`settings.xml`** (see **`settings.xml.example`**). Use **`MVN_SETTINGS`** or merge release credentials into your Maven user settings file locally.
+- **HI WSDL files** under **`src/main/resources/`** are published as part of this open-source artifact. If your organisation's vendor terms differ, confirm with ADHA before mirroring or redistributing.
+- **Do not commit** populated **`local.properties`** or machine-specific **`settings.xml`**.
diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..79410fd
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,9 @@
+@echo off
+setlocal
+cd /d "%~dp0"
+if defined MVN_SETTINGS (
+  mvn -B -s "%MVN_SETTINGS%" -Dgpg.skip=true clean verify %*
+) else (
+  mvn -B -Dgpg.skip=true clean verify %*
+)
+exit /b %ERRORLEVEL%
diff --git a/build.ps1 b/build.ps1
new file mode 100644
index 0000000..88f6ddb
--- /dev/null
+++ b/build.ps1
@@ -0,0 +1,13 @@
+#Requires -Version 5.1
+# Optional: $env:MVN_SETTINGS = path to settings.xml
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+Set-Location -LiteralPath $PSScriptRoot
+$mvnArgs = @('-B')
+if ($null -ne $env:MVN_SETTINGS -and $env:MVN_SETTINGS.Trim().Length -gt 0) {
+    $mvnArgs += @('-s', $env:MVN_SETTINGS.Trim())
+}
+Write-Output 'Building hi-wsdl JAR'
+$mvnArgs += @('-Dgpg.skip=true', 'clean', 'verify')
+& mvn @mvnArgs
+exit $LASTEXITCODE
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..33356bf
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "$0")"
+MVN=(mvn -B)
+if [[ -n "${MVN_SETTINGS:-}" ]]; then
+  MVN+=(-s "$MVN_SETTINGS")
+fi
+echo 'Building hi-wsdl JAR'
+exec "${MVN[@]}" -Dgpg.skip=true clean verify "$@"
diff --git a/pom.xml b/pom.xml
index 03b422f..dc8f822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
 
     <groupId>au.gov.nehta</groupId>
     <artifactId>hi-wsdl</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
-    <name>HI Compiled WSDL library</name>
-    <description>HI B2B WSDL resources and pre-generated JAX-WS / JAXB types (Java 8 / javax)</description>
+    <version>24.0.0-SNAPSHOT</version>
+    <name>HI WSDL library</name>
+    <description>Healthcare Identifiers B2B WSDL and Jakarta generated types (Java 24)</description>
     <url>https://github.com/AuDigitalHealth/hi-wsdl-java</url>
 
     <licenses>
@@ -43,15 +43,6 @@
         <tag>${scm.tag}</tag>
     </scm>
 
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/AuDigitalHealth/hi-wsdl-java/issues</url>
-    </issueManagement>
-    <ciManagement>
-        <system>GitHub Actions</system>
-        <url>https://github.com/AuDigitalHealth/hi-wsdl-java/actions</url>
-    </ciManagement>
-
     <distributionManagement>
         <snapshotRepository>
             <id>central</id>
@@ -64,12 +55,10 @@
     </distributionManagement>
 
     <properties>
-        <maven.compiler.release>8</maven.compiler.release>
+        <maven.compiler.release>24</maven.compiler.release>
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
-        <project.resources.sourceEncoding>${encoding}</project.resources.sourceEncoding>
-        <archetype.encoding>${encoding}</archetype.encoding>
         <skipTests>false</skipTests>
         <gpg.skip>true</gpg.skip>
         <!-- SCM / maven-release-plugin (scm.repo.url is the only repo-specific Git value) -->
@@ -83,39 +72,31 @@
         <release.pushChanges>true</release.pushChanges>
         <release.remoteTagging>true</release.remoteTagging>
         <release.scmCommentPrefix>[maven-release-plugin] </release.scmCommentPrefix>
-        <!-- Consumers add com.sun.xml.ws:jaxws-rt 2.3.7 at runtime; this JAR ships types + classpath WSDL only. -->
-        <jaxb.api.version>2.3.1</jaxb.api.version>
-        <jaxws.api.version>2.3.1</jaxws.api.version>
-        <javax.jws.api.version>1.1</javax.jws.api.version>
+        <!-- wsimport/XJC 4.0.7+ writes schema-fragment Javadoc that Maven Javadoc accepts. Pin jaxb-xjc on jaxws-maven-plugin (see regenerate-sources). -->
+        <jaxb.xjc.version>4.0.9</jaxb.xjc.version>
+        <!-- Eclipse EE4J XML Web Services (jaxws-tools). jaxws-maven-plugin 4.0.3+ requires JDK 17+ to run wsimport. -->
+        <jaxws.rt.version>4.0.5</jaxws.rt.version>
+        <jakarta.xml.bind.api.version>4.0.5</jakarta.xml.bind.api.version>
+        <jakarta.xml.ws.api.version>4.0.3</jakarta.xml.ws.api.version>
         <junit.version>4.13.2</junit.version>
-        <plugin.clean.version>3.5.0</plugin.clean.version>
-        <plugin.compiler.version>3.15.0</plugin.compiler.version>
-        <plugin.surefire.version>3.5.5</plugin.surefire.version>
-        <plugin.javadoc.version>3.12.0</plugin.javadoc.version>
-        <plugin.source.version>3.4.0</plugin.source.version>
+        <plugin.enforcer.version>3.6.2</plugin.enforcer.version>
         <plugin.deploy.version>3.1.4</plugin.deploy.version>
         <plugin.release.version>3.3.1</plugin.release.version>
-        <plugin.central.publishing.version>0.9.0</plugin.central.publishing.version>
-        <plugin.gpg.version>3.2.8</plugin.gpg.version>
-        <plugin.enforcer.version>3.6.2</plugin.enforcer.version>
-        <argLine>-Xmx1024m</argLine>
+        <plugin.central.publishing.version>0.11.0</plugin.central.publishing.version>
+        <plugin.surefire.version>3.5.6</plugin.surefire.version>
     </properties>
 
+    <!-- Java 17+: JAXB/JAX-WS are not on the JDK classpath. jakarta.xml.ws-api includes JWS annotations. -->
     <dependencies>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb.api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>${jaxws.api.version}</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jakarta.xml.bind.api.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>javax.jws-api</artifactId>
-            <version>${javax.jws.api.version}</version>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
+            <version>${jakarta.xml.ws.api.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -123,6 +104,12 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>${jaxws.rt.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -130,53 +117,23 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>${plugin.clean.version}</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${plugin.enforcer.version}</version>
-                <executions>
-                    <execution>
-                        <id>enforce-build-tooling</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>[3.6.3,)</version>
-                                </requireMavenVersion>
-                                <bannedDependencies>
-                                    <excludes>
-                                        <exclude>com.sun.xml.ws:webservices-rt</exclude>
-                                        <exclude>com.sun.xml.ws:webservices-api</exclude>
-                                        <exclude>com.sun.xml.ws:webservices-extra</exclude>
-                                        <exclude>com.sun.xml.ws:webservices-extra-api</exclude>
-                                        <exclude>jakarta.xml.bind:*</exclude>
-                                        <exclude>jakarta.xml.ws:*</exclude>
-                                        <exclude>jakarta.jws:*</exclude>
-                                        <exclude>jakarta.xml.soap:*</exclude>
-                                        <exclude>jakarta.activation:*</exclude>
-                                        <exclude>jakarta.annotation:*</exclude>
-                                    </excludes>
-                                    <message>Java 8 / javax line: use javax.xml.bind, javax.xml.ws, and javax.jws only. Consumers add EE4J jaxws-rt 2.3.x at runtime — not Metro webservices-* or Jakarta XML APIs.</message>
-                                </bannedDependencies>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
+                <version>3.5.0</version>
+                <configuration>
+                    <retryOnError>true</retryOnError>
+                    <fast>false</fast>
+                    <force>true</force>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>${plugin.gpg.version}</version>
+                <version>3.2.8</version>
                 <configuration>
                     <skip>${gpg.skip}</skip>
                 </configuration>
                 <executions>
                     <execution>
-                        <id>sign-artifacts</id>
+                        <id>sign-artefacts</id>
                         <phase>verify</phase>
                         <goals>
                             <goal>sign</goal>
@@ -187,7 +144,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${plugin.javadoc.version}</version>
+                <version>3.12.0</version>
                 <configuration>
                     <verbose>false</verbose>
                     <quiet>true</quiet>
@@ -209,12 +166,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>${plugin.source.version}</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
                         <goals>
-                            <goal>jar-no-fork</goal>
+                            <goal>jar</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -244,7 +201,17 @@
                     <skipTests>${skipTests}</skipTests>
                     <encoding>UTF-8</encoding>
                     <enableAssertions>true</enableAssertions>
-                    <argLine>${argLine}</argLine>
+                    <argLine>-Xmx1024m</argLine>
+                    <includes>
+                        <include>**/GeneratedWsdlBindingsTest.java</include>
+                        <include>**/HiWsdlArtifactTest.java</include>
+                        <include>**/JakartaStackTest.java</include>
+                        <include>**/WsdlStubContractTest.java</include>
+                        <include>**/SearchIhiPropOrderTest.java</include>
+                        <include>**/SearchForProviderIndividualPropOrderTest.java</include>
+                        <include>**/AustralianStreetAddressPropOrderTest.java</include>
+                        <include>**/InternationalAddressPropOrderTest.java</include>
+                    </includes>
                 </configuration>
             </plugin>
             <plugin>
@@ -265,20 +232,54 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${plugin.compiler.version}</version>
+                <version>3.15.0</version>
                 <configuration>
                     <release>${maven.compiler.release}</release>
                     <encoding>${project.build.sourceEncoding}</encoding>
-                    <proc>none</proc>
-                    <compilerArgs>
-                        <arg>-Xlint:unchecked</arg>
-                    </compilerArgs>
                     <debug>true</debug>
                     <debuglevel>lines,vars,source</debuglevel>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <!-- HI service WSDL under src/main/resources is intentionally packaged in this artifact. -->
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${plugin.enforcer.version}</version>
+                <executions>
+                    <execution>
+                        <id>enforce-build-tooling</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.6.3,)</version>
+                                </requireMavenVersion>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>com.sun.xml.ws:webservices-rt</exclude>
+                                        <exclude>com.sun.xml.ws:webservices-api</exclude>
+                                        <exclude>com.sun.xml.ws:webservices-extra</exclude>
+                                        <exclude>com.sun.xml.ws:webservices-extra-api</exclude>
+                                        <exclude>javax.xml.ws:*</exclude>
+                                        <exclude>javax.xml.bind:*</exclude>
+                                        <exclude>javax.xml.soap:*</exclude>
+                                    </excludes>
+                                    <message>Use Eclipse EE4J jaxws-rt and Jakarta XML APIs, not legacy Metro / javax JAX-WS.</message>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -289,6 +290,475 @@
                 <gpg.skip>false</gpg.skip>
             </properties>
         </profile>
+        <!-- Maintainer: mvn -B clean -Pregenerate-sources generate-sources process-sources -->
+        <!-- Optional commit sync: add -Dhi.wsdl.sync.generated=true -->
+        <profile>
+            <id>regenerate-sources</id>
+            <properties>
+                <groovy.version>4.0.33</groovy.version>
+                <gmavenplus.plugin.version>4.3.1</gmavenplus.plugin.version>
+                <jaxws.maven.plugin.version>4.0.5</jaxws.maven.plugin.version>
+                <hi.wsdl.tree.root>${project.basedir}/wsdls/xml</hi.wsdl.tree.root>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.gmavenplus</groupId>
+                        <artifactId>gmavenplus-plugin</artifactId>
+                        <version>${gmavenplus.plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>merge-wsimport</id>
+                                <phase>process-sources</phase>
+                                <goals><goal>execute</goal></goals>
+                                <configuration>
+                                    <scripts>
+                                        <script><![CDATA[
+                                            def bd = project.build.directory as File
+                                            def out = new File(bd, 'generated-sources/wsimport')
+                                            out.mkdirs()
+                                            def base = new File(bd, 'generated-sources/wsimport-parts')
+                                            def names = [
+                                        'wsimport-consumer-search-ihi',
+                                        'wsimport-consumer-search-ihi-batch-sync',
+                                        'wsimport-provider-batch-async-individual',
+                                        'wsimport-provider-batch-async-organisation',
+                                        'wsimport-provider-search-individual',
+                                        'wsimport-provider-search-organisation',
+                                        'wsimport-provider-manage-org',
+                                        'wsimport-provider-manage-directory-entry',
+                                        'wsimport-provider-hpio-directory',
+                                        'wsimport-provider-read-reference-data',
+                                        'wsimport-provider-read-org',
+                                        'wsimport-provider-manage-admin-individual',
+                                        'wsimport-provider-read-admin-individual',
+                                        'wsimport-provider-hpii-directory',
+                                        'wsimport-consumer-search-ihi-batch-async',
+                                        'wsimport-consumer-create-provisional-ihi',
+                                        'wsimport-consumer-merge-provisional-ihi',
+                                        'wsimport-consumer-update-provisional-ihi',
+                                        'wsimport-consumer-create-unverified-ihi',
+                                        'wsimport-consumer-resolve-provisional-ihi',
+                                        'wsimport-consumer-notify-duplicate-ihi',
+                                        'wsimport-consumer-notify-replica-ihi',
+                                        'wsimport-consumer-update-ihi',
+                                        'wsimport-consumer-create-verified-ihi',
+                                        'wsimport-provider-manage-tds-provider-individual',
+                                        'wsimport-provider-search-tds-provider-individual',
+                                            ]
+                                            names.each { String part ->
+                                                def dir = new File(base, part)
+                                                if (!dir.isDirectory()) return
+                                                dir.eachFileRecurse(groovy.io.FileType.FILES) { File f ->
+                                                    def rel = dir.toPath().relativize(f.toPath()).toString().replace('\\', '/')
+                                                    def target = new File(out, rel)
+                                                    target.parentFile.mkdirs()
+                                                    if (!target.exists()) {
+                                                        f.withInputStream { ins -> target.withOutputStream { os -> os << ins } }
+                                                    }
+                                                }
+                                            }
+                                            def syncFlag = project.properties.getProperty('hi.wsdl.sync.generated')
+                                            if (syncFlag == null || syncFlag.trim().isEmpty()) {
+                                                syncFlag = session.userProperties.getProperty('hi.wsdl.sync.generated', 'false')
+                                            }
+                                            if ('true'.equalsIgnoreCase(String.valueOf(syncFlag).trim())) {
+                                                def srcMain = new File(project.basedir, 'src/main/java')
+                                                out.eachFileRecurse(groovy.io.FileType.FILES) { File f ->
+                                                    if (!f.name.endsWith('.java')) return
+                                                    def rel = out.toPath().relativize(f.toPath()).toString().replace('\\', '/')
+                                                    def target = new File(srcMain, rel)
+                                                    target.parentFile.mkdirs()
+                                                    f.withInputStream { ins -> target.withOutputStream { os -> os << ins } }
+                                                }
+                                                log.info('Synced generated sources to src/main/java')
+                                            }
+                                            if (base.isDirectory()) {
+                                                base.deleteDir()
+                                            }
+                                        ]]></script>
+                                    </scripts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.groovy</groupId>
+                                <artifactId>groovy</artifactId>
+                                <version>${groovy.version}</version>
+                                <scope>runtime</scope>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.sun.xml.ws</groupId>
+                        <artifactId>jaxws-maven-plugin</artifactId>
+                        <version>${jaxws.maven.plugin.version}</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.sun.xml.ws</groupId>
+                                <artifactId>jaxws-tools</artifactId>
+                                <version>${jaxws.rt.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.glassfish.jaxb</groupId>
+                                <artifactId>jaxb-xjc</artifactId>
+                                <version>${jaxb.xjc.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <xnocompile>true</xnocompile>
+                            <extension>true</extension>
+                            <quiet>true</quiet>
+                            <encoding>${project.build.sourceEncoding}</encoding>
+                            <xjcArgs>
+                                <xjcArg>-XautoNameResolution</xjcArg>
+                            </xjcArgs>
+                            <vmArgs>
+                                <vmArg>-Djavax.xml.accessExternalSchema=all</vmArg>
+                                <vmArg>-Djava.io.tmpdir=${project.build.directory}/jaxws/tmp</vmArg>
+                            </vmArgs>
+                        </configuration>
+                        <executions>
+<execution>
+                        <id>wsimport-consumer-search-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-search-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-search-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-search-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100731</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerSearchIHI-3.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerSearchIHI-3.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-search-ihi-batch-sync</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-search-ihi-batch-sync</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-search-ihi-batch-sync</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-search-ihi-batch-sync</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100731</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerSearchIHIBatchSync-3.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerSearchIHIBatchSync-3.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-batch-async-individual</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-batch-async-individual</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-batch-async-individual</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-batch-async-individual</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20130622</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderBatchAsyncSearchForProviderIndividual-5.1.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderBatchAsyncSearchForProviderIndividual-5.1.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-batch-async-organisation</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-batch-async-organisation</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-batch-async-organisation</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-batch-async-organisation</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20130622</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderBatchAsyncSearchForProviderOrganisation-5.1.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderBatchAsyncSearchForProviderOrganisation-5.1.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-search-individual</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-search-individual</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-search-individual</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-search-individual</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20130401</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderSearchForProviderIndividual-5.0.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderSearchForProviderIndividual-5.0.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-search-organisation</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-search-organisation</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-search-organisation</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-search-organisation</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20130401</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderSearchForProviderOrganisation-5.0.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderSearchForProviderOrganisation-5.0.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-manage-org</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-manage-org</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-manage-org</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-manage-org</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderManageProviderOrganisation-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderManageProviderOrganisation-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-manage-directory-entry</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-manage-directory-entry</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-manage-directory-entry</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-manage-directory-entry</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderManageProviderDirectoryEntry-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderManageProviderDirectoryEntry-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-hpio-directory</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-hpio-directory</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-hpio-directory</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-hpio-directory</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderSearchHIProviderDirectoryForOrganisation-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderSearchHIProviderDirectoryForOrganisation-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-read-reference-data</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-read-reference-data</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-read-reference-data</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-read-reference-data</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderReadReferenceData-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderReadReferenceData-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-read-org</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-read-org</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-read-org</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-read-org</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderReadProviderOrganisation-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderReadProviderOrganisation-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-manage-admin-individual</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-manage-admin-individual</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-manage-admin-individual</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-manage-admin-individual</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderManageProviderAdministrativeIndividual-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderManageProviderAdministrativeIndividual-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-read-admin-individual</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-read-admin-individual</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-read-admin-individual</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-read-admin-individual</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderReadProviderAdministrativeIndividual-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderReadProviderAdministrativeIndividual-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-hpii-directory</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-hpii-directory</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-hpii-directory</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-hpii-directory</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderSearchHIProviderDirectoryForIndividual-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderSearchHIProviderDirectoryForIndividual-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-search-ihi-batch-async</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-search-ihi-batch-async</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-search-ihi-batch-async</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-search-ihi-batch-async</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100731</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerSearchIHIBatchAsync-3.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerSearchIHIBatchAsync-3.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-create-provisional-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-create-provisional-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-create-provisional-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-create-provisional-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100731</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerCreateProvisionalIHI-3.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerCreateProvisionalIHI-3.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-merge-provisional-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-merge-provisional-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-merge-provisional-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-merge-provisional-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100731</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerMergeProvisionalIHI-3.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerMergeProvisionalIHI-3.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-update-provisional-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-update-provisional-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-update-provisional-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-update-provisional-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100731</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerUpdateProvisionalIHI-3.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerUpdateProvisionalIHI-3.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-create-unverified-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-create-unverified-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-create-unverified-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-create-unverified-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100821</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerCreateUnverifiedIHI-3.0.2.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerCreateUnverifiedIHI-3.0.2.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-resolve-provisional-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-resolve-provisional-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-resolve-provisional-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-resolve-provisional-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100821</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerResolveProvisionalIHI-3.0.2.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerResolveProvisionalIHI-3.0.2.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-notify-duplicate-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-notify-duplicate-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-notify-duplicate-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-notify-duplicate-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerNotifyDuplicateIHI-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerNotifyDuplicateIHI-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-notify-replica-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-notify-replica-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-notify-replica-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-notify-replica-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerNotifyReplicaIHI-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerNotifyReplicaIHI-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-update-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-update-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-update-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-update-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20100930</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerUpdateIHI-3.2.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerUpdateIHI-3.2.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-consumer-create-verified-ihi</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-consumer-create-verified-ihi</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-consumer-create-verified-ihi</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-consumer-create-verified-ihi</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/consumer/20111201</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ConsumerCreateVerifiedIHI-4.0.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ConsumerCreateVerifiedIHI-4.0.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-manage-tds-provider-individual</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-manage-tds-provider-individual</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-manage-tds-provider-individual</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-manage-tds-provider-individual</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20130622</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderManageTdsProviderIndividual-5.1.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderManageTdsProviderIndividual-5.1.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+<execution>
+                        <id>wsimport-provider-search-tds-provider-individual</id>
+                        <goals><goal>wsimport</goal></goals>
+                        <configuration>
+                            <destDir>${project.build.directory}/jaxws/dest/wsimport-provider-search-tds-provider-individual</destDir>
+                            <staleFile>${project.build.directory}/jaxws/stale-wsimport-provider-search-tds-provider-individual</staleFile>
+                            <sourceDestDir>${project.build.directory}/generated-sources/wsimport-parts/wsimport-provider-search-tds-provider-individual</sourceDestDir>
+                            <wsdlDirectory>${hi.wsdl.tree.root}/wsdl/provider/20130622</wsdlDirectory>
+                            <wsdlFiles><wsdlFile>HI_ProviderSearchTdsProviderIndividual-5.1.0.wsdl</wsdlFile></wsdlFiles>
+                            <wsdlLocation>HI_ProviderSearchTdsProviderIndividual-5.1.0.wsdl</wsdlLocation>
+                        </configuration>
+                    </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>3.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>require-licensed-wsdl-tree</id>
+                                <phase>initialize</phase>
+                                <goals><goal>enforce</goal></goals>
+                                <configuration>
+                                    <rules>
+                                        <requireFilesExist>
+                                            <files>
+                                                <file>${hi.wsdl.tree.root}/wsdl/consumer/20100731/HI_ConsumerSearchIHI-3.0.wsdl</file>
+                                            </files>
+                                            <message>Regeneration requires the licensed HI WSDL/XSD tree (wsdl/ and schema/ under hi.wsdl.tree.root). Default: wsdls/xml in this repo; override with -Dhi.wsdl.tree.root or env HI_WSDL_TREE_ROOT (same layout as hi-b2b-client-java).</message>
+                                        </requireFilesExist>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/schema/readme.txt b/schema/readme.txt
new file mode 100644
index 0000000..9731048
--- /dev/null
+++ b/schema/readme.txt
@@ -0,0 +1,7 @@
+Licensed WSDL/XSD staging - see wsdls/readme.txt
+================================================
+
+Regeneration on the 24.0.0 line uses the licensed toolkit tree at wsdls/xml/
+(hi.wsdl.tree.root), not schema/ at the repository root.
+
+See wsdls/readme.txt and CONTRIBUTING.md for setup and mvn -Pregenerate-sources commands.
diff --git a/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/DetailsResponseType.java b/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/DetailsResponseType.java
new file mode 100644
index 0000000..9311c78
--- /dev/null
+++ b/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/DetailsResponseType.java
@@ -0,0 +1,87 @@
+
+package au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for DetailsResponseType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="DetailsResponseType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DetailsResponseType", propOrder = {
+    "clientRef",
+    "tdsReference"
+})
+public class DetailsResponseType {
+
+    protected String clientRef;
+    protected String tdsReference;
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+}
diff --git a/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/ObjectFactory.java b/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/ObjectFactory.java
new file mode 100644
index 0000000..26bcf1b
--- /dev/null
+++ b/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/ObjectFactory.java
@@ -0,0 +1,42 @@
+
+package au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link DetailsResponseType }
+     * 
+     * @return
+     *     the new instance of {@link DetailsResponseType }
+     */
+    public DetailsResponseType createDetailsResponseType() {
+        return new DetailsResponseType();
+    }
+
+}
diff --git a/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/package-info.java b/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/package-info.java
new file mode 100644
index 0000000..74461f3
--- /dev/null
+++ b/src/main/java/au/gov/medicareaustralia/ns/provider/schema/_2013/_06/_22/elements/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ConsumerCreateProvisionalIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ConsumerCreateProvisionalIHIPortType.java
new file mode 100644
index 0000000..5f5fd78
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ConsumerCreateProvisionalIHIPortType.java
@@ -0,0 +1,74 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerCreateProvisionalIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerCreateProvisionalIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3.CreateProvisionalIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
+    @WebResult(name = "createProvisionalIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0/ConsumerCreateProvisionalIHIPortType/createProvisionalIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0/ConsumerCreateProvisionalIHIPortType/createProvisionalIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0/ConsumerCreateProvisionalIHIPortType/createProvisionalIHI/Fault/standardError")
+    })
+    public CreateProvisionalIHIResponse createProvisionalIHI(
+        @WebParam(name = "createProvisionalIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", partName = "request")
+        CreateProvisionalIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ConsumerCreateProvisionalIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ConsumerCreateProvisionalIHIService.java
new file mode 100644
index 0000000..108cd2e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ConsumerCreateProvisionalIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerCreateProvisionalIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", wsdlLocation = "HI_ConsumerCreateProvisionalIHI-3.0.wsdl")
+public class ConsumerCreateProvisionalIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERCREATEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERCREATEPROVISIONALIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERCREATEPROVISIONALIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", "ConsumerCreateProvisionalIHIService");
+
+    static {
+        CONSUMERCREATEPROVISIONALIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3.ConsumerCreateProvisionalIHIService.class.getResource("HI_ConsumerCreateProvisionalIHI-3.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERCREATEPROVISIONALIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerCreateProvisionalIHI-3.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERCREATEPROVISIONALIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerCreateProvisionalIHIService() {
+        super(__getWsdlLocation(), CONSUMERCREATEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public ConsumerCreateProvisionalIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERCREATEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerCreateProvisionalIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERCREATEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public ConsumerCreateProvisionalIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERCREATEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerCreateProvisionalIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerCreateProvisionalIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerCreateProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerCreateProvisionalIHISOAP12Port")
+    public ConsumerCreateProvisionalIHIPortType getConsumerCreateProvisionalIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", "ConsumerCreateProvisionalIHISOAP12Port"), ConsumerCreateProvisionalIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerCreateProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerCreateProvisionalIHISOAP12Port")
+    public ConsumerCreateProvisionalIHIPortType getConsumerCreateProvisionalIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", "ConsumerCreateProvisionalIHISOAP12Port"), ConsumerCreateProvisionalIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERCREATEPROVISIONALIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERCREATEPROVISIONALIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERCREATEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/CreateProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/CreateProvisionalIHI.java
new file mode 100644
index 0000000..4822802
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/CreateProvisionalIHI.java
@@ -0,0 +1,271 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "familyName",
+    "givenName",
+    "sex",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification"
+})
+@XmlRootElement(name = "createProvisionalIHI")
+public class CreateProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGivenName() {
+        return givenName;
+    }
+
+    /**
+     * Sets the value of the givenName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGivenName(String value) {
+        this.givenName = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/CreateProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/CreateProvisionalIHIResponse.java
new file mode 100644
index 0000000..9685876
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/CreateProvisionalIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3.CreateProvisionalIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateProvisionalIHI/3.0}createProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "createProvisionalIHIResult"
+})
+@XmlRootElement(name = "createProvisionalIHIResponse")
+public class CreateProvisionalIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateProvisionalIHI/3.0", required = true)
+    protected CreateProvisionalIHIResult createProvisionalIHIResult;
+
+    /**
+     * Gets the value of the createProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CreateProvisionalIHIResult }
+     *     
+     */
+    public CreateProvisionalIHIResult getCreateProvisionalIHIResult() {
+        return createProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the createProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CreateProvisionalIHIResult }
+     *     
+     */
+    public void setCreateProvisionalIHIResult(CreateProvisionalIHIResult value) {
+        this.createProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..b88e043
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link CreateProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link CreateProvisionalIHI }
+     */
+    public CreateProvisionalIHI createCreateProvisionalIHI() {
+        return new CreateProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link CreateProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link CreateProvisionalIHIResponse }
+     */
+    public CreateProvisionalIHIResponse createCreateProvisionalIHIResponse() {
+        return new CreateProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/StandardErrorMsg.java
new file mode 100644
index 0000000..4e8e0cc
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..f7f1bd0
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumercreateprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ConsumerCreateUnverifiedIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ConsumerCreateUnverifiedIHIPortType.java
new file mode 100644
index 0000000..aeac0a3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ConsumerCreateUnverifiedIHIPortType.java
@@ -0,0 +1,80 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerCreateUnverifiedIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.address._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.name._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerCreateUnverifiedIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0.CreateUnverifiedIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
+    @WebResult(name = "createUnverifiedIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2/ConsumerCreateUnverifiedIHIPortType/createUnverifiedIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2/ConsumerCreateUnverifiedIHIPortType/createUnverifiedIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2/ConsumerCreateUnverifiedIHIPortType/createUnverifiedIHI/Fault/standardError")
+    })
+    public CreateUnverifiedIHIResponse createUnverifiedIHI(
+        @WebParam(name = "createUnverifiedIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", partName = "request")
+        CreateUnverifiedIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ConsumerCreateUnverifiedIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ConsumerCreateUnverifiedIHIService.java
new file mode 100644
index 0000000..e86951e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ConsumerCreateUnverifiedIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerCreateUnverifiedIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", wsdlLocation = "HI_ConsumerCreateUnverifiedIHI-3.0.2.wsdl")
+public class ConsumerCreateUnverifiedIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERCREATEUNVERIFIEDIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERCREATEUNVERIFIEDIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERCREATEUNVERIFIEDIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", "ConsumerCreateUnverifiedIHIService");
+
+    static {
+        CONSUMERCREATEUNVERIFIEDIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0.ConsumerCreateUnverifiedIHIService.class.getResource("HI_ConsumerCreateUnverifiedIHI-3.0.2.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERCREATEUNVERIFIEDIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerCreateUnverifiedIHI-3.0.2.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERCREATEUNVERIFIEDIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerCreateUnverifiedIHIService() {
+        super(__getWsdlLocation(), CONSUMERCREATEUNVERIFIEDIHISERVICE_QNAME);
+    }
+
+    public ConsumerCreateUnverifiedIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERCREATEUNVERIFIEDIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerCreateUnverifiedIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERCREATEUNVERIFIEDIHISERVICE_QNAME);
+    }
+
+    public ConsumerCreateUnverifiedIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERCREATEUNVERIFIEDIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerCreateUnverifiedIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerCreateUnverifiedIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerCreateUnverifiedIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerCreateUnverifiedIHISOAP12Port")
+    public ConsumerCreateUnverifiedIHIPortType getConsumerCreateUnverifiedIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", "ConsumerCreateUnverifiedIHISOAP12Port"), ConsumerCreateUnverifiedIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerCreateUnverifiedIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerCreateUnverifiedIHISOAP12Port")
+    public ConsumerCreateUnverifiedIHIPortType getConsumerCreateUnverifiedIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", "ConsumerCreateUnverifiedIHISOAP12Port"), ConsumerCreateUnverifiedIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERCREATEUNVERIFIEDIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERCREATEUNVERIFIEDIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERCREATEUNVERIFIEDIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/CreateUnverifiedIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/CreateUnverifiedIHI.java
new file mode 100644
index 0000000..615e0a6
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/CreateUnverifiedIHI.java
@@ -0,0 +1,322 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3.IndividualHealthcareIdentityType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0}individualHealthcareIdentity"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address" maxOccurs="2" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "individualHealthcareIdentity",
+    "electronicCommunication",
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix",
+    "usage",
+    "conditionalUse",
+    "address"
+})
+@XmlRootElement(name = "createUnverifiedIHI")
+public class CreateUnverifiedIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0", required = true)
+    protected IndividualHealthcareIdentityType individualHealthcareIdentity;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected String conditionalUse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected List<AddressType> address;
+
+    /**
+     * Gets the value of the individualHealthcareIdentity property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualHealthcareIdentityType }
+     *     
+     */
+    public IndividualHealthcareIdentityType getIndividualHealthcareIdentity() {
+        return individualHealthcareIdentity;
+    }
+
+    /**
+     * Sets the value of the individualHealthcareIdentity property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualHealthcareIdentityType }
+     *     
+     */
+    public void setIndividualHealthcareIdentity(IndividualHealthcareIdentityType value) {
+        this.individualHealthcareIdentity = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the address property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddress().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AddressType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the address property.
+     */
+    public List<AddressType> getAddress() {
+        if (address == null) {
+            address = new ArrayList<>();
+        }
+        return this.address;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/CreateUnverifiedIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/CreateUnverifiedIHIResponse.java
new file mode 100644
index 0000000..4262ffc
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/CreateUnverifiedIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3.CreateUnverifiedIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateUnverifiedIHI/3.0}createUnverifiedIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "createUnverifiedIHIResult"
+})
+@XmlRootElement(name = "createUnverifiedIHIResponse")
+public class CreateUnverifiedIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateUnverifiedIHI/3.0", required = true)
+    protected CreateUnverifiedIHIResult createUnverifiedIHIResult;
+
+    /**
+     * Gets the value of the createUnverifiedIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CreateUnverifiedIHIResult }
+     *     
+     */
+    public CreateUnverifiedIHIResult getCreateUnverifiedIHIResult() {
+        return createUnverifiedIHIResult;
+    }
+
+    /**
+     * Sets the value of the createUnverifiedIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CreateUnverifiedIHIResult }
+     *     
+     */
+    public void setCreateUnverifiedIHIResult(CreateUnverifiedIHIResult value) {
+        this.createUnverifiedIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ObjectFactory.java
new file mode 100644
index 0000000..9989cab
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link CreateUnverifiedIHI }
+     * 
+     * @return
+     *     the new instance of {@link CreateUnverifiedIHI }
+     */
+    public CreateUnverifiedIHI createCreateUnverifiedIHI() {
+        return new CreateUnverifiedIHI();
+    }
+
+    /**
+     * Create an instance of {@link CreateUnverifiedIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link CreateUnverifiedIHIResponse }
+     */
+    public CreateUnverifiedIHIResponse createCreateUnverifiedIHIResponse() {
+        return new CreateUnverifiedIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/StandardErrorMsg.java
new file mode 100644
index 0000000..e21a2cc
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/package-info.java
new file mode 100644
index 0000000..df79b10
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateunverifiedihi/_3_0/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateUnverifiedIHI/3.0.2", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumercreateunverifiedihi._3_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ConsumerCreateVerifiedIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ConsumerCreateVerifiedIHIPortType.java
new file mode 100644
index 0000000..93258c2
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ConsumerCreateVerifiedIHIPortType.java
@@ -0,0 +1,80 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerCreateVerifiedIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.address._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.name._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerCreateVerifiedIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0.CreateVerifiedIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "createVerifiedIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0/ConsumerCreateVerifiedIHIPortType/createVerifiedIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0/ConsumerCreateVerifiedIHIPortType/createVerifiedIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/4.0.0/ConsumerCreateVerifiedIHIPortType/createVerifiedIHI/Fault/standardError")
+    })
+    public CreateVerifiedIHIResponse createVerifiedIHI(
+        @WebParam(name = "createVerifiedIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", partName = "request")
+        CreateVerifiedIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ConsumerCreateVerifiedIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ConsumerCreateVerifiedIHIService.java
new file mode 100644
index 0000000..868e393
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ConsumerCreateVerifiedIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerCreateVerifiedIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", wsdlLocation = "HI_ConsumerCreateVerifiedIHI-4.0.0.wsdl")
+public class ConsumerCreateVerifiedIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERCREATEVERIFIEDIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERCREATEVERIFIEDIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERCREATEVERIFIEDIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", "ConsumerCreateVerifiedIHIService");
+
+    static {
+        CONSUMERCREATEVERIFIEDIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0.ConsumerCreateVerifiedIHIService.class.getResource("HI_ConsumerCreateVerifiedIHI-4.0.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERCREATEVERIFIEDIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerCreateVerifiedIHI-4.0.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERCREATEVERIFIEDIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerCreateVerifiedIHIService() {
+        super(__getWsdlLocation(), CONSUMERCREATEVERIFIEDIHISERVICE_QNAME);
+    }
+
+    public ConsumerCreateVerifiedIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERCREATEVERIFIEDIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerCreateVerifiedIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERCREATEVERIFIEDIHISERVICE_QNAME);
+    }
+
+    public ConsumerCreateVerifiedIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERCREATEVERIFIEDIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerCreateVerifiedIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerCreateVerifiedIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerCreateVerifiedIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerCreateVerifiedIHISOAP12Port")
+    public ConsumerCreateVerifiedIHIPortType getConsumerCreateVerifiedIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", "ConsumerCreateVerifiedIHISOAP12Port"), ConsumerCreateVerifiedIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerCreateVerifiedIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerCreateVerifiedIHISOAP12Port")
+    public ConsumerCreateVerifiedIHIPortType getConsumerCreateVerifiedIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", "ConsumerCreateVerifiedIHISOAP12Port"), ConsumerCreateVerifiedIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERCREATEVERIFIEDIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERCREATEVERIFIEDIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERCREATEVERIFIEDIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/CreateVerifiedIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/CreateVerifiedIHI.java
new file mode 100644
index 0000000..98906af
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/CreateVerifiedIHI.java
@@ -0,0 +1,573 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}onlyNameIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}privacyNotification"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification",
+    "electronicCommunication",
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "onlyNameIndicator",
+    "nameSuffix",
+    "usage",
+    "conditionalUse",
+    "address",
+    "privacyNotification"
+})
+@XmlRootElement(name = "createVerifiedIHI")
+public class CreateVerifiedIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected Boolean onlyNameIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected String conditionalUse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", required = true)
+    protected AddressType address;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    protected boolean privacyNotification;
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the onlyNameIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isOnlyNameIndicator() {
+        return onlyNameIndicator;
+    }
+
+    /**
+     * Sets the value of the onlyNameIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setOnlyNameIndicator(Boolean value) {
+        this.onlyNameIndicator = value;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AddressType }
+     *     
+     */
+    public AddressType getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the value of the address property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AddressType }
+     *     
+     */
+    public void setAddress(AddressType value) {
+        this.address = value;
+    }
+
+    /**
+     * Gets the value of the privacyNotification property.
+     * 
+     */
+    public boolean isPrivacyNotification() {
+        return privacyNotification;
+    }
+
+    /**
+     * Sets the value of the privacyNotification property.
+     * 
+     */
+    public void setPrivacyNotification(boolean value) {
+        this.privacyNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/CreateVerifiedIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/CreateVerifiedIHIResponse.java
new file mode 100644
index 0000000..481703b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/CreateVerifiedIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0.CreateVerifiedIHIResultType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0}createVerifiedIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "createVerifiedIHIResult"
+})
+@XmlRootElement(name = "createVerifiedIHIResponse")
+public class CreateVerifiedIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0", required = true)
+    protected CreateVerifiedIHIResultType createVerifiedIHIResult;
+
+    /**
+     * Gets the value of the createVerifiedIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CreateVerifiedIHIResultType }
+     *     
+     */
+    public CreateVerifiedIHIResultType getCreateVerifiedIHIResult() {
+        return createVerifiedIHIResult;
+    }
+
+    /**
+     * Sets the value of the createVerifiedIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CreateVerifiedIHIResultType }
+     *     
+     */
+    public void setCreateVerifiedIHIResult(CreateVerifiedIHIResultType value) {
+        this.createVerifiedIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ObjectFactory.java
new file mode 100644
index 0000000..0153d32
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link CreateVerifiedIHI }
+     * 
+     * @return
+     *     the new instance of {@link CreateVerifiedIHI }
+     */
+    public CreateVerifiedIHI createCreateVerifiedIHI() {
+        return new CreateVerifiedIHI();
+    }
+
+    /**
+     * Create an instance of {@link CreateVerifiedIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link CreateVerifiedIHIResponse }
+     */
+    public CreateVerifiedIHIResponse createCreateVerifiedIHIResponse() {
+        return new CreateVerifiedIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/StandardErrorMsg.java
new file mode 100644
index 0000000..6d85a53
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/package-info.java
new file mode 100644
index 0000000..f0f9a6f
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumercreateverifiedihi/_4_0/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerCreateVerifiedIHI/4.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumercreateverifiedihi._4_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ConsumerMergeProvisionalIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ConsumerMergeProvisionalIHIPortType.java
new file mode 100644
index 0000000..87f4fd4
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ConsumerMergeProvisionalIHIPortType.java
@@ -0,0 +1,73 @@
+
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerMergeProvisionalIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerMergeProvisionalIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3.MergeProvisionalIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
+    @WebResult(name = "mergeProvisionalIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0/ConsumerMergeProvisionalIHIPortType/mergeProvisionalIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0/ConsumerMergeProvisionalIHIPortType/mergeProvisionalIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0/ConsumerMergeProvisionalIHIPortType/mergeProvisionalIHI/Fault/standardError")
+    })
+    public MergeProvisionalIHIResponse mergeProvisionalIHI(
+        @WebParam(name = "mergeProvisionalIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", partName = "request")
+        MergeProvisionalIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ConsumerMergeProvisionalIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ConsumerMergeProvisionalIHIService.java
new file mode 100644
index 0000000..d17eb4f
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ConsumerMergeProvisionalIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerMergeProvisionalIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", wsdlLocation = "HI_ConsumerMergeProvisionalIHI-3.0.wsdl")
+public class ConsumerMergeProvisionalIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERMERGEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERMERGEPROVISIONALIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERMERGEPROVISIONALIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", "ConsumerMergeProvisionalIHIService");
+
+    static {
+        CONSUMERMERGEPROVISIONALIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3.ConsumerMergeProvisionalIHIService.class.getResource("HI_ConsumerMergeProvisionalIHI-3.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERMERGEPROVISIONALIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerMergeProvisionalIHI-3.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERMERGEPROVISIONALIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerMergeProvisionalIHIService() {
+        super(__getWsdlLocation(), CONSUMERMERGEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public ConsumerMergeProvisionalIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERMERGEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerMergeProvisionalIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERMERGEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public ConsumerMergeProvisionalIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERMERGEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerMergeProvisionalIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerMergeProvisionalIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerMergeProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerMergeProvisionalIHISOAP12Port")
+    public ConsumerMergeProvisionalIHIPortType getConsumerMergeProvisionalIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", "ConsumerMergeProvisionalIHISOAP12Port"), ConsumerMergeProvisionalIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerMergeProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerMergeProvisionalIHISOAP12Port")
+    public ConsumerMergeProvisionalIHIPortType getConsumerMergeProvisionalIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", "ConsumerMergeProvisionalIHISOAP12Port"), ConsumerMergeProvisionalIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERMERGEPROVISIONALIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERMERGEPROVISIONALIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERMERGEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/MergeProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/MergeProvisionalIHI.java
new file mode 100644
index 0000000..829871f
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/MergeProvisionalIHI.java
@@ -0,0 +1,76 @@
+
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber" maxOccurs="2" minOccurs="2"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber"
+})
+@XmlRootElement(name = "mergeProvisionalIHI")
+public class MergeProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected List<String> ihiNumber;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the ihiNumber property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIhiNumber().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the ihiNumber property.
+     */
+    public List<String> getIhiNumber() {
+        if (ihiNumber == null) {
+            ihiNumber = new ArrayList<>();
+        }
+        return this.ihiNumber;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/MergeProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/MergeProvisionalIHIResponse.java
new file mode 100644
index 0000000..248882e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/MergeProvisionalIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3.MergeProvisionalIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/MergeProvisionalIHI/3.0}mergeProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "mergeProvisionalIHIResult"
+})
+@XmlRootElement(name = "mergeProvisionalIHIResponse")
+public class MergeProvisionalIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/MergeProvisionalIHI/3.0", required = true)
+    protected MergeProvisionalIHIResult mergeProvisionalIHIResult;
+
+    /**
+     * Gets the value of the mergeProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MergeProvisionalIHIResult }
+     *     
+     */
+    public MergeProvisionalIHIResult getMergeProvisionalIHIResult() {
+        return mergeProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the mergeProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MergeProvisionalIHIResult }
+     *     
+     */
+    public void setMergeProvisionalIHIResult(MergeProvisionalIHIResult value) {
+        this.mergeProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..eb157bd
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link MergeProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link MergeProvisionalIHI }
+     */
+    public MergeProvisionalIHI createMergeProvisionalIHI() {
+        return new MergeProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link MergeProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link MergeProvisionalIHIResponse }
+     */
+    public MergeProvisionalIHIResponse createMergeProvisionalIHIResponse() {
+        return new MergeProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/StandardErrorMsg.java
new file mode 100644
index 0000000..c28e755
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..10f6ec0
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumermergeprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerMergeProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumermergeprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ConsumerNotifyDuplicateIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ConsumerNotifyDuplicateIHIPortType.java
new file mode 100644
index 0000000..d6c614e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ConsumerNotifyDuplicateIHIPortType.java
@@ -0,0 +1,73 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerNotifyDuplicateIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.ObjectFactory.class
+})
+public interface ConsumerNotifyDuplicateIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2.NotifyDuplicateIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "notifyDuplicateIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0/ConsumerNotifyDuplicateIHIPortType/notifyDuplicateIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0/ConsumerNotifyDuplicateIHIPortType/notifyDuplicateIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0/ConsumerNotifyDuplicateIHIPortType/notifyDuplicateIHI/Fault/standardError")
+    })
+    public NotifyDuplicateIHIResponse notifyDuplicateIHI(
+        @WebParam(name = "notifyDuplicateIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", partName = "request")
+        NotifyDuplicateIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ConsumerNotifyDuplicateIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ConsumerNotifyDuplicateIHIService.java
new file mode 100644
index 0000000..d9e488f
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ConsumerNotifyDuplicateIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerNotifyDuplicateIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", wsdlLocation = "HI_ConsumerNotifyDuplicateIHI-3.2.0.wsdl")
+public class ConsumerNotifyDuplicateIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERNOTIFYDUPLICATEIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERNOTIFYDUPLICATEIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERNOTIFYDUPLICATEIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", "ConsumerNotifyDuplicateIHIService");
+
+    static {
+        CONSUMERNOTIFYDUPLICATEIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2.ConsumerNotifyDuplicateIHIService.class.getResource("HI_ConsumerNotifyDuplicateIHI-3.2.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERNOTIFYDUPLICATEIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerNotifyDuplicateIHI-3.2.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERNOTIFYDUPLICATEIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerNotifyDuplicateIHIService() {
+        super(__getWsdlLocation(), CONSUMERNOTIFYDUPLICATEIHISERVICE_QNAME);
+    }
+
+    public ConsumerNotifyDuplicateIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERNOTIFYDUPLICATEIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerNotifyDuplicateIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERNOTIFYDUPLICATEIHISERVICE_QNAME);
+    }
+
+    public ConsumerNotifyDuplicateIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERNOTIFYDUPLICATEIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerNotifyDuplicateIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerNotifyDuplicateIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerNotifyDuplicateIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerNotifyDuplicateIHISOAP12Port")
+    public ConsumerNotifyDuplicateIHIPortType getConsumerNotifyDuplicateIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", "ConsumerNotifyDuplicateIHISOAP12Port"), ConsumerNotifyDuplicateIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerNotifyDuplicateIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerNotifyDuplicateIHISOAP12Port")
+    public ConsumerNotifyDuplicateIHIPortType getConsumerNotifyDuplicateIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", "ConsumerNotifyDuplicateIHISOAP12Port"), ConsumerNotifyDuplicateIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERNOTIFYDUPLICATEIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERNOTIFYDUPLICATEIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERNOTIFYDUPLICATEIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/NotifyDuplicateIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/NotifyDuplicateIHI.java
new file mode 100644
index 0000000..66f8932
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/NotifyDuplicateIHI.java
@@ -0,0 +1,104 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber" maxOccurs="12" minOccurs="2"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}comment"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "comment"
+})
+@XmlRootElement(name = "notifyDuplicateIHI")
+public class NotifyDuplicateIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected List<String> ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    protected String comment;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the ihiNumber property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIhiNumber().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the ihiNumber property.
+     */
+    public List<String> getIhiNumber() {
+        if (ihiNumber == null) {
+            ihiNumber = new ArrayList<>();
+        }
+        return this.ihiNumber;
+    }
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/NotifyDuplicateIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/NotifyDuplicateIHIResponse.java
new file mode 100644
index 0000000..956796b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/NotifyDuplicateIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2.NotifyDuplicateIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyDuplicateIHI/3.2.0}notifyDuplicateIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "notifyDuplicateIHIResult"
+})
+@XmlRootElement(name = "notifyDuplicateIHIResponse")
+public class NotifyDuplicateIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyDuplicateIHI/3.2.0", required = true)
+    protected NotifyDuplicateIHIResult notifyDuplicateIHIResult;
+
+    /**
+     * Gets the value of the notifyDuplicateIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NotifyDuplicateIHIResult }
+     *     
+     */
+    public NotifyDuplicateIHIResult getNotifyDuplicateIHIResult() {
+        return notifyDuplicateIHIResult;
+    }
+
+    /**
+     * Sets the value of the notifyDuplicateIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NotifyDuplicateIHIResult }
+     *     
+     */
+    public void setNotifyDuplicateIHIResult(NotifyDuplicateIHIResult value) {
+        this.notifyDuplicateIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..5244778
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NotifyDuplicateIHI }
+     * 
+     * @return
+     *     the new instance of {@link NotifyDuplicateIHI }
+     */
+    public NotifyDuplicateIHI createNotifyDuplicateIHI() {
+        return new NotifyDuplicateIHI();
+    }
+
+    /**
+     * Create an instance of {@link NotifyDuplicateIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link NotifyDuplicateIHIResponse }
+     */
+    public NotifyDuplicateIHIResponse createNotifyDuplicateIHIResponse() {
+        return new NotifyDuplicateIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/StandardErrorMsg.java
new file mode 100644
index 0000000..3ed3dcf
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/package-info.java
new file mode 100644
index 0000000..7cb3582
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyduplicateihi/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyDuplicateIHI/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumernotifyduplicateihi._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ConsumerNotifyReplicaIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ConsumerNotifyReplicaIHIPortType.java
new file mode 100644
index 0000000..b9d28ee
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ConsumerNotifyReplicaIHIPortType.java
@@ -0,0 +1,73 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerNotifyReplicaIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerNotifyReplicaIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2.NotifyReplicaIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "notifyReplicaIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0/ConsumerNotifyReplicaIHIPortType/notifyReplicaIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0/ConsumerNotifyReplicaIHIPortType/notifyReplicaIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0/ConsumerNotifyReplicaIHIPortType/notifyReplicaIHI/Fault/standardError")
+    })
+    public NotifyReplicaIHIResponse notifyReplicaIHI(
+        @WebParam(name = "notifyReplicaIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", partName = "request")
+        NotifyReplicaIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ConsumerNotifyReplicaIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ConsumerNotifyReplicaIHIService.java
new file mode 100644
index 0000000..4530f2b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ConsumerNotifyReplicaIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerNotifyReplicaIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", wsdlLocation = "HI_ConsumerNotifyReplicaIHI-3.2.0.wsdl")
+public class ConsumerNotifyReplicaIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERNOTIFYREPLICAIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERNOTIFYREPLICAIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERNOTIFYREPLICAIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", "ConsumerNotifyReplicaIHIService");
+
+    static {
+        CONSUMERNOTIFYREPLICAIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2.ConsumerNotifyReplicaIHIService.class.getResource("HI_ConsumerNotifyReplicaIHI-3.2.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERNOTIFYREPLICAIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerNotifyReplicaIHI-3.2.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERNOTIFYREPLICAIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerNotifyReplicaIHIService() {
+        super(__getWsdlLocation(), CONSUMERNOTIFYREPLICAIHISERVICE_QNAME);
+    }
+
+    public ConsumerNotifyReplicaIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERNOTIFYREPLICAIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerNotifyReplicaIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERNOTIFYREPLICAIHISERVICE_QNAME);
+    }
+
+    public ConsumerNotifyReplicaIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERNOTIFYREPLICAIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerNotifyReplicaIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerNotifyReplicaIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerNotifyReplicaIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerNotifyReplicaIHISOAP12Port")
+    public ConsumerNotifyReplicaIHIPortType getConsumerNotifyReplicaIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", "ConsumerNotifyReplicaIHISOAP12Port"), ConsumerNotifyReplicaIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerNotifyReplicaIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerNotifyReplicaIHISOAP12Port")
+    public ConsumerNotifyReplicaIHIPortType getConsumerNotifyReplicaIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", "ConsumerNotifyReplicaIHISOAP12Port"), ConsumerNotifyReplicaIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERNOTIFYREPLICAIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERNOTIFYREPLICAIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERNOTIFYREPLICAIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/NotifyReplicaIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/NotifyReplicaIHI.java
new file mode 100644
index 0000000..ddc7d6a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/NotifyReplicaIHI.java
@@ -0,0 +1,94 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}comment"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "comment"
+})
+@XmlRootElement(name = "notifyReplicaIHI")
+public class NotifyReplicaIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    protected String comment;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/NotifyReplicaIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/NotifyReplicaIHIResponse.java
new file mode 100644
index 0000000..3145674
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/NotifyReplicaIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2.NotifyReplicaIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyReplicaIHI/3.2.0}notifyReplicaIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "notifyReplicaIHIResult"
+})
+@XmlRootElement(name = "notifyReplicaIHIResponse")
+public class NotifyReplicaIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyReplicaIHI/3.2.0", required = true)
+    protected NotifyReplicaIHIResult notifyReplicaIHIResult;
+
+    /**
+     * Gets the value of the notifyReplicaIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NotifyReplicaIHIResult }
+     *     
+     */
+    public NotifyReplicaIHIResult getNotifyReplicaIHIResult() {
+        return notifyReplicaIHIResult;
+    }
+
+    /**
+     * Sets the value of the notifyReplicaIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NotifyReplicaIHIResult }
+     *     
+     */
+    public void setNotifyReplicaIHIResult(NotifyReplicaIHIResult value) {
+        this.notifyReplicaIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..7507f83
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NotifyReplicaIHI }
+     * 
+     * @return
+     *     the new instance of {@link NotifyReplicaIHI }
+     */
+    public NotifyReplicaIHI createNotifyReplicaIHI() {
+        return new NotifyReplicaIHI();
+    }
+
+    /**
+     * Create an instance of {@link NotifyReplicaIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link NotifyReplicaIHIResponse }
+     */
+    public NotifyReplicaIHIResponse createNotifyReplicaIHIResponse() {
+        return new NotifyReplicaIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/StandardErrorMsg.java
new file mode 100644
index 0000000..ecd26b5
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/package-info.java
new file mode 100644
index 0000000..ec7fa61
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumernotifyreplicaihi/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerNotifyReplicaIHI/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumernotifyreplicaihi._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ConsumerResolveProvisionalIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ConsumerResolveProvisionalIHIPortType.java
new file mode 100644
index 0000000..2d48198
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ConsumerResolveProvisionalIHIPortType.java
@@ -0,0 +1,79 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerResolveProvisionalIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.address._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.name._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerResolveProvisionalIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0.ResolveProvisionalIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
+    @WebResult(name = "resolveProvisionalIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2/ConsumerResolveProvisionalIHIPortType/resolveProvisionalIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2/ConsumerResolveProvisionalIHIPortType/resolveProvisionalIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2/ConsumerResolveProvisionalIHIPortType/resolveProvisionalIHI/Fault/standardError")
+    })
+    public ResolveProvisionalIHIResponse resolveProvisionalIHI(
+        @WebParam(name = "resolveProvisionalIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", partName = "request")
+        ResolveProvisionalIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ConsumerResolveProvisionalIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ConsumerResolveProvisionalIHIService.java
new file mode 100644
index 0000000..39a4a97
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ConsumerResolveProvisionalIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerResolveProvisionalIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", wsdlLocation = "HI_ConsumerResolveProvisionalIHI-3.0.2.wsdl")
+public class ConsumerResolveProvisionalIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERRESOLVEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERRESOLVEPROVISIONALIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERRESOLVEPROVISIONALIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", "ConsumerResolveProvisionalIHIService");
+
+    static {
+        CONSUMERRESOLVEPROVISIONALIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0.ConsumerResolveProvisionalIHIService.class.getResource("HI_ConsumerResolveProvisionalIHI-3.0.2.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERRESOLVEPROVISIONALIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerResolveProvisionalIHI-3.0.2.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERRESOLVEPROVISIONALIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerResolveProvisionalIHIService() {
+        super(__getWsdlLocation(), CONSUMERRESOLVEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public ConsumerResolveProvisionalIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERRESOLVEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerResolveProvisionalIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERRESOLVEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public ConsumerResolveProvisionalIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERRESOLVEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerResolveProvisionalIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerResolveProvisionalIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerResolveProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerResolveProvisionalIHISOAP12Port")
+    public ConsumerResolveProvisionalIHIPortType getConsumerResolveProvisionalIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", "ConsumerResolveProvisionalIHISOAP12Port"), ConsumerResolveProvisionalIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerResolveProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerResolveProvisionalIHISOAP12Port")
+    public ConsumerResolveProvisionalIHIPortType getConsumerResolveProvisionalIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", "ConsumerResolveProvisionalIHISOAP12Port"), ConsumerResolveProvisionalIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERRESOLVEPROVISIONALIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERRESOLVEPROVISIONALIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERRESOLVEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ObjectFactory.java
new file mode 100644
index 0000000..6f63e08
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ResolveProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link ResolveProvisionalIHI }
+     */
+    public ResolveProvisionalIHI createResolveProvisionalIHI() {
+        return new ResolveProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link ResolveProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link ResolveProvisionalIHIResponse }
+     */
+    public ResolveProvisionalIHIResponse createResolveProvisionalIHIResponse() {
+        return new ResolveProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ResolveProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ResolveProvisionalIHI.java
new file mode 100644
index 0000000..31074e1
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ResolveProvisionalIHI.java
@@ -0,0 +1,554 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification",
+    "electronicCommunication",
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix",
+    "usage",
+    "conditionalUse",
+    "address"
+})
+@XmlRootElement(name = "resolveProvisionalIHI")
+public class ResolveProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected String conditionalUse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected AddressType address;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AddressType }
+     *     
+     */
+    public AddressType getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the value of the address property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AddressType }
+     *     
+     */
+    public void setAddress(AddressType value) {
+        this.address = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ResolveProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ResolveProvisionalIHIResponse.java
new file mode 100644
index 0000000..0de93c1
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/ResolveProvisionalIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3.ResolveProvisionalIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/ResolveProvisionalIHI/3.0}resolveProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "resolveProvisionalIHIResult"
+})
+@XmlRootElement(name = "resolveProvisionalIHIResponse")
+public class ResolveProvisionalIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/ResolveProvisionalIHI/3.0", required = true)
+    protected ResolveProvisionalIHIResult resolveProvisionalIHIResult;
+
+    /**
+     * Gets the value of the resolveProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ResolveProvisionalIHIResult }
+     *     
+     */
+    public ResolveProvisionalIHIResult getResolveProvisionalIHIResult() {
+        return resolveProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the resolveProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ResolveProvisionalIHIResult }
+     *     
+     */
+    public void setResolveProvisionalIHIResult(ResolveProvisionalIHIResult value) {
+        this.resolveProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/StandardErrorMsg.java
new file mode 100644
index 0000000..427433a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/package-info.java
new file mode 100644
index 0000000..dba6393
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerresolveprovisionalihi/_3_0/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerResolveProvisionalIHI/3.0.2", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumerresolveprovisionalihi._3_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIPortType.java
index 5553690..7f2ae26 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihi._3;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ConsumerSearchIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0")
@@ -35,7 +35,7 @@
     au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
 })
@@ -44,17 +44,17 @@ public interface ConsumerSearchIHIPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.consumersearchihi._3.SearchIHIResponse
      * @throws StandardErrorMsg
      */
-    @WebMethod
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
     @WebResult(name = "searchIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0", partName = "response")
     @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0/ConsumerSearchIHIPortType/searchIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0/ConsumerSearchIHIPortType/searchIHIResponse", fault = {
         @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0/ConsumerSearchIHIPortType/searchIHI/Fault/standardError")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIService.java
index 65c955c..142d7c4 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ConsumerSearchIHIService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ConsumerSearchIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0", wsdlLocation = "HI_ConsumerSearchIHI-3.0.wsdl")
@@ -71,7 +71,7 @@ public ConsumerSearchIHIPortType getConsumerSearchIHISOAP12Port() {
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ConsumerSearchIHIPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ObjectFactory.java
index 0091a34..e12189d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihi._3;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.consumersearchihi._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchIHI }
      * 
+     * @return
+     *     the new instance of {@link SearchIHI }
      */
     public SearchIHI createSearchIHI() {
         return new SearchIHI();
@@ -40,6 +42,8 @@ public SearchIHI createSearchIHI() {
     /**
      * Create an instance of {@link SearchIHIResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIResponse }
      */
     public SearchIHIResponse createSearchIHIResponse() {
         return new SearchIHIResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHI.java
index 10533a5..eec7822 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHI.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHI.java
@@ -1,28 +1,30 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihi._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AustralianPostalAddressType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AustralianStreetAddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AustralianUnstructuredStreetAddressType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.InternationalAddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -31,19 +33,21 @@
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}medicareCardNumber" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}medicareIRN" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}dvaFileNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}australianPostalAddress" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}australianStreetAddress" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}australianUnstructuredStreetAddress" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}internationalAddress" minOccurs="0"/&gt;
  *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}history" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -53,12 +57,14 @@
     "medicareCardNumber",
     "medicareIRN",
     "dvaFileNumber",
+    "electronicCommunication",
     "dateOfBirth",
     "sex",
     "familyName",
     "givenName",
     "australianPostalAddress",
     "australianStreetAddress",
+    "australianUnstructuredStreetAddress",
     "internationalAddress",
     "history"
 })
@@ -79,6 +85,8 @@ public class SearchIHI {
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlSchemaType(name = "token")
     protected String dvaFileNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected ElectronicCommunicationType electronicCommunication;
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
     @XmlSchemaType(name = "date")
     protected XMLGregorianCalendar dateOfBirth;
@@ -94,6 +102,8 @@ public class SearchIHI {
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
     protected AustralianStreetAddressType australianStreetAddress;
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected AustralianUnstructuredStreetAddressType australianUnstructuredStreetAddress;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
     protected InternationalAddressType internationalAddress;
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
     @XmlSchemaType(name = "string")
@@ -195,6 +205,30 @@ public void setDvaFileNumber(String value) {
         this.dvaFileNumber = value;
     }
 
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ElectronicCommunicationType }
+     *     
+     */
+    public ElectronicCommunicationType getElectronicCommunication() {
+        return electronicCommunication;
+    }
+
+    /**
+     * Sets the value of the electronicCommunication property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ElectronicCommunicationType }
+     *     
+     */
+    public void setElectronicCommunication(ElectronicCommunicationType value) {
+        this.electronicCommunication = value;
+    }
+
     /**
      * Gets the value of the dateOfBirth property.
      * 
@@ -339,6 +373,30 @@ public void setAustralianStreetAddress(AustralianStreetAddressType value) {
         this.australianStreetAddress = value;
     }
 
+    /**
+     * Gets the value of the australianUnstructuredStreetAddress property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AustralianUnstructuredStreetAddressType }
+     *     
+     */
+    public AustralianUnstructuredStreetAddressType getAustralianUnstructuredStreetAddress() {
+        return australianUnstructuredStreetAddress;
+    }
+
+    /**
+     * Sets the value of the australianUnstructuredStreetAddress property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AustralianUnstructuredStreetAddressType }
+     *     
+     */
+    public void setAustralianUnstructuredStreetAddress(AustralianUnstructuredStreetAddressType value) {
+        this.australianUnstructuredStreetAddress = value;
+    }
+
     /**
      * Gets the value of the internationalAddress property.
      * 
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHIResponse.java
index 74207dd..98819ee 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHIResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/SearchIHIResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihi._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.SearchIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/StandardErrorMsg.java
index e969c5a..be9ace0 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihi._3;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/package-info.java
index 6b0b66c..d23ef45 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihi/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.consumersearchihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ConsumerSearchIHIBatchAsyncPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ConsumerSearchIHIBatchAsyncPortType.java
new file mode 100644
index 0000000..56a629a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ConsumerSearchIHIBatchAsyncPortType.java
@@ -0,0 +1,178 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerSearchIHIBatchAsyncPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.address._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerSearchIHIBatchAsyncPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3.SubmitSearchIHIBatchResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "submitSearchIHIBatchResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/submitSearchIHIBatchRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/submitSearchIHIBatchResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/submitSearchIHIBatch/Fault/standardError")
+    })
+    public SubmitSearchIHIBatchResponse submitSearchIHIBatch(
+        @WebParam(name = "submitSearchIHIBatch", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "request")
+        SubmitSearchIHIBatch request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3.RetrieveSearchIHIBatchResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "retrieveSearchIHIBatchResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/retrieveSearchIHIBatchRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/retrieveSearchIHIBatchResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPort/retrieveSearchIHIBatch/Fault/standardError")
+    })
+    public RetrieveSearchIHIBatchResponse retrieveSearchIHIBatch(
+        @WebParam(name = "retrieveSearchIHIBatch", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "request")
+        RetrieveSearchIHIBatch request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3.GetSearchIHIBatchStatusResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "getSearchIHIBatchStatusResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/getSearchIHIBatchStatusRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/getSearchIHIBatchStatusResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/getSearchIHIBatchStatus/Fault/standardError")
+    })
+    public GetSearchIHIBatchStatusResponse getSearchIHIBatchStatus(
+        @WebParam(name = "getSearchIHIBatchStatus", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "request")
+        GetSearchIHIBatchStatus request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3.DeleteSearchIHIBatchResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "deleteSearchIHIBatchResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/deleteSearchIHIBatchRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/deleteSearchIHIBatchResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0/ConsumerSearchIHIBatchAsyncPortType/deleteSearchIHIBatch/Fault/standardError")
+    })
+    public DeleteSearchIHIBatchResponse deleteSearchIHIBatch(
+        @WebParam(name = "deleteSearchIHIBatch", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", partName = "request")
+        DeleteSearchIHIBatch request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ConsumerSearchIHIBatchAsyncService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ConsumerSearchIHIBatchAsyncService.java
new file mode 100644
index 0000000..27f3c2b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ConsumerSearchIHIBatchAsyncService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerSearchIHIBatchAsyncService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", wsdlLocation = "HI_ConsumerSearchIHIBatchAsync-3.0.wsdl")
+public class ConsumerSearchIHIBatchAsyncService
+    extends Service
+{
+
+    private static final URL CONSUMERSEARCHIHIBATCHASYNCSERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERSEARCHIHIBATCHASYNCSERVICE_EXCEPTION;
+    private static final QName CONSUMERSEARCHIHIBATCHASYNCSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", "ConsumerSearchIHIBatchAsyncService");
+
+    static {
+        CONSUMERSEARCHIHIBATCHASYNCSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3.ConsumerSearchIHIBatchAsyncService.class.getResource("HI_ConsumerSearchIHIBatchAsync-3.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERSEARCHIHIBATCHASYNCSERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerSearchIHIBatchAsync-3.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERSEARCHIHIBATCHASYNCSERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerSearchIHIBatchAsyncService() {
+        super(__getWsdlLocation(), CONSUMERSEARCHIHIBATCHASYNCSERVICE_QNAME);
+    }
+
+    public ConsumerSearchIHIBatchAsyncService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERSEARCHIHIBATCHASYNCSERVICE_QNAME, features);
+    }
+
+    public ConsumerSearchIHIBatchAsyncService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERSEARCHIHIBATCHASYNCSERVICE_QNAME);
+    }
+
+    public ConsumerSearchIHIBatchAsyncService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERSEARCHIHIBATCHASYNCSERVICE_QNAME, features);
+    }
+
+    public ConsumerSearchIHIBatchAsyncService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerSearchIHIBatchAsyncService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerSearchIHIBatchAsyncPortType
+     */
+    @WebEndpoint(name = "ConsumerSearchIHIBatchAsyncSOAP12ServicePort")
+    public ConsumerSearchIHIBatchAsyncPortType getConsumerSearchIHIBatchAsyncSOAP12ServicePort() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", "ConsumerSearchIHIBatchAsyncSOAP12ServicePort"), ConsumerSearchIHIBatchAsyncPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerSearchIHIBatchAsyncPortType
+     */
+    @WebEndpoint(name = "ConsumerSearchIHIBatchAsyncSOAP12ServicePort")
+    public ConsumerSearchIHIBatchAsyncPortType getConsumerSearchIHIBatchAsyncSOAP12ServicePort(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", "ConsumerSearchIHIBatchAsyncSOAP12ServicePort"), ConsumerSearchIHIBatchAsyncPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERSEARCHIHIBATCHASYNCSERVICE_EXCEPTION!= null) {
+            throw CONSUMERSEARCHIHIBATCHASYNCSERVICE_EXCEPTION;
+        }
+        return CONSUMERSEARCHIHIBATCHASYNCSERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/DeleteSearchIHIBatch.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/DeleteSearchIHIBatch.java
new file mode 100644
index 0000000..e70d22a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/DeleteSearchIHIBatch.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}batchIdentifier"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "batchIdentifier"
+})
+@XmlRootElement(name = "deleteSearchIHIBatch")
+public class DeleteSearchIHIBatch {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", required = true)
+    protected String batchIdentifier;
+
+    /**
+     * Gets the value of the batchIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBatchIdentifier() {
+        return batchIdentifier;
+    }
+
+    /**
+     * Sets the value of the batchIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBatchIdentifier(String value) {
+        this.batchIdentifier = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/DeleteSearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/DeleteSearchIHIBatchResponse.java
new file mode 100644
index 0000000..1862ce4
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/DeleteSearchIHIBatchResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.SearchIHIBatchStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="deleteSearchIHIBatchResult" type="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}SearchIHIBatchStatusType"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "deleteSearchIHIBatchResult"
+})
+@XmlRootElement(name = "deleteSearchIHIBatchResponse")
+public class DeleteSearchIHIBatchResponse {
+
+    @XmlElement(required = true)
+    protected SearchIHIBatchStatusType deleteSearchIHIBatchResult;
+
+    /**
+     * Gets the value of the deleteSearchIHIBatchResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SearchIHIBatchStatusType }
+     *     
+     */
+    public SearchIHIBatchStatusType getDeleteSearchIHIBatchResult() {
+        return deleteSearchIHIBatchResult;
+    }
+
+    /**
+     * Sets the value of the deleteSearchIHIBatchResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SearchIHIBatchStatusType }
+     *     
+     */
+    public void setDeleteSearchIHIBatchResult(SearchIHIBatchStatusType value) {
+        this.deleteSearchIHIBatchResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/GetSearchIHIBatchStatus.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/GetSearchIHIBatchStatus.java
new file mode 100644
index 0000000..cab58b1
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/GetSearchIHIBatchStatus.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}batchIdentifier"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "batchIdentifier"
+})
+@XmlRootElement(name = "getSearchIHIBatchStatus")
+public class GetSearchIHIBatchStatus {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", required = true)
+    protected String batchIdentifier;
+
+    /**
+     * Gets the value of the batchIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBatchIdentifier() {
+        return batchIdentifier;
+    }
+
+    /**
+     * Sets the value of the batchIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBatchIdentifier(String value) {
+        this.batchIdentifier = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/GetSearchIHIBatchStatusResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/GetSearchIHIBatchStatusResponse.java
new file mode 100644
index 0000000..f093e92
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/GetSearchIHIBatchStatusResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.SearchIHIBatchStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="getSearchIHIBatchStatusResult" type="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}SearchIHIBatchStatusType"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "getSearchIHIBatchStatusResult"
+})
+@XmlRootElement(name = "getSearchIHIBatchStatusResponse")
+public class GetSearchIHIBatchStatusResponse {
+
+    @XmlElement(required = true)
+    protected SearchIHIBatchStatusType getSearchIHIBatchStatusResult;
+
+    /**
+     * Gets the value of the getSearchIHIBatchStatusResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SearchIHIBatchStatusType }
+     *     
+     */
+    public SearchIHIBatchStatusType getGetSearchIHIBatchStatusResult() {
+        return getSearchIHIBatchStatusResult;
+    }
+
+    /**
+     * Sets the value of the getSearchIHIBatchStatusResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SearchIHIBatchStatusType }
+     *     
+     */
+    public void setGetSearchIHIBatchStatusResult(SearchIHIBatchStatusType value) {
+        this.getSearchIHIBatchStatusResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ObjectFactory.java
new file mode 100644
index 0000000..b05ef08
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/ObjectFactory.java
@@ -0,0 +1,112 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link SubmitSearchIHIBatch }
+     * 
+     * @return
+     *     the new instance of {@link SubmitSearchIHIBatch }
+     */
+    public SubmitSearchIHIBatch createSubmitSearchIHIBatch() {
+        return new SubmitSearchIHIBatch();
+    }
+
+    /**
+     * Create an instance of {@link SubmitSearchIHIBatchResponse }
+     * 
+     * @return
+     *     the new instance of {@link SubmitSearchIHIBatchResponse }
+     */
+    public SubmitSearchIHIBatchResponse createSubmitSearchIHIBatchResponse() {
+        return new SubmitSearchIHIBatchResponse();
+    }
+
+    /**
+     * Create an instance of {@link RetrieveSearchIHIBatch }
+     * 
+     * @return
+     *     the new instance of {@link RetrieveSearchIHIBatch }
+     */
+    public RetrieveSearchIHIBatch createRetrieveSearchIHIBatch() {
+        return new RetrieveSearchIHIBatch();
+    }
+
+    /**
+     * Create an instance of {@link RetrieveSearchIHIBatchResponse }
+     * 
+     * @return
+     *     the new instance of {@link RetrieveSearchIHIBatchResponse }
+     */
+    public RetrieveSearchIHIBatchResponse createRetrieveSearchIHIBatchResponse() {
+        return new RetrieveSearchIHIBatchResponse();
+    }
+
+    /**
+     * Create an instance of {@link GetSearchIHIBatchStatus }
+     * 
+     * @return
+     *     the new instance of {@link GetSearchIHIBatchStatus }
+     */
+    public GetSearchIHIBatchStatus createGetSearchIHIBatchStatus() {
+        return new GetSearchIHIBatchStatus();
+    }
+
+    /**
+     * Create an instance of {@link GetSearchIHIBatchStatusResponse }
+     * 
+     * @return
+     *     the new instance of {@link GetSearchIHIBatchStatusResponse }
+     */
+    public GetSearchIHIBatchStatusResponse createGetSearchIHIBatchStatusResponse() {
+        return new GetSearchIHIBatchStatusResponse();
+    }
+
+    /**
+     * Create an instance of {@link DeleteSearchIHIBatch }
+     * 
+     * @return
+     *     the new instance of {@link DeleteSearchIHIBatch }
+     */
+    public DeleteSearchIHIBatch createDeleteSearchIHIBatch() {
+        return new DeleteSearchIHIBatch();
+    }
+
+    /**
+     * Create an instance of {@link DeleteSearchIHIBatchResponse }
+     * 
+     * @return
+     *     the new instance of {@link DeleteSearchIHIBatchResponse }
+     */
+    public DeleteSearchIHIBatchResponse createDeleteSearchIHIBatchResponse() {
+        return new DeleteSearchIHIBatchResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/RetrieveSearchIHIBatch.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/RetrieveSearchIHIBatch.java
new file mode 100644
index 0000000..c8250b9
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/RetrieveSearchIHIBatch.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}batchIdentifier"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "batchIdentifier"
+})
+@XmlRootElement(name = "retrieveSearchIHIBatch")
+public class RetrieveSearchIHIBatch {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", required = true)
+    protected String batchIdentifier;
+
+    /**
+     * Gets the value of the batchIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBatchIdentifier() {
+        return batchIdentifier;
+    }
+
+    /**
+     * Sets the value of the batchIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBatchIdentifier(String value) {
+        this.batchIdentifier = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/RetrieveSearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/RetrieveSearchIHIBatchResponse.java
new file mode 100644
index 0000000..4adecee
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/RetrieveSearchIHIBatchResponse.java
@@ -0,0 +1,103 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.SearchIHIResultType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="searchIHIBatchResult" type="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}SearchIHIResultType" maxOccurs="2000"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}batchIdentifier"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "searchIHIBatchResult",
+    "batchIdentifier"
+})
+@XmlRootElement(name = "retrieveSearchIHIBatchResponse")
+public class RetrieveSearchIHIBatchResponse {
+
+    @XmlElement(required = true)
+    protected List<SearchIHIResultType> searchIHIBatchResult;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", required = true)
+    protected String batchIdentifier;
+
+    /**
+     * Gets the value of the searchIHIBatchResult property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the searchIHIBatchResult property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getSearchIHIBatchResult().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SearchIHIResultType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the searchIHIBatchResult property.
+     */
+    public List<SearchIHIResultType> getSearchIHIBatchResult() {
+        if (searchIHIBatchResult == null) {
+            searchIHIBatchResult = new ArrayList<>();
+        }
+        return this.searchIHIBatchResult;
+    }
+
+    /**
+     * Gets the value of the batchIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBatchIdentifier() {
+        return batchIdentifier;
+    }
+
+    /**
+     * Sets the value of the batchIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBatchIdentifier(String value) {
+        this.batchIdentifier = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/StandardErrorMsg.java
new file mode 100644
index 0000000..1efe61f
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/SubmitSearchIHIBatch.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/SubmitSearchIHIBatch.java
new file mode 100644
index 0000000..13cb4e1
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/SubmitSearchIHIBatch.java
@@ -0,0 +1,75 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.SearchIHIRequestType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="searchIHIBatchRequest" type="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}SearchIHIRequestType" maxOccurs="2000"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "searchIHIBatchRequest"
+})
+@XmlRootElement(name = "submitSearchIHIBatch")
+public class SubmitSearchIHIBatch {
+
+    @XmlElement(required = true)
+    protected List<SearchIHIRequestType> searchIHIBatchRequest;
+
+    /**
+     * Gets the value of the searchIHIBatchRequest property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the searchIHIBatchRequest property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getSearchIHIBatchRequest().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SearchIHIRequestType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the searchIHIBatchRequest property.
+     */
+    public List<SearchIHIRequestType> getSearchIHIBatchRequest() {
+        if (searchIHIBatchRequest == null) {
+            searchIHIBatchRequest = new ArrayList<>();
+        }
+        return this.searchIHIBatchRequest;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/SubmitSearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/SubmitSearchIHIBatchResponse.java
new file mode 100644
index 0000000..31ce6ef
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/SubmitSearchIHIBatchResponse.java
@@ -0,0 +1,93 @@
+
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0}batchIdentifier" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "serviceMessages",
+    "batchIdentifier"
+})
+@XmlRootElement(name = "submitSearchIHIBatchResponse")
+public class SubmitSearchIHIBatchResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    protected ServiceMessagesType serviceMessages;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0")
+    protected String batchIdentifier;
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+    /**
+     * Gets the value of the batchIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBatchIdentifier() {
+        return batchIdentifier;
+    }
+
+    /**
+     * Sets the value of the batchIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBatchIdentifier(String value) {
+        this.batchIdentifier = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/package-info.java
new file mode 100644
index 0000000..97688ee
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchasync/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchAsync/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumersearchihibatchasync._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncPortType.java
index b046244..b2a6a46 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihibatchsyncrequest._3;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ConsumerSearchIHIBatchSyncPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSyncRequest/3.0")
@@ -36,7 +36,7 @@
     au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
 })
@@ -45,17 +45,17 @@ public interface ConsumerSearchIHIBatchSyncPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.consumersearchihibatchsyncrequest._3.SearchIHIBatchResponse
      * @throws StandardErrorMsg
      */
-    @WebMethod
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
     @WebResult(name = "searchIHIBatchResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSyncRequest/3.0", partName = "response")
     @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSync/3.0/ConsumerSearchIHIBatchSyncPortType/searchIHIBatchSyncRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSync/3.0/ConsumerSearchIHIBatchSyncPortType/searchIHIBatchSyncResponse", fault = {
         @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSync/3.0/ConsumerSearchIHIBatchSyncPortType/searchIHIBatchSync/Fault/standardError")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncService.java
index 7894260..e0a65ff 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ConsumerSearchIHIBatchSyncService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ConsumerSearchIHIBatchSyncService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSyncRequest/3.0", wsdlLocation = "HI_ConsumerSearchIHIBatchSync-3.0.wsdl")
@@ -71,7 +71,7 @@ public ConsumerSearchIHIBatchSyncPortType getConsumerSearchIHIBatchSyncSOAP12Ser
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ConsumerSearchIHIBatchSyncPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ObjectFactory.java
index 243d2dd..fea5d3f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihibatchsyncrequest._3;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.consumersearchihibatchsyncrequest._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchIHIBatchSync }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIBatchSync }
      */
     public SearchIHIBatchSync createSearchIHIBatchSync() {
         return new SearchIHIBatchSync();
@@ -40,6 +42,8 @@ public SearchIHIBatchSync createSearchIHIBatchSync() {
     /**
      * Create an instance of {@link SearchIHIBatchResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIBatchResponse }
      */
     public SearchIHIBatchResponse createSearchIHIBatchResponse() {
         return new SearchIHIBatchResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchResponse.java
index 6503aee..e9c4de1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchResponse.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.SearchIHIResultType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -49,8 +49,8 @@ public class SearchIHIBatchResponse {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the searchIHIBatchResult property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the searchIHIBatchResult property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -71,7 +71,7 @@ public class SearchIHIBatchResponse {
      */
     public List<SearchIHIResultType> getSearchIHIBatchResult() {
         if (searchIHIBatchResult == null) {
-            searchIHIBatchResult = new ArrayList<SearchIHIResultType>();
+            searchIHIBatchResult = new ArrayList<>();
         }
         return this.searchIHIBatchResult;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchSync.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchSync.java
index 4ec5510..26d4683 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchSync.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/SearchIHIBatchSync.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3.SearchIHIRequestType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -45,8 +45,8 @@ public class SearchIHIBatchSync {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the searchIHIBatchRequest property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the searchIHIBatchRequest property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -67,7 +67,7 @@ public class SearchIHIBatchSync {
      */
     public List<SearchIHIRequestType> getSearchIHIBatchRequest() {
         if (searchIHIBatchRequest == null) {
-            searchIHIBatchRequest = new ArrayList<SearchIHIRequestType>();
+            searchIHIBatchRequest = new ArrayList<>();
         }
         return this.searchIHIBatchRequest;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/StandardErrorMsg.java
index 47aac44..a977a5f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.consumersearchihibatchsyncrequest._3;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/package-info.java
index 208fac4..cef620f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumersearchihibatchsyncrequest/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSyncRequest/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHIBatchSyncRequest/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.consumersearchihibatchsyncrequest._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ConsumerUpdateIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ConsumerUpdateIHIPortType.java
new file mode 100644
index 0000000..c482025
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ConsumerUpdateIHIPortType.java
@@ -0,0 +1,79 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerUpdateIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.address._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.ObjectFactory.class
+})
+public interface ConsumerUpdateIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2.UpdateIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "updateIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0/ConsumerUpdateIHIPortType/updateIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0/ConsumerUpdateIHIPortType/updateIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0/ConsumerUpdateIHIPortType/updateIHI/Fault/standardError")
+    })
+    public UpdateIHIResponse updateIHI(
+        @WebParam(name = "updateIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", partName = "request")
+        UpdateIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ConsumerUpdateIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ConsumerUpdateIHIService.java
new file mode 100644
index 0000000..ca86608
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ConsumerUpdateIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ConsumerUpdateIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", wsdlLocation = "HI_ConsumerUpdateIHI-3.2.0.wsdl")
+public class ConsumerUpdateIHIService
+    extends Service
+{
+
+    private static final URL CONSUMERUPDATEIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException CONSUMERUPDATEIHISERVICE_EXCEPTION;
+    private static final QName CONSUMERUPDATEIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", "ConsumerUpdateIHIService");
+
+    static {
+        CONSUMERUPDATEIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2.ConsumerUpdateIHIService.class.getResource("HI_ConsumerUpdateIHI-3.2.0.wsdl");
+        WebServiceException e = null;
+        if (CONSUMERUPDATEIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerUpdateIHI-3.2.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        CONSUMERUPDATEIHISERVICE_EXCEPTION = e;
+    }
+
+    public ConsumerUpdateIHIService() {
+        super(__getWsdlLocation(), CONSUMERUPDATEIHISERVICE_QNAME);
+    }
+
+    public ConsumerUpdateIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), CONSUMERUPDATEIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerUpdateIHIService(URL wsdlLocation) {
+        super(wsdlLocation, CONSUMERUPDATEIHISERVICE_QNAME);
+    }
+
+    public ConsumerUpdateIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, CONSUMERUPDATEIHISERVICE_QNAME, features);
+    }
+
+    public ConsumerUpdateIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ConsumerUpdateIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerUpdateIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerUpdateIHISOAP12Port")
+    public ConsumerUpdateIHIPortType getConsumerUpdateIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", "ConsumerUpdateIHISOAP12Port"), ConsumerUpdateIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerUpdateIHIPortType
+     */
+    @WebEndpoint(name = "ConsumerUpdateIHISOAP12Port")
+    public ConsumerUpdateIHIPortType getConsumerUpdateIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", "ConsumerUpdateIHISOAP12Port"), ConsumerUpdateIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (CONSUMERUPDATEIHISERVICE_EXCEPTION!= null) {
+            throw CONSUMERUPDATEIHISERVICE_EXCEPTION;
+        }
+        return CONSUMERUPDATEIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..ea1bd6d
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link UpdateIHI }
+     * 
+     * @return
+     *     the new instance of {@link UpdateIHI }
+     */
+    public UpdateIHI createUpdateIHI() {
+        return new UpdateIHI();
+    }
+
+    /**
+     * Create an instance of {@link UpdateIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link UpdateIHIResponse }
+     */
+    public UpdateIHIResponse createUpdateIHIResponse() {
+        return new UpdateIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/StandardErrorMsg.java
new file mode 100644
index 0000000..3b05a56
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/UpdateIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/UpdateIHI.java
new file mode 100644
index 0000000..7b569a6
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/UpdateIHI.java
@@ -0,0 +1,456 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.SourceOfDeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2.NameType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2.NameUpdateGroupType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}name" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}nameUpdateGroup" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address" maxOccurs="2" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification",
+    "electronicCommunication",
+    "name",
+    "nameUpdateGroup",
+    "address"
+})
+@XmlRootElement(name = "updateIHI")
+public class UpdateIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0")
+    protected List<NameType> name;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0")
+    protected List<NameUpdateGroupType> nameUpdateGroup;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected List<AddressType> address;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the name property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link NameType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the name property.
+     */
+    public List<NameType> getName() {
+        if (name == null) {
+            name = new ArrayList<>();
+        }
+        return this.name;
+    }
+
+    /**
+     * Gets the value of the nameUpdateGroup property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the nameUpdateGroup property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getNameUpdateGroup().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link NameUpdateGroupType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the nameUpdateGroup property.
+     */
+    public List<NameUpdateGroupType> getNameUpdateGroup() {
+        if (nameUpdateGroup == null) {
+            nameUpdateGroup = new ArrayList<>();
+        }
+        return this.nameUpdateGroup;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the address property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddress().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AddressType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the address property.
+     */
+    public List<AddressType> getAddress() {
+        if (address == null) {
+            address = new ArrayList<>();
+        }
+        return this.address;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/UpdateIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/UpdateIHIResponse.java
new file mode 100644
index 0000000..c867dad
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/UpdateIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2.UpdateIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateIHI/3.2.0}updateIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "updateIHIResult"
+})
+@XmlRootElement(name = "updateIHIResponse")
+public class UpdateIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateIHI/3.2.0", required = true)
+    protected UpdateIHIResult updateIHIResult;
+
+    /**
+     * Gets the value of the updateIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link UpdateIHIResult }
+     *     
+     */
+    public UpdateIHIResult getUpdateIHIResult() {
+        return updateIHIResult;
+    }
+
+    /**
+     * Sets the value of the updateIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link UpdateIHIResult }
+     *     
+     */
+    public void setUpdateIHIResult(UpdateIHIResult value) {
+        this.updateIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/package-info.java
new file mode 100644
index 0000000..957bc00
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateihi/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateIHI/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumerupdateihi._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/ConsumerUpdateProvisionalIHIPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/ConsumerUpdateProvisionalIHIPortType.java
new file mode 100644
index 0000000..2636b10
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/ConsumerUpdateProvisionalIHIPortType.java
@@ -0,0 +1,74 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ConsumerUpdateProvisionalIHIPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.ObjectFactory.class
+})
+public interface ConsumerUpdateProvisionalIHIPortType {
+
+
+    /**
+     * 
+     * @param hpioHeader
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3.UpdateProvisionalIHIResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod(action = "http://ns.electronichealth.net.au/")
+    @WebResult(name = "updateProvisionalIHIResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0/ConsumerUpdateProvisionalIHIPortType/updateProvisionalIHIRequest", output = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0/ConsumerUpdateProvisionalIHIPortType/updateProvisionalIHIResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0/ConsumerUpdateProvisionalIHIPortType/updateProvisionalIHI/Fault/standardError")
+    })
+    public UpdateProvisionalIHIResponse updateProvisionalIHI(
+        @WebParam(name = "updateProvisionalIHI", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", partName = "request")
+        UpdateProvisionalIHI request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader,
+        @WebParam(name = "hpio", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "hpioHeader")
+        QualifiedId hpioHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..38922a7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link UpdateProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link UpdateProvisionalIHI }
+     */
+    public UpdateProvisionalIHI createUpdateProvisionalIHI() {
+        return new UpdateProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link UpdateProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link UpdateProvisionalIHIResponse }
+     */
+    public UpdateProvisionalIHIResponse createUpdateProvisionalIHIResponse() {
+        return new UpdateProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/StandardErrorMsg.java
new file mode 100644
index 0000000..9162952
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHI.java
new file mode 100644
index 0000000..45443b0
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHI.java
@@ -0,0 +1,300 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "familyName",
+    "givenName",
+    "sex",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification"
+})
+@XmlRootElement(name = "updateProvisionalIHI")
+public class UpdateProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGivenName() {
+        return givenName;
+    }
+
+    /**
+     * Sets the value of the givenName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGivenName(String value) {
+        this.givenName = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHIResponse.java
new file mode 100644
index 0000000..b031f4c
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHIResponse.java
@@ -0,0 +1,65 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3.UpdateProvisionalIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateProvisionalIHI/3.0}updateProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "updateProvisionalIHIResult"
+})
+@XmlRootElement(name = "updateProvisionalIHIResponse")
+public class UpdateProvisionalIHIResponse {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateProvisionalIHI/3.0", required = true)
+    protected UpdateProvisionalIHIResult updateProvisionalIHIResult;
+
+    /**
+     * Gets the value of the updateProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link UpdateProvisionalIHIResult }
+     *     
+     */
+    public UpdateProvisionalIHIResult getUpdateProvisionalIHIResult() {
+        return updateProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the updateProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link UpdateProvisionalIHIResult }
+     *     
+     */
+    public void setUpdateProvisionalIHIResult(UpdateProvisionalIHIResult value) {
+        this.updateProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHIService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHIService.java
new file mode 100644
index 0000000..2135892
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/UpdateProvisionalIHIService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "UpdateProvisionalIHIService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", wsdlLocation = "HI_ConsumerUpdateProvisionalIHI-3.0.wsdl")
+public class UpdateProvisionalIHIService
+    extends Service
+{
+
+    private static final URL UPDATEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    private static final WebServiceException UPDATEPROVISIONALIHISERVICE_EXCEPTION;
+    private static final QName UPDATEPROVISIONALIHISERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", "UpdateProvisionalIHIService");
+
+    static {
+        UPDATEPROVISIONALIHISERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3.UpdateProvisionalIHIService.class.getResource("HI_ConsumerUpdateProvisionalIHI-3.0.wsdl");
+        WebServiceException e = null;
+        if (UPDATEPROVISIONALIHISERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ConsumerUpdateProvisionalIHI-3.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        UPDATEPROVISIONALIHISERVICE_EXCEPTION = e;
+    }
+
+    public UpdateProvisionalIHIService() {
+        super(__getWsdlLocation(), UPDATEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public UpdateProvisionalIHIService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), UPDATEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public UpdateProvisionalIHIService(URL wsdlLocation) {
+        super(wsdlLocation, UPDATEPROVISIONALIHISERVICE_QNAME);
+    }
+
+    public UpdateProvisionalIHIService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, UPDATEPROVISIONALIHISERVICE_QNAME, features);
+    }
+
+    public UpdateProvisionalIHIService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public UpdateProvisionalIHIService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ConsumerUpdateProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "UpdateProvisionalIHISOAP12Port")
+    public ConsumerUpdateProvisionalIHIPortType getUpdateProvisionalIHISOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", "UpdateProvisionalIHISOAP12Port"), ConsumerUpdateProvisionalIHIPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ConsumerUpdateProvisionalIHIPortType
+     */
+    @WebEndpoint(name = "UpdateProvisionalIHISOAP12Port")
+    public ConsumerUpdateProvisionalIHIPortType getUpdateProvisionalIHISOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", "UpdateProvisionalIHISOAP12Port"), ConsumerUpdateProvisionalIHIPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (UPDATEPROVISIONALIHISERVICE_EXCEPTION!= null) {
+            throw UPDATEPROVISIONALIHISERVICE_EXCEPTION;
+        }
+        return UPDATEPROVISIONALIHISERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..ef0da3d
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/consumerupdateprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ConsumerUpdateProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.consumerupdateprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ObjectFactory.java
index f74f3dc..31df26b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SubmitSearchForProviderIndividual }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderIndividual }
      */
     public SubmitSearchForProviderIndividual createSubmitSearchForProviderIndividual() {
         return new SubmitSearchForProviderIndividual();
@@ -40,6 +42,8 @@ public SubmitSearchForProviderIndividual createSubmitSearchForProviderIndividual
     /**
      * Create an instance of {@link SubmitSearchForProviderIndividualResponse }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderIndividualResponse }
      */
     public SubmitSearchForProviderIndividualResponse createSubmitSearchForProviderIndividualResponse() {
         return new SubmitSearchForProviderIndividualResponse();
@@ -48,6 +52,8 @@ public SubmitSearchForProviderIndividualResponse createSubmitSearchForProviderIn
     /**
      * Create an instance of {@link RetrieveSearchForProviderIndividual }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderIndividual }
      */
     public RetrieveSearchForProviderIndividual createRetrieveSearchForProviderIndividual() {
         return new RetrieveSearchForProviderIndividual();
@@ -56,6 +62,8 @@ public RetrieveSearchForProviderIndividual createRetrieveSearchForProviderIndivi
     /**
      * Create an instance of {@link RetrieveSearchForProviderIndividualResponse }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderIndividualResponse }
      */
     public RetrieveSearchForProviderIndividualResponse createRetrieveSearchForProviderIndividualResponse() {
         return new RetrieveSearchForProviderIndividualResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ProviderSearchForIndividualBatchAsyncService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ProviderSearchForIndividualBatchAsyncService.java
index 1d60ce2..97315e2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ProviderSearchForIndividualBatchAsyncService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/ProviderSearchForIndividualBatchAsyncService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderSearchForIndividualBatchAsyncService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderIndividual/5.1.0", wsdlLocation = "HI_ProviderBatchAsyncSearchForProviderIndividual-5.1.0.wsdl")
@@ -71,7 +71,7 @@ public SearchForProviderIndividualBatchAsyncPortType getProviderSearchForIndivid
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns SearchForProviderIndividualBatchAsyncPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java
index c5ee603..5c50905 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividualResponse.java
index 7403f4c..c9d1669 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividualResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/RetrieveSearchForProviderIndividualResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderindividual._5_1.RetrieveSearchForProviderIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SearchForProviderIndividualBatchAsyncPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SearchForProviderIndividualBatchAsyncPortType.java
index a0881a8..38b5253 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SearchForProviderIndividualBatchAsyncPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SearchForProviderIndividualBatchAsyncPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "SearchForProviderIndividualBatchAsyncPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderIndividual/5.1.0")
@@ -43,7 +43,7 @@
     au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderindividual._5_1.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderindividual._5_1.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface SearchForProviderIndividualBatchAsyncPortType {
@@ -51,11 +51,11 @@ public interface SearchForProviderIndividualBatchAsyncPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1.SubmitSearchForProviderIndividualResponse
@@ -84,11 +84,11 @@ public SubmitSearchForProviderIndividualResponse submitSearchForProviderIndividu
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1.RetrieveSearchForProviderIndividualResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/StandardErrorMsg.java
index 69399f0..88b5a01 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividual.java
index 0eabba7..5fe5a13 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividual.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.BatchSearchForProviderIndividualCriteriaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -45,8 +45,8 @@ public class SubmitSearchForProviderIndividual {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the batchSearchForProviderIndividualCriteria property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the batchSearchForProviderIndividualCriteria property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -67,7 +67,7 @@ public class SubmitSearchForProviderIndividual {
      */
     public List<BatchSearchForProviderIndividualCriteriaType> getBatchSearchForProviderIndividualCriteria() {
         if (batchSearchForProviderIndividualCriteria == null) {
-            batchSearchForProviderIndividualCriteria = new ArrayList<BatchSearchForProviderIndividualCriteriaType>();
+            batchSearchForProviderIndividualCriteria = new ArrayList<>();
         }
         return this.batchSearchForProviderIndividualCriteria;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividualResponse.java
index ea37f39..c87f25c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividualResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/SubmitSearchForProviderIndividualResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderindividual._5_1.SubmitSearchForProviderIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/package-info.java
index 7f31ff3..7dbd002 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderindividual/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderIndividual/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderIndividual/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderindividual._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ObjectFactory.java
index 6212fc7..011ea73 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SubmitSearchForProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderOrganisation }
      */
     public SubmitSearchForProviderOrganisation createSubmitSearchForProviderOrganisation() {
         return new SubmitSearchForProviderOrganisation();
@@ -40,6 +42,8 @@ public SubmitSearchForProviderOrganisation createSubmitSearchForProviderOrganisa
     /**
      * Create an instance of {@link SubmitSearchForProviderOrganisationResponse }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderOrganisationResponse }
      */
     public SubmitSearchForProviderOrganisationResponse createSubmitSearchForProviderOrganisationResponse() {
         return new SubmitSearchForProviderOrganisationResponse();
@@ -48,6 +52,8 @@ public SubmitSearchForProviderOrganisationResponse createSubmitSearchForProvider
     /**
      * Create an instance of {@link RetrieveSearchForProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderOrganisation }
      */
     public RetrieveSearchForProviderOrganisation createRetrieveSearchForProviderOrganisation() {
         return new RetrieveSearchForProviderOrganisation();
@@ -56,6 +62,8 @@ public RetrieveSearchForProviderOrganisation createRetrieveSearchForProviderOrga
     /**
      * Create an instance of {@link RetrieveSearchForProviderOrganisationResponse }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderOrganisationResponse }
      */
     public RetrieveSearchForProviderOrganisationResponse createRetrieveSearchForProviderOrganisationResponse() {
         return new RetrieveSearchForProviderOrganisationResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ProviderSearchForOrganisationBatchAsyncService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ProviderSearchForOrganisationBatchAsyncService.java
index b550fe5..05110a1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ProviderSearchForOrganisationBatchAsyncService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/ProviderSearchForOrganisationBatchAsyncService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderSearchForOrganisationBatchAsyncService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderOrganisation/5.1.0", wsdlLocation = "HI_ProviderBatchAsyncSearchForProviderOrganisation-5.1.0.wsdl")
@@ -71,7 +71,7 @@ public SearchForProviderOrganisationBatchAsyncPortType getProviderSearchForIOrga
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns SearchForProviderOrganisationBatchAsyncPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java
index ac5c019..b1065d0 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResponse.java
index e6798bf..e4d09e9 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderorganisation._5_1.RetrieveSearchForProviderOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SearchForProviderOrganisationBatchAsyncPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SearchForProviderOrganisationBatchAsyncPortType.java
index 7881fa7..24c3d85 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SearchForProviderOrganisationBatchAsyncPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SearchForProviderOrganisationBatchAsyncPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "SearchForProviderOrganisationBatchAsyncPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderOrganisation/5.1.0")
@@ -35,7 +35,7 @@
     au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderorganisation._5_1.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderorganisation._5_1.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface SearchForProviderOrganisationBatchAsyncPortType {
@@ -43,11 +43,11 @@ public interface SearchForProviderOrganisationBatchAsyncPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1.SubmitSearchForProviderOrganisationResponse
@@ -76,11 +76,11 @@ public SubmitSearchForProviderOrganisationResponse submitSearchForProviderOrgani
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1.RetrieveSearchForProviderOrganisationResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/StandardErrorMsg.java
index b4d7c66..153a8aa 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java
index d08e577..da8d154 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1.BatchSearchForProviderOrganisationCriteriaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -45,8 +45,8 @@ public class SubmitSearchForProviderOrganisation {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the batchSearchForProviderOrganisationCriteria property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the batchSearchForProviderOrganisationCriteria property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -67,7 +67,7 @@ public class SubmitSearchForProviderOrganisation {
      */
     public List<BatchSearchForProviderOrganisationCriteriaType> getBatchSearchForProviderOrganisationCriteria() {
         if (batchSearchForProviderOrganisationCriteria == null) {
-            batchSearchForProviderOrganisationCriteria = new ArrayList<BatchSearchForProviderOrganisationCriteriaType>();
+            batchSearchForProviderOrganisationCriteria = new ArrayList<>();
         }
         return this.batchSearchForProviderOrganisationCriteria;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResponse.java
index 6eb0799..1bd0204 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderorganisation._5_1.SubmitSearchForProviderOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/package-info.java
index 3bdbe41..7b0a056 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerbatchasyncsearchforproviderorganisation/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderOrganisation/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderBatchAsyncSearchForProviderOrganisation/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providerbatchasyncsearchforproviderorganisation._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java
index 1cdc2fe..9704f53 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java
@@ -3,26 +3,26 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AddressRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateType;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunicationRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.IndividualNameRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.DeathNotificationType;
 import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.PersonalDetails;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -38,7 +38,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -124,8 +124,8 @@ public void setPersonalDetails(PersonalDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualNameRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -146,7 +146,7 @@ public void setPersonalDetails(PersonalDetails value) {
      */
     public List<IndividualNameRecord> getIndividualNameRecord() {
         if (individualNameRecord == null) {
-            individualNameRecord = new ArrayList<IndividualNameRecord>();
+            individualNameRecord = new ArrayList<>();
         }
         return this.individualNameRecord;
     }
@@ -156,8 +156,8 @@ public List<IndividualNameRecord> getIndividualNameRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -178,7 +178,7 @@ public List<IndividualNameRecord> getIndividualNameRecord() {
      */
     public List<AddressRecord> getAddressRecord() {
         if (addressRecord == null) {
-            addressRecord = new ArrayList<AddressRecord>();
+            addressRecord = new ArrayList<>();
         }
         return this.addressRecord;
     }
@@ -188,8 +188,8 @@ public List<AddressRecord> getAddressRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -210,7 +210,7 @@ public List<AddressRecord> getAddressRecord() {
      */
     public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
         if (electronicCommunicationRecord == null) {
-            electronicCommunicationRecord = new ArrayList<ElectronicCommunicationRecord>();
+            electronicCommunicationRecord = new ArrayList<>();
         }
         return this.electronicCommunicationRecord;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResponse.java
index c89bfaa..3936575 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.manageprovideradministrativeindividual._3_2.ManageProviderAdministrativeIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ObjectFactory.java
index 8260604..86a4824 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ManageProviderAdministrativeIndividual }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderAdministrativeIndividual }
      */
     public ManageProviderAdministrativeIndividual createManageProviderAdministrativeIndividual() {
         return new ManageProviderAdministrativeIndividual();
@@ -40,6 +42,8 @@ public ManageProviderAdministrativeIndividual createManageProviderAdministrative
     /**
      * Create an instance of {@link ManageProviderAdministrativeIndividualResponse }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderAdministrativeIndividualResponse }
      */
     public ManageProviderAdministrativeIndividualResponse createManageProviderAdministrativeIndividualResponse() {
         return new ManageProviderAdministrativeIndividualResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualPortType.java
index 120a256..b632a23 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderManageProviderAdministrativeIndividualPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderAdministrativeIndividual/3.2.0")
@@ -38,7 +38,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.manageprovideradministrativeindividual._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderManageProviderAdministrativeIndividualPortType {
@@ -46,10 +46,10 @@ public interface ProviderManageProviderAdministrativeIndividualPortType {
 
     /**
      * 
-     * @param request
      * @param productHeader
-     * @param timestampHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2.ManageProviderAdministrativeIndividualResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualService.java
index ef90f24..af293cc 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/ProviderManageProviderAdministrativeIndividualService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderManageProviderAdministrativeIndividualService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderAdministrativeIndividual/3.2.0", wsdlLocation = "HI_ProviderManageProviderAdministrativeIndividual-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderManageProviderAdministrativeIndividualPortType getProviderManageP
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderManageProviderAdministrativeIndividualPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/StandardErrorMsg.java
index 01049c3..0227b32 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/package-info.java
index 9469912..a24624a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageprovideradministrativeindividual/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderAdministrativeIndividual/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderAdministrativeIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providermanageprovideradministrativeindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java
index 1442ef7..d6bdccf 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java
@@ -3,22 +3,22 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryIndividualEntryRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryOrganisationEntryRecord;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -32,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -88,8 +88,8 @@ public void setQualifiedIdentifier(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -110,7 +110,7 @@ public void setQualifiedIdentifier(String value) {
      */
     public List<ProviderDirectoryOrganisationEntryRecord> getOrganisationEntry() {
         if (organisationEntry == null) {
-            organisationEntry = new ArrayList<ProviderDirectoryOrganisationEntryRecord>();
+            organisationEntry = new ArrayList<>();
         }
         return this.organisationEntry;
     }
@@ -120,8 +120,8 @@ public List<ProviderDirectoryOrganisationEntryRecord> getOrganisationEntry() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -142,7 +142,7 @@ public List<ProviderDirectoryOrganisationEntryRecord> getOrganisationEntry() {
      */
     public List<ProviderDirectoryIndividualEntryRecord> getIndividualEntry() {
         if (individualEntry == null) {
-            individualEntry = new ArrayList<ProviderDirectoryIndividualEntryRecord>();
+            individualEntry = new ArrayList<>();
         }
         return this.individualEntry;
     }
@@ -152,8 +152,8 @@ public List<ProviderDirectoryIndividualEntryRecord> getIndividualEntry() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationDeleteEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationDeleteEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -174,7 +174,7 @@ public List<ProviderDirectoryIndividualEntryRecord> getIndividualEntry() {
      */
     public List<Integer> getOrganisationDeleteEntry() {
         if (organisationDeleteEntry == null) {
-            organisationDeleteEntry = new ArrayList<Integer>();
+            organisationDeleteEntry = new ArrayList<>();
         }
         return this.organisationDeleteEntry;
     }
@@ -184,8 +184,8 @@ public List<Integer> getOrganisationDeleteEntry() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualDeleteEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualDeleteEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -206,7 +206,7 @@ public List<Integer> getOrganisationDeleteEntry() {
      */
     public List<Integer> getIndividualDeleteEntry() {
         if (individualDeleteEntry == null) {
-            individualDeleteEntry = new ArrayList<Integer>();
+            individualDeleteEntry = new ArrayList<>();
         }
         return this.individualDeleteEntry;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResponse.java
index f7e8b6f..cd4d0d6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderdirectoryentry._3_2.ManageProviderDirectoryEntryResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ObjectFactory.java
index cb37032..60d66ca 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ManageProviderDirectoryEntry }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderDirectoryEntry }
      */
     public ManageProviderDirectoryEntry createManageProviderDirectoryEntry() {
         return new ManageProviderDirectoryEntry();
@@ -40,6 +42,8 @@ public ManageProviderDirectoryEntry createManageProviderDirectoryEntry() {
     /**
      * Create an instance of {@link ManageProviderDirectoryEntryResponse }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderDirectoryEntryResponse }
      */
     public ManageProviderDirectoryEntryResponse createManageProviderDirectoryEntryResponse() {
         return new ManageProviderDirectoryEntryResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryPortType.java
index 4ab1ddd..9e58fba 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderManageProviderDirectoryEntryPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderDirectoryEntry/3.2.0")
@@ -31,7 +31,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderdirectoryentry._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderManageProviderDirectoryEntryPortType {
@@ -39,10 +39,10 @@ public interface ProviderManageProviderDirectoryEntryPortType {
 
     /**
      * 
-     * @param request
      * @param productHeader
-     * @param timestampHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2.ManageProviderDirectoryEntryResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryService.java
index 99ddce8..3555667 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/ProviderManageProviderDirectoryEntryService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderManageProviderDirectoryEntryService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderDirectoryEntry/3.2.0", wsdlLocation = "HI_ProviderManageProviderDirectoryEntry-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderManageProviderDirectoryEntryPortType getProviderManageProviderDir
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderManageProviderDirectoryEntryPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/StandardErrorMsg.java
index 07af6e9..6ecfac6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/package-info.java
index 09141e4..428f6f4 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderdirectoryentry/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderDirectoryEntry/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderDirectoryEntry/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providermanageproviderdirectoryentry._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisation.java
index abadac3..5e4dfd8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisation.java
@@ -3,12 +3,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AddressRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateType;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunicationRecord;
@@ -18,14 +12,20 @@
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2.OrganisationNameRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.OrganisationServiceRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.status._3_2.Status;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -44,7 +44,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -163,8 +163,8 @@ public void setOrganisationDetails(OrganisationDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationNameRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationNameRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -185,7 +185,7 @@ public void setOrganisationDetails(OrganisationDetails value) {
      */
     public List<OrganisationNameRecord> getOrganisationNameRecord() {
         if (organisationNameRecord == null) {
-            organisationNameRecord = new ArrayList<OrganisationNameRecord>();
+            organisationNameRecord = new ArrayList<>();
         }
         return this.organisationNameRecord;
     }
@@ -195,8 +195,8 @@ public List<OrganisationNameRecord> getOrganisationNameRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationServiceRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationServiceRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -217,7 +217,7 @@ public List<OrganisationNameRecord> getOrganisationNameRecord() {
      */
     public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
         if (organisationServiceRecord == null) {
-            organisationServiceRecord = new ArrayList<OrganisationServiceRecord>();
+            organisationServiceRecord = new ArrayList<>();
         }
         return this.organisationServiceRecord;
     }
@@ -227,8 +227,8 @@ public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -249,7 +249,7 @@ public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
      */
     public List<AddressRecord> getAddressRecord() {
         if (addressRecord == null) {
-            addressRecord = new ArrayList<AddressRecord>();
+            addressRecord = new ArrayList<>();
         }
         return this.addressRecord;
     }
@@ -259,8 +259,8 @@ public List<AddressRecord> getAddressRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -281,7 +281,7 @@ public List<AddressRecord> getAddressRecord() {
      */
     public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
         if (electronicCommunicationRecord == null) {
-            electronicCommunicationRecord = new ArrayList<ElectronicCommunicationRecord>();
+            electronicCommunicationRecord = new ArrayList<>();
         }
         return this.electronicCommunicationRecord;
     }
@@ -291,8 +291,8 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the endpointLocatorServiceRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the endpointLocatorServiceRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -313,7 +313,7 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      */
     public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
         if (endpointLocatorServiceRecord == null) {
-            endpointLocatorServiceRecord = new ArrayList<EndpointLocatorServiceRecord>();
+            endpointLocatorServiceRecord = new ArrayList<>();
         }
         return this.endpointLocatorServiceRecord;
     }
@@ -323,8 +323,8 @@ public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkDetails property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkDetails property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -345,7 +345,7 @@ public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
      */
     public List<LinkDetailsType> getLinkDetails() {
         if (linkDetails == null) {
-            linkDetails = new ArrayList<LinkDetailsType>();
+            linkDetails = new ArrayList<>();
         }
         return this.linkDetails;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisationResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisationResponse.java
index 523e2f9..ee72adf 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisationResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ManageProviderOrganisationResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderorganisation._3_2.ManageProviderOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ObjectFactory.java
index 0d7b7f6..7f6c5f7 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ManageProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderOrganisation }
      */
     public ManageProviderOrganisation createManageProviderOrganisation() {
         return new ManageProviderOrganisation();
@@ -40,6 +42,8 @@ public ManageProviderOrganisation createManageProviderOrganisation() {
     /**
      * Create an instance of {@link ManageProviderOrganisationResponse }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderOrganisationResponse }
      */
     public ManageProviderOrganisationResponse createManageProviderOrganisationResponse() {
         return new ManageProviderOrganisationResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationPortType.java
index 2adaeef..8df13f6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderManageProviderOrganisationPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderOrganisation/3.2.0")
@@ -41,7 +41,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.status._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderorganisation._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderManageProviderOrganisationPortType {
@@ -49,10 +49,10 @@ public interface ProviderManageProviderOrganisationPortType {
 
     /**
      * 
-     * @param request
      * @param productHeader
-     * @param timestampHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2.ManageProviderOrganisationResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationService.java
index 0f6fc32..39f5fdc 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/ProviderManageProviderOrganisationService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderManageProviderOrganisationService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderOrganisation/3.2.0", wsdlLocation = "HI_ProviderManageProviderOrganisation-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderManageProviderOrganisationPortType getProviderManageProviderOrgan
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderManageProviderOrganisationPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/StandardErrorMsg.java
index 362d3e8..ce5dd51 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/package-info.java
index 9c23ee5..eef678b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanageproviderorganisation/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderOrganisation/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageProviderOrganisation/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providermanageproviderorganisation._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ManageTdsProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ManageTdsProviderIndividual.java
new file mode 100644
index 0000000..654a3e0
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ManageTdsProviderIndividual.java
@@ -0,0 +1,75 @@
+
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2.ProviderIndividual;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0}providerIndividuals" maxOccurs="100"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "providerIndividuals"
+})
+@XmlRootElement(name = "manageTdsProviderIndividual")
+public class ManageTdsProviderIndividual {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0", required = true)
+    protected List<ProviderIndividual> providerIndividuals;
+
+    /**
+     * Gets the value of the providerIndividuals property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerIndividuals property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getProviderIndividuals().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ProviderIndividual }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the providerIndividuals property.
+     */
+    public List<ProviderIndividual> getProviderIndividuals() {
+        if (providerIndividuals == null) {
+            providerIndividuals = new ArrayList<>();
+        }
+        return this.providerIndividuals;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ManageTdsProviderIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ManageTdsProviderIndividualResponse.java
new file mode 100644
index 0000000..bae84d5
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ManageTdsProviderIndividualResponse.java
@@ -0,0 +1,70 @@
+
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2.ManageTdsProviderIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0}manageTdsProviderIndividualResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "manageTdsProviderIndividualResult"
+})
+@XmlRootElement(name = "manageTdsProviderIndividualResponse")
+public class ManageTdsProviderIndividualResponse {
+
+    /**
+     * Manage Provider Individual Response element
+     * 
+     */
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0", required = true)
+    protected ManageTdsProviderIndividualResult manageTdsProviderIndividualResult;
+
+    /**
+     * Manage Provider Individual Response element
+     * 
+     * @return
+     *     possible object is
+     *     {@link ManageTdsProviderIndividualResult }
+     *     
+     */
+    public ManageTdsProviderIndividualResult getManageTdsProviderIndividualResult() {
+        return manageTdsProviderIndividualResult;
+    }
+
+    /**
+     * Sets the value of the manageTdsProviderIndividualResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ManageTdsProviderIndividualResult }
+     *     
+     * @see #getManageTdsProviderIndividualResult()
+     */
+    public void setManageTdsProviderIndividualResult(ManageTdsProviderIndividualResult value) {
+        this.manageTdsProviderIndividualResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ObjectFactory.java
new file mode 100644
index 0000000..fa79faf
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ManageTdsProviderIndividual }
+     * 
+     * @return
+     *     the new instance of {@link ManageTdsProviderIndividual }
+     */
+    public ManageTdsProviderIndividual createManageTdsProviderIndividual() {
+        return new ManageTdsProviderIndividual();
+    }
+
+    /**
+     * Create an instance of {@link ManageTdsProviderIndividualResponse }
+     * 
+     * @return
+     *     the new instance of {@link ManageTdsProviderIndividualResponse }
+     */
+    public ManageTdsProviderIndividualResponse createManageTdsProviderIndividualResponse() {
+        return new ManageTdsProviderIndividualResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ProviderManageTdsProviderIndividualPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ProviderManageTdsProviderIndividualPortType.java
new file mode 100644
index 0000000..5730b9e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ProviderManageTdsProviderIndividualPortType.java
@@ -0,0 +1,84 @@
+
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ProviderManageTdsProviderIndividualPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.address._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.status._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
+})
+public interface ProviderManageTdsProviderIndividualPortType {
+
+
+    /**
+     * 
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1.ManageTdsProviderIndividualResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "manageTdsProviderIndividualResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0/ProviderManageTdsProviderIndividualPortType/manageTdsProviderIndividualRequest", output = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0/ProviderManageTdsProviderIndividualPortType/manageTdsProviderIndividualResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0/ProviderManageTdsProviderIndividualPortType/manageTdsProviderIndividual/Fault/standardError")
+    })
+    public ManageTdsProviderIndividualResponse manageTdsProviderIndividual(
+        @WebParam(name = "manageTdsProviderIndividual", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", partName = "request")
+        ManageTdsProviderIndividual request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ProviderManageTdsProviderIndividualService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ProviderManageTdsProviderIndividualService.java
new file mode 100644
index 0000000..57569b7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/ProviderManageTdsProviderIndividualService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ProviderManageTdsProviderIndividualService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", wsdlLocation = "HI_ProviderManageTdsProviderIndividual-5.1.0.wsdl")
+public class ProviderManageTdsProviderIndividualService
+    extends Service
+{
+
+    private static final URL PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION;
+    private static final WebServiceException PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_EXCEPTION;
+    private static final QName PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", "ProviderManageTdsProviderIndividualService");
+
+    static {
+        PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1.ProviderManageTdsProviderIndividualService.class.getResource("HI_ProviderManageTdsProviderIndividual-5.1.0.wsdl");
+        WebServiceException e = null;
+        if (PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ProviderManageTdsProviderIndividual-5.1.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_EXCEPTION = e;
+    }
+
+    public ProviderManageTdsProviderIndividualService() {
+        super(__getWsdlLocation(), PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_QNAME);
+    }
+
+    public ProviderManageTdsProviderIndividualService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_QNAME, features);
+    }
+
+    public ProviderManageTdsProviderIndividualService(URL wsdlLocation) {
+        super(wsdlLocation, PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_QNAME);
+    }
+
+    public ProviderManageTdsProviderIndividualService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_QNAME, features);
+    }
+
+    public ProviderManageTdsProviderIndividualService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ProviderManageTdsProviderIndividualService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ProviderManageTdsProviderIndividualPortType
+     */
+    @WebEndpoint(name = "ProviderManageTdsProviderIndividualSOAP12Port")
+    public ProviderManageTdsProviderIndividualPortType getProviderManageTdsProviderIndividualSOAP12Port() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", "ProviderManageTdsProviderIndividualSOAP12Port"), ProviderManageTdsProviderIndividualPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ProviderManageTdsProviderIndividualPortType
+     */
+    @WebEndpoint(name = "ProviderManageTdsProviderIndividualSOAP12Port")
+    public ProviderManageTdsProviderIndividualPortType getProviderManageTdsProviderIndividualSOAP12Port(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", "ProviderManageTdsProviderIndividualSOAP12Port"), ProviderManageTdsProviderIndividualPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_EXCEPTION!= null) {
+            throw PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_EXCEPTION;
+        }
+        return PROVIDERMANAGETDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/StandardErrorMsg.java
new file mode 100644
index 0000000..bb783b2
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/package-info.java
new file mode 100644
index 0000000..d0555b5
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providermanagetdsproviderindividual/_5_1/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderManageTdsProviderIndividual/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.providermanagetdsproviderindividual._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ObjectFactory.java
index a2ecef6..c8d7f62 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ReadProviderAdministrativeIndividual }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderAdministrativeIndividual }
      */
     public ReadProviderAdministrativeIndividual createReadProviderAdministrativeIndividual() {
         return new ReadProviderAdministrativeIndividual();
@@ -40,6 +42,8 @@ public ReadProviderAdministrativeIndividual createReadProviderAdministrativeIndi
     /**
      * Create an instance of {@link ReadProviderAdministrativeIndividualResponse }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderAdministrativeIndividualResponse }
      */
     public ReadProviderAdministrativeIndividualResponse createReadProviderAdministrativeIndividualResponse() {
         return new ReadProviderAdministrativeIndividualResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualPortType.java
index 7a28c06..dcb7070 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderReadProviderAdministrativeIndividualPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderAdministrativeIndividual/3.2.0")
@@ -40,7 +40,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.readindividual._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderReadProviderAdministrativeIndividualPortType {
@@ -48,10 +48,10 @@ public interface ProviderReadProviderAdministrativeIndividualPortType {
 
     /**
      * 
-     * @param request
      * @param productHeader
-     * @param timestampHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2.ReadProviderAdministrativeIndividualResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualService.java
index 11468e3..8596592 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ProviderReadProviderAdministrativeIndividualService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderReadProviderAdministrativeIndividualService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderAdministrativeIndividual/3.2.0", wsdlLocation = "HI_ProviderReadProviderAdministrativeIndividual-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderReadProviderAdministrativeIndividualPortType getProviderReadProvi
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderReadProviderAdministrativeIndividualPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividual.java
index 14a709b..b3b39f5 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividual.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividualResponse.java
index 873b775..2b49ac1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividualResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/ReadProviderAdministrativeIndividualResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.readindividual._3_2.ReadProviderAdministrativeIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/StandardErrorMsg.java
index 9a79534..ae7fdad 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/package-info.java
index 016b7ae..db9ac00 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadprovideradministrativeindividual/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderAdministrativeIndividual/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderAdministrativeIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providerreadprovideradministrativeindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ObjectFactory.java
index c7ee457..ab6e06a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ReadProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderOrganisation }
      */
     public ReadProviderOrganisation createReadProviderOrganisation() {
         return new ReadProviderOrganisation();
@@ -40,6 +42,8 @@ public ReadProviderOrganisation createReadProviderOrganisation() {
     /**
      * Create an instance of {@link ReadProviderOrganisationResponse }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderOrganisationResponse }
      */
     public ReadProviderOrganisationResponse createReadProviderOrganisationResponse() {
         return new ReadProviderOrganisationResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationPortType.java
index 2c3f4b6..7993391 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderReadProviderOrganisationPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderOrganisation/3.2.0")
@@ -42,7 +42,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.readorganisation._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderReadProviderOrganisationPortType {
@@ -50,10 +50,10 @@ public interface ProviderReadProviderOrganisationPortType {
 
     /**
      * 
-     * @param request
      * @param productHeader
-     * @param timestampHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2.ReadProviderOrganisationResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationService.java
index 7d3bd82..c502fcb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ProviderReadProviderOrganisationService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderReadProviderOrganisationService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderOrganisation/3.2.0", wsdlLocation = "HI_ProviderReadProviderOrganisation-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderReadProviderOrganisationPortType getProviderReadProviderOrganisat
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderReadProviderOrganisationPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisation.java
index 996aca2..82497e2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisation.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisationResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisationResponse.java
index ab47c31..1438c55 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisationResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/ReadProviderOrganisationResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.readorganisation._3_2.ReadProviderOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/StandardErrorMsg.java
index c109587..dec590a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/package-info.java
index 7b86c91..8affc82 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadproviderorganisation/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderOrganisation/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadProviderOrganisation/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providerreadproviderorganisation._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ObjectFactory.java
index 93c6922..adc4c32 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ReadReferenceData }
      * 
+     * @return
+     *     the new instance of {@link ReadReferenceData }
      */
     public ReadReferenceData createReadReferenceData() {
         return new ReadReferenceData();
@@ -40,6 +42,8 @@ public ReadReferenceData createReadReferenceData() {
     /**
      * Create an instance of {@link ReadReferenceDataResponse }
      * 
+     * @return
+     *     the new instance of {@link ReadReferenceDataResponse }
      */
     public ReadReferenceDataResponse createReadReferenceDataResponse() {
         return new ReadReferenceDataResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataPortType.java
index f01b1c6..b8cba5e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderReadReferenceDataPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadReferenceData/3.2.0")
@@ -30,7 +30,7 @@
     au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.readreferencedata._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderReadReferenceDataPortType {
@@ -38,11 +38,11 @@ public interface ProviderReadReferenceDataPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2.ReadReferenceDataResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataService.java
index 21802b1..6cb3005 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ProviderReadReferenceDataService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderReadReferenceDataService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadReferenceData/3.2.0", wsdlLocation = "HI_ProviderReadReferenceData-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderReadReferenceDataPortType getProviderReadReferenceDataSOAP12Port(
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderReadReferenceDataPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceData.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceData.java
index 6d08765..0e04d4e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceData.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceData.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -44,8 +44,8 @@ public class ReadReferenceData {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the elementNames property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the elementNames property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -66,7 +66,7 @@ public class ReadReferenceData {
      */
     public List<String> getElementNames() {
         if (elementNames == null) {
-            elementNames = new ArrayList<String>();
+            elementNames = new ArrayList<>();
         }
         return this.elementNames;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceDataResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceDataResponse.java
index cdd1af9..47d7c6c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceDataResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/ReadReferenceDataResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.readreferencedata._3_2.ReadReferenceDataResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/StandardErrorMsg.java
index 1284d34..4086b99 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/package-info.java
index be5666d..dcba7cb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providerreadreferencedata/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadReferenceData/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderReadReferenceData/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providerreadreferencedata._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ObjectFactory.java
index ba28847..164d0ff 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchForProviderIndividual }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderIndividual }
      */
     public SearchForProviderIndividual createSearchForProviderIndividual() {
         return new SearchForProviderIndividual();
@@ -40,6 +42,8 @@ public SearchForProviderIndividual createSearchForProviderIndividual() {
     /**
      * Create an instance of {@link SearchForProviderIndividualResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderIndividualResponse }
      */
     public SearchForProviderIndividualResponse createSearchForProviderIndividualResponse() {
         return new SearchForProviderIndividualResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualPortType.java
index 6318324..09db8fb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderSearchForProviderIndividualPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderIndividual/5.0.0")
@@ -39,7 +39,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_0.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderSearchForProviderIndividualPortType {
@@ -47,11 +47,11 @@ public interface ProviderSearchForProviderIndividualPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0.SearchForProviderIndividualResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualService.java
index 2065492..8883b4f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/ProviderSearchForProviderIndividualService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderSearchForProviderIndividualService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderIndividual/5.0.0", wsdlLocation = "HI_ProviderSearchForProviderIndividual-5.0.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderSearchForProviderIndividualPortType getProviderSearchForProviderI
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderSearchForProviderIndividualPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividual.java
index 3a475ec..f522691 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividual.java
@@ -3,25 +3,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0.SearchAustralianAddressType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0.SearchInternationalAddressType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -41,7 +41,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -190,8 +190,8 @@ public void setOnlyNameIndicator(Boolean value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the givenName property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -212,7 +212,7 @@ public void setOnlyNameIndicator(Boolean value) {
      */
     public List<String> getGivenName() {
         if (givenName == null) {
-            givenName = new ArrayList<String>();
+            givenName = new ArrayList<>();
         }
         return this.givenName;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividualResponse.java
index cef2883..8e55560 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividualResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/SearchForProviderIndividualResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0.SearchForProviderIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/StandardErrorMsg.java
index 1cb9b4f..671434d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/package-info.java
index 0d0ae4d..62d6a7e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderindividual/_5_0/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderIndividual/5.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderIndividual/5.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ObjectFactory.java
index d3ed511..535b9a6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchForProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderOrganisation }
      */
     public SearchForProviderOrganisation createSearchForProviderOrganisation() {
         return new SearchForProviderOrganisation();
@@ -40,6 +42,8 @@ public SearchForProviderOrganisation createSearchForProviderOrganisation() {
     /**
      * Create an instance of {@link SearchForProviderOrganisationResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderOrganisationResponse }
      */
     public SearchForProviderOrganisationResponse createSearchForProviderOrganisationResponse() {
         return new SearchForProviderOrganisationResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationPortType.java
index 94134aa..d4f34bd 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderSearchForProviderOrganisationPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderOrganisation/5.0.0")
@@ -31,7 +31,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_0.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderSearchForProviderOrganisationPortType {
@@ -39,11 +39,11 @@ public interface ProviderSearchForProviderOrganisationPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0.SearchForProviderOrganisationResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationService.java
index 3f1f4f6..bea2f5c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/ProviderSearchForProviderOrganisationService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderSearchForProviderOrganisationService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderOrganisation/5.0.0", wsdlLocation = "HI_ProviderSearchForProviderOrganisation-5.0.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderSearchForProviderOrganisationPortType getProviderSearchForProvide
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderSearchForProviderOrganisationPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisation.java
index a19a3b5..7733a40 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisation.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisationResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisationResponse.java
index 23928e4..291919a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisationResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/SearchForProviderOrganisationResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0.SearchForProviderOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/StandardErrorMsg.java
index 446eba9..be2d1a8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/package-info.java
index 2bd9d41..8396b62 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchforproviderorganisation/_5_0/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderOrganisation/5.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchForProviderOrganisation/5.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providersearchforproviderorganisation._5_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ObjectFactory.java
index ea48458..0f70207 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForIndividual }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForIndividual }
      */
     public SearchHIProviderDirectoryForIndividual createSearchHIProviderDirectoryForIndividual() {
         return new SearchHIProviderDirectoryForIndividual();
@@ -40,6 +42,8 @@ public SearchHIProviderDirectoryForIndividual createSearchHIProviderDirectoryFor
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForIndividualResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForIndividualResponse }
      */
     public SearchHIProviderDirectoryForIndividualResponse createSearchHIProviderDirectoryForIndividualResponse() {
         return new SearchHIProviderDirectoryForIndividualResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualPortType.java
index 8937e45..dce8f4c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderSearchHIProviderDirectoryForIndividualPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForIndividual/3.2.0")
@@ -40,7 +40,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderSearchHIProviderDirectoryForIndividualPortType {
@@ -48,11 +48,11 @@ public interface ProviderSearchHIProviderDirectoryForIndividualPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2.SearchHIProviderDirectoryForIndividualResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualService.java
index c7c4c96..4cb6a73 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/ProviderSearchHIProviderDirectoryForIndividualService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderSearchHIProviderDirectoryForIndividualService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForIndividual/3.2.0", wsdlLocation = "HI_ProviderSearchHIProviderDirectoryForIndividual-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderSearchHIProviderDirectoryForIndividualPortType getProviderSearchH
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderSearchHIProviderDirectoryForIndividualPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividual.java
index 045489b..dcb294a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividual.java
@@ -1,23 +1,23 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +35,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividualResponse.java
index 6156cfa..b1bd785 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividualResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/SearchHIProviderDirectoryForIndividualResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._3_2.SearchHIProviderDirectoryForIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/StandardErrorMsg.java
index 34c5dae..04f6595 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/package-info.java
index 56f3723..8c75788 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryforindividual/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForIndividual/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryforindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ObjectFactory.java
index 61d4be0..b7647ba 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForOrganisation }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForOrganisation }
      */
     public SearchHIProviderDirectoryForOrganisation createSearchHIProviderDirectoryForOrganisation() {
         return new SearchHIProviderDirectoryForOrganisation();
@@ -40,6 +42,8 @@ public SearchHIProviderDirectoryForOrganisation createSearchHIProviderDirectoryF
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForOrganisationResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForOrganisationResponse }
      */
     public SearchHIProviderDirectoryForOrganisationResponse createSearchHIProviderDirectoryForOrganisationResponse() {
         return new SearchHIProviderDirectoryForOrganisationResponse();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationPortType.java
index ac112dd..1dd4e5a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationPortType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationPortType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebService(name = "ProviderSearchHIProviderDirectoryForOrganisationPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForOrganisation/3.2.0")
@@ -41,7 +41,7 @@
     au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._3_2.ObjectFactory.class,
-    hi_override.org.w3.xmldsig.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
     au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
 })
 public interface ProviderSearchHIProviderDirectoryForOrganisationPortType {
@@ -49,11 +49,11 @@ public interface ProviderSearchHIProviderDirectoryForOrganisationPortType {
 
     /**
      * 
-     * @param request
-     * @param productHeader
      * @param hpioHeader
-     * @param timestampHeader
+     * @param productHeader
+     * @param request
      * @param signatureHeader
+     * @param timestampHeader
      * @param userHeader
      * @return
      *     returns au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2.SearchHIProviderDirectoryForOrganisationResponse
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationService.java
index 3d37ebc..acd41ca 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/ProviderSearchHIProviderDirectoryForOrganisationService.java
@@ -3,17 +3,17 @@
 
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebServiceClient(name = "ProviderSearchHIProviderDirectoryForOrganisationService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForOrganisation/3.2.0", wsdlLocation = "HI_ProviderSearchHIProviderDirectoryForOrganisation-3.2.0.wsdl")
@@ -71,7 +71,7 @@ public ProviderSearchHIProviderDirectoryForOrganisationPortType getProviderSearc
     /**
      * 
      * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns ProviderSearchHIProviderDirectoryForOrganisationPortType
      */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java
index 88c1aad..bd0fa1f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java
@@ -1,23 +1,23 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2.OrganisationDetails;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +35,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisationResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisationResponse.java
index 9fd0146..a9712c3 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisationResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/SearchHIProviderDirectoryForOrganisationResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._3_2.SearchHIProviderDirectoryForOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/StandardErrorMsg.java
index 2a5f178..30c3b63 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/StandardErrorMsg.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/StandardErrorMsg.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2;
 
-import javax.xml.ws.WebFault;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.3.7
- * Generated source version: 2.2
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
  * 
  */
 @WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
@@ -34,8 +34,8 @@ public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
 
     /**
      * 
-     * @param faultInfo
      * @param cause
+     * @param faultInfo
      * @param message
      */
     public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/package-info.java
index 9e301b3..3cf1309 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchhiproviderdirectoryfororganisation/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForOrganisation/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchHIProviderDirectoryForOrganisation/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.svc.providersearchhiproviderdirectoryfororganisation._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ObjectFactory.java
new file mode 100644
index 0000000..89f0677
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ObjectFactory.java
@@ -0,0 +1,52 @@
+
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link SearchTdsProviderIndividual }
+     * 
+     * @return
+     *     the new instance of {@link SearchTdsProviderIndividual }
+     */
+    public SearchTdsProviderIndividual createSearchTdsProviderIndividual() {
+        return new SearchTdsProviderIndividual();
+    }
+
+    /**
+     * Create an instance of {@link SearchTdsProviderIndividualResponse }
+     * 
+     * @return
+     *     the new instance of {@link SearchTdsProviderIndividualResponse }
+     */
+    public SearchTdsProviderIndividualResponse createSearchTdsProviderIndividualResponse() {
+        return new SearchTdsProviderIndividualResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ProviderSearchTdsProviderIndividualPortType.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ProviderSearchTdsProviderIndividualPortType.java
new file mode 100644
index 0000000..864049b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ProviderSearchTdsProviderIndividualPortType.java
@@ -0,0 +1,82 @@
+
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ProductType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.SignatureContainerType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.TimestampType;
+import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.FaultAction;
+import jakarta.xml.ws.Holder;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebService(name = "ProviderSearchTdsProviderIndividualPortType", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@XmlSeeAlso({
+    au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.addresscore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.address._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1.ObjectFactory.class,
+    org.w3._2000._09.xmldsig_.ObjectFactory.class,
+    au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.ObjectFactory.class
+})
+public interface ProviderSearchTdsProviderIndividualPortType {
+
+
+    /**
+     * 
+     * @param productHeader
+     * @param request
+     * @param signatureHeader
+     * @param timestampHeader
+     * @param userHeader
+     * @return
+     *     returns au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1.SearchTdsProviderIndividualResponse
+     * @throws StandardErrorMsg
+     */
+    @WebMethod
+    @WebResult(name = "searchTdsProviderIndividualResponse", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", partName = "response")
+    @Action(input = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0/ProviderSearchTdsProviderIndividualPortType/searchTdsProviderIndividualRequest", output = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0/ProviderSearchTdsProviderIndividualPortType/searchTdsProviderIndividualResponse", fault = {
+        @FaultAction(className = StandardErrorMsg.class, value = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0/ProviderSearchTdsProviderIndividualPortType/searchTdsProviderIndividual/Fault/standardError")
+    })
+    public SearchTdsProviderIndividualResponse searchTdsProviderIndividual(
+        @WebParam(name = "searchTdsProviderIndividual", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", partName = "request")
+        SearchTdsProviderIndividual request,
+        @WebParam(name = "product", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "productHeader")
+        Holder<ProductType> productHeader,
+        @WebParam(name = "timestamp", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "timestampHeader")
+        TimestampType timestampHeader,
+        @WebParam(name = "signature", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, mode = WebParam.Mode.INOUT, partName = "signatureHeader")
+        Holder<SignatureContainerType> signatureHeader,
+        @WebParam(name = "user", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", header = true, partName = "userHeader")
+        QualifiedId userHeader)
+        throws StandardErrorMsg
+    ;
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ProviderSearchTdsProviderIndividualService.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ProviderSearchTdsProviderIndividualService.java
new file mode 100644
index 0000000..46cab78
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/ProviderSearchTdsProviderIndividualService.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.WebServiceFeature;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebServiceClient(name = "ProviderSearchTdsProviderIndividualService", targetNamespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", wsdlLocation = "HI_ProviderSearchTdsProviderIndividual-5.1.0.wsdl")
+public class ProviderSearchTdsProviderIndividualService
+    extends Service
+{
+
+    private static final URL PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION;
+    private static final WebServiceException PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_EXCEPTION;
+    private static final QName PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_QNAME = new QName("http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", "ProviderSearchTdsProviderIndividualService");
+
+    static {
+        PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION = au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1.ProviderSearchTdsProviderIndividualService.class.getResource("HI_ProviderSearchTdsProviderIndividual-5.1.0.wsdl");
+        WebServiceException e = null;
+        if (PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION == null) {
+            e = new WebServiceException("Cannot find 'HI_ProviderSearchTdsProviderIndividual-5.1.0.wsdl' wsdl. Place the resource correctly in the classpath.");
+        }
+        PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_EXCEPTION = e;
+    }
+
+    public ProviderSearchTdsProviderIndividualService() {
+        super(__getWsdlLocation(), PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_QNAME);
+    }
+
+    public ProviderSearchTdsProviderIndividualService(WebServiceFeature... features) {
+        super(__getWsdlLocation(), PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_QNAME, features);
+    }
+
+    public ProviderSearchTdsProviderIndividualService(URL wsdlLocation) {
+        super(wsdlLocation, PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_QNAME);
+    }
+
+    public ProviderSearchTdsProviderIndividualService(URL wsdlLocation, WebServiceFeature... features) {
+        super(wsdlLocation, PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_QNAME, features);
+    }
+
+    public ProviderSearchTdsProviderIndividualService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ProviderSearchTdsProviderIndividualService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ProviderSearchTdsProviderIndividualPortType
+     */
+    @WebEndpoint(name = "ProviderSearchTdsProviderIndividualPort")
+    public ProviderSearchTdsProviderIndividualPortType getProviderSearchTdsProviderIndividualPort() {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", "ProviderSearchTdsProviderIndividualPort"), ProviderSearchTdsProviderIndividualPortType.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ProviderSearchTdsProviderIndividualPortType
+     */
+    @WebEndpoint(name = "ProviderSearchTdsProviderIndividualPort")
+    public ProviderSearchTdsProviderIndividualPortType getProviderSearchTdsProviderIndividualPort(WebServiceFeature... features) {
+        return super.getPort(new QName("http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", "ProviderSearchTdsProviderIndividualPort"), ProviderSearchTdsProviderIndividualPortType.class, features);
+    }
+
+    private static URL __getWsdlLocation() {
+        if (PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_EXCEPTION!= null) {
+            throw PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_EXCEPTION;
+        }
+        return PROVIDERSEARCHTDSPROVIDERINDIVIDUALSERVICE_WSDL_LOCATION;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/SearchTdsProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/SearchTdsProviderIndividual.java
new file mode 100644
index 0000000..eba8566
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/SearchTdsProviderIndividual.java
@@ -0,0 +1,306 @@
+
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}hpiiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}registrationId" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}givenName" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}providerTypeCode" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}sex" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}postcode" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}state" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "hpiiNumber",
+    "registrationId",
+    "familyName",
+    "givenName",
+    "providerTypeCode",
+    "dateOfBirth",
+    "sex",
+    "postcode",
+    "state"
+})
+@XmlRootElement(name = "searchTdsProviderIndividual")
+public class SearchTdsProviderIndividual {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String hpiiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    protected String registrationId;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    protected String providerTypeCode;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    protected String postcode;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0")
+    @XmlSchemaType(name = "string")
+    protected StateType state;
+
+    /**
+     * Gets the value of the hpiiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHpiiNumber() {
+        return hpiiNumber;
+    }
+
+    /**
+     * Sets the value of the hpiiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHpiiNumber(String value) {
+        this.hpiiNumber = value;
+    }
+
+    /**
+     * Gets the value of the registrationId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRegistrationId() {
+        return registrationId;
+    }
+
+    /**
+     * Sets the value of the registrationId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRegistrationId(String value) {
+        this.registrationId = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the providerTypeCode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getProviderTypeCode() {
+        return providerTypeCode;
+    }
+
+    /**
+     * Sets the value of the providerTypeCode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProviderTypeCode(String value) {
+        this.providerTypeCode = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the postcode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPostcode() {
+        return postcode;
+    }
+
+    /**
+     * Sets the value of the postcode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPostcode(String value) {
+        this.postcode = value;
+    }
+
+    /**
+     * Gets the value of the state property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link StateType }
+     *     
+     */
+    public StateType getState() {
+        return state;
+    }
+
+    /**
+     * Sets the value of the state property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link StateType }
+     *     
+     */
+    public void setState(StateType value) {
+        this.state = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/SearchTdsProviderIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/SearchTdsProviderIndividualResponse.java
new file mode 100644
index 0000000..e8eb619
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/SearchTdsProviderIndividualResponse.java
@@ -0,0 +1,70 @@
+
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1.SearchTdsProviderIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}searchTdsProviderIndividualResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "searchTdsProviderIndividualResult"
+})
+@XmlRootElement(name = "searchTdsProviderIndividualResponse")
+public class SearchTdsProviderIndividualResponse {
+
+    /**
+     * TDS Search For Provider Individual Response element
+     * 
+     */
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", required = true)
+    protected SearchTdsProviderIndividualResult searchTdsProviderIndividualResult;
+
+    /**
+     * TDS Search For Provider Individual Response element
+     * 
+     * @return
+     *     possible object is
+     *     {@link SearchTdsProviderIndividualResult }
+     *     
+     */
+    public SearchTdsProviderIndividualResult getSearchTdsProviderIndividualResult() {
+        return searchTdsProviderIndividualResult;
+    }
+
+    /**
+     * Sets the value of the searchTdsProviderIndividualResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SearchTdsProviderIndividualResult }
+     *     
+     * @see #getSearchTdsProviderIndividualResult()
+     */
+    public void setSearchTdsProviderIndividualResult(SearchTdsProviderIndividualResult value) {
+        this.searchTdsProviderIndividualResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/StandardErrorMsg.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/StandardErrorMsg.java
new file mode 100644
index 0000000..02327a9
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/StandardErrorMsg.java
@@ -0,0 +1,55 @@
+
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the XML-WS Tools.
+ * XML-WS Tools 4.0.4
+ * Generated source version: 3.0
+ * 
+ */
+@WebFault(name = "serviceMessages", targetNamespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+public class StandardErrorMsg
+    extends Exception
+{
+
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     * 
+     */
+    private ServiceMessagesType faultInfo;
+
+    /**
+     * 
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @param cause
+     * @param faultInfo
+     * @param message
+     */
+    public StandardErrorMsg(String message, ServiceMessagesType faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * 
+     * @return
+     *     returns fault bean: au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType
+     */
+    public ServiceMessagesType getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/package-info.java
new file mode 100644
index 0000000..c9db053
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/svc/providersearchtdsproviderindividual/_5_1/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/svc/ProviderSearchTdsProviderIndividual/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.svc.providersearchtdsproviderindividual._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/LevelGroupType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/LevelGroupType.java
index 81a0479..82b01b9 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/LevelGroupType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/LevelGroupType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.LevelType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for LevelGroupType complex type</p>.
+ * &lt;p&gt;Java class for LevelGroupType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="LevelGroupType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/ObjectFactory.java
index a70a899..e1d01e0 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/ObjectFactory.java
@@ -1,9 +1,6 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.AddressPurposeType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.LevelType;
@@ -12,13 +9,16 @@
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetSuffixType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.UnitType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.addresscore._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -65,6 +65,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link UnitGroupType }
      * 
+     * @return
+     *     the new instance of {@link UnitGroupType }
      */
     public UnitGroupType createUnitGroupType() {
         return new UnitGroupType();
@@ -73,6 +75,8 @@ public UnitGroupType createUnitGroupType() {
     /**
      * Create an instance of {@link LevelGroupType }
      * 
+     * @return
+     *     the new instance of {@link LevelGroupType }
      */
     public LevelGroupType createLevelGroupType() {
         return new LevelGroupType();
@@ -81,6 +85,8 @@ public LevelGroupType createLevelGroupType() {
     /**
      * Create an instance of {@link PostalDeliveryGroupType }
      * 
+     * @return
+     *     the new instance of {@link PostalDeliveryGroupType }
      */
     public PostalDeliveryGroupType createPostalDeliveryGroupType() {
         return new PostalDeliveryGroupType();
@@ -96,7 +102,7 @@ public PostalDeliveryGroupType createPostalDeliveryGroupType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "addressSiteName")
     public JAXBElement<String> createAddressSiteName(String value) {
-        return new JAXBElement<String>(_AddressSiteName_QNAME, String.class, null, value);
+        return new JAXBElement<>(_AddressSiteName_QNAME, String.class, null, value);
     }
 
     /**
@@ -109,7 +115,7 @@ public JAXBElement<String> createAddressSiteName(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "unitGroup")
     public JAXBElement<UnitGroupType> createUnitGroup(UnitGroupType value) {
-        return new JAXBElement<UnitGroupType>(_UnitGroup_QNAME, UnitGroupType.class, null, value);
+        return new JAXBElement<>(_UnitGroup_QNAME, UnitGroupType.class, null, value);
     }
 
     /**
@@ -122,7 +128,7 @@ public JAXBElement<UnitGroupType> createUnitGroup(UnitGroupType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "unitType")
     public JAXBElement<UnitType> createUnitType(UnitType value) {
-        return new JAXBElement<UnitType>(_UnitType_QNAME, UnitType.class, null, value);
+        return new JAXBElement<>(_UnitType_QNAME, UnitType.class, null, value);
     }
 
     /**
@@ -135,7 +141,7 @@ public JAXBElement<UnitType> createUnitType(UnitType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "unitNumber")
     public JAXBElement<String> createUnitNumber(String value) {
-        return new JAXBElement<String>(_UnitNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_UnitNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -148,7 +154,7 @@ public JAXBElement<String> createUnitNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "levelGroup")
     public JAXBElement<LevelGroupType> createLevelGroup(LevelGroupType value) {
-        return new JAXBElement<LevelGroupType>(_LevelGroup_QNAME, LevelGroupType.class, null, value);
+        return new JAXBElement<>(_LevelGroup_QNAME, LevelGroupType.class, null, value);
     }
 
     /**
@@ -161,7 +167,7 @@ public JAXBElement<LevelGroupType> createLevelGroup(LevelGroupType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "levelType")
     public JAXBElement<LevelType> createLevelType(LevelType value) {
-        return new JAXBElement<LevelType>(_LevelType_QNAME, LevelType.class, null, value);
+        return new JAXBElement<>(_LevelType_QNAME, LevelType.class, null, value);
     }
 
     /**
@@ -174,7 +180,7 @@ public JAXBElement<LevelType> createLevelType(LevelType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "levelNumber")
     public JAXBElement<String> createLevelNumber(String value) {
-        return new JAXBElement<String>(_LevelNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_LevelNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -187,7 +193,7 @@ public JAXBElement<String> createLevelNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "lotNumber")
     public JAXBElement<String> createLotNumber(String value) {
-        return new JAXBElement<String>(_LotNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_LotNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -200,7 +206,7 @@ public JAXBElement<String> createLotNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "streetNumber")
     public JAXBElement<String> createStreetNumber(String value) {
-        return new JAXBElement<String>(_StreetNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_StreetNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -213,7 +219,7 @@ public JAXBElement<String> createStreetNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "streetName")
     public JAXBElement<String> createStreetName(String value) {
-        return new JAXBElement<String>(_StreetName_QNAME, String.class, null, value);
+        return new JAXBElement<>(_StreetName_QNAME, String.class, null, value);
     }
 
     /**
@@ -226,7 +232,7 @@ public JAXBElement<String> createStreetName(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "streetType")
     public JAXBElement<StreetType> createStreetType(StreetType value) {
-        return new JAXBElement<StreetType>(_StreetType_QNAME, StreetType.class, null, value);
+        return new JAXBElement<>(_StreetType_QNAME, StreetType.class, null, value);
     }
 
     /**
@@ -239,7 +245,7 @@ public JAXBElement<StreetType> createStreetType(StreetType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "streetSuffix")
     public JAXBElement<StreetSuffixType> createStreetSuffix(StreetSuffixType value) {
-        return new JAXBElement<StreetSuffixType>(_StreetSuffix_QNAME, StreetSuffixType.class, null, value);
+        return new JAXBElement<>(_StreetSuffix_QNAME, StreetSuffixType.class, null, value);
     }
 
     /**
@@ -252,7 +258,7 @@ public JAXBElement<StreetSuffixType> createStreetSuffix(StreetSuffixType value)
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "suburb")
     public JAXBElement<String> createSuburb(String value) {
-        return new JAXBElement<String>(_Suburb_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Suburb_QNAME, String.class, null, value);
     }
 
     /**
@@ -265,7 +271,7 @@ public JAXBElement<String> createSuburb(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "postcode")
     public JAXBElement<String> createPostcode(String value) {
-        return new JAXBElement<String>(_Postcode_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Postcode_QNAME, String.class, null, value);
     }
 
     /**
@@ -278,7 +284,7 @@ public JAXBElement<String> createPostcode(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "state")
     public JAXBElement<StateType> createState(StateType value) {
-        return new JAXBElement<StateType>(_State_QNAME, StateType.class, null, value);
+        return new JAXBElement<>(_State_QNAME, StateType.class, null, value);
     }
 
     /**
@@ -291,7 +297,7 @@ public JAXBElement<StateType> createState(StateType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "internationalStateProvince")
     public JAXBElement<String> createInternationalStateProvince(String value) {
-        return new JAXBElement<String>(_InternationalStateProvince_QNAME, String.class, null, value);
+        return new JAXBElement<>(_InternationalStateProvince_QNAME, String.class, null, value);
     }
 
     /**
@@ -304,7 +310,7 @@ public JAXBElement<String> createInternationalStateProvince(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "country")
     public JAXBElement<String> createCountry(String value) {
-        return new JAXBElement<String>(_Country_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Country_QNAME, String.class, null, value);
     }
 
     /**
@@ -317,7 +323,7 @@ public JAXBElement<String> createCountry(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "internationalPostcode")
     public JAXBElement<String> createInternationalPostcode(String value) {
-        return new JAXBElement<String>(_InternationalPostcode_QNAME, String.class, null, value);
+        return new JAXBElement<>(_InternationalPostcode_QNAME, String.class, null, value);
     }
 
     /**
@@ -330,7 +336,7 @@ public JAXBElement<String> createInternationalPostcode(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "internationalAddressLine")
     public JAXBElement<String> createInternationalAddressLine(String value) {
-        return new JAXBElement<String>(_InternationalAddressLine_QNAME, String.class, null, value);
+        return new JAXBElement<>(_InternationalAddressLine_QNAME, String.class, null, value);
     }
 
     /**
@@ -343,7 +349,7 @@ public JAXBElement<String> createInternationalAddressLine(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "postalDeliveryType")
     public JAXBElement<PostalDeliveryType> createPostalDeliveryType(PostalDeliveryType value) {
-        return new JAXBElement<PostalDeliveryType>(_PostalDeliveryType_QNAME, PostalDeliveryType.class, null, value);
+        return new JAXBElement<>(_PostalDeliveryType_QNAME, PostalDeliveryType.class, null, value);
     }
 
     /**
@@ -356,7 +362,7 @@ public JAXBElement<PostalDeliveryType> createPostalDeliveryType(PostalDeliveryTy
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "postalDeliveryNumber")
     public JAXBElement<String> createPostalDeliveryNumber(String value) {
-        return new JAXBElement<String>(_PostalDeliveryNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_PostalDeliveryNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -369,7 +375,7 @@ public JAXBElement<String> createPostalDeliveryNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "postalDeliveryGroup")
     public JAXBElement<PostalDeliveryGroupType> createPostalDeliveryGroup(PostalDeliveryGroupType value) {
-        return new JAXBElement<PostalDeliveryGroupType>(_PostalDeliveryGroup_QNAME, PostalDeliveryGroupType.class, null, value);
+        return new JAXBElement<>(_PostalDeliveryGroup_QNAME, PostalDeliveryGroupType.class, null, value);
     }
 
     /**
@@ -382,7 +388,7 @@ public JAXBElement<PostalDeliveryGroupType> createPostalDeliveryGroup(PostalDeli
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", name = "purpose")
     public JAXBElement<AddressPurposeType> createPurpose(AddressPurposeType value) {
-        return new JAXBElement<AddressPurposeType>(_Purpose_QNAME, AddressPurposeType.class, null, value);
+        return new JAXBElement<>(_Purpose_QNAME, AddressPurposeType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/PostalDeliveryGroupType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/PostalDeliveryGroupType.java
index e7a3a3b..b932dd6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/PostalDeliveryGroupType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/PostalDeliveryGroupType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.PostalDeliveryType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PostalDeliveryGroupType complex type</p>.
+ * &lt;p&gt;Java class for PostalDeliveryGroupType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="PostalDeliveryGroupType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/UnitGroupType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/UnitGroupType.java
index a825787..55ffe25 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/UnitGroupType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/UnitGroupType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.UnitType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for UnitGroupType complex type</p>.
+ * &lt;p&gt;Java class for UnitGroupType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="UnitGroupType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/package-info.java
index 85bff67..3e7254c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/ObjectFactory.java
index 89736f9..6bf0b14 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/ObjectFactory.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -41,6 +41,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchAustralianAddressType }
      * 
+     * @return
+     *     the new instance of {@link SearchAustralianAddressType }
      */
     public SearchAustralianAddressType createSearchAustralianAddressType() {
         return new SearchAustralianAddressType();
@@ -49,6 +51,8 @@ public SearchAustralianAddressType createSearchAustralianAddressType() {
     /**
      * Create an instance of {@link SearchInternationalAddressType }
      * 
+     * @return
+     *     the new instance of {@link SearchInternationalAddressType }
      */
     public SearchInternationalAddressType createSearchInternationalAddressType() {
         return new SearchInternationalAddressType();
@@ -64,7 +68,7 @@ public SearchInternationalAddressType createSearchInternationalAddressType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/5.0.0", name = "searchAustralianAddress")
     public JAXBElement<SearchAustralianAddressType> createSearchAustralianAddress(SearchAustralianAddressType value) {
-        return new JAXBElement<SearchAustralianAddressType>(_SearchAustralianAddress_QNAME, SearchAustralianAddressType.class, null, value);
+        return new JAXBElement<>(_SearchAustralianAddress_QNAME, SearchAustralianAddressType.class, null, value);
     }
 
     /**
@@ -77,7 +81,7 @@ public JAXBElement<SearchAustralianAddressType> createSearchAustralianAddress(Se
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/5.0.0", name = "searchInternationalAddress")
     public JAXBElement<SearchInternationalAddressType> createSearchInternationalAddress(SearchInternationalAddressType value) {
-        return new JAXBElement<SearchInternationalAddressType>(_SearchInternationalAddress_QNAME, SearchInternationalAddressType.class, null, value);
+        return new JAXBElement<>(_SearchInternationalAddress_QNAME, SearchInternationalAddressType.class, null, value);
     }
 
     /**
@@ -90,7 +94,7 @@ public JAXBElement<SearchInternationalAddressType> createSearchInternationalAddr
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/5.0.0", name = "australianAddress")
     public JAXBElement<AustralianAddressType> createAustralianAddress(AustralianAddressType value) {
-        return new JAXBElement<AustralianAddressType>(_AustralianAddress_QNAME, AustralianAddressType.class, null, value);
+        return new JAXBElement<>(_AustralianAddress_QNAME, AustralianAddressType.class, null, value);
     }
 
     /**
@@ -103,7 +107,7 @@ public JAXBElement<AustralianAddressType> createAustralianAddress(AustralianAddr
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/5.0.0", name = "internationalAddress")
     public JAXBElement<InternationalAddressType> createInternationalAddress(InternationalAddressType value) {
-        return new JAXBElement<InternationalAddressType>(_InternationalAddress_QNAME, InternationalAddressType.class, null, value);
+        return new JAXBElement<>(_InternationalAddress_QNAME, InternationalAddressType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchAustralianAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchAustralianAddressType.java
index 79fe186..179b651 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchAustralianAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchAustralianAddressType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.LevelGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.PostalDeliveryGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.UnitGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetSuffixType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SearchAustralianAddressType complex type</p>.
+ * &lt;p&gt;Java class for SearchAustralianAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SearchAustralianAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -40,7 +40,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchInternationalAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchInternationalAddressType.java
index b6fc974..b96878b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchInternationalAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/SearchInternationalAddressType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SearchInternationalAddressType complex type</p>.
+ * &lt;p&gt;Java class for SearchInternationalAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SearchInternationalAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/package-info.java
index d6cd643..f78feea 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/addresscore/_5_0/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/5.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/AddressCore/5.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/AddressPurposeType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/AddressPurposeType.java
index b6908da..47770b1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/AddressPurposeType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/AddressPurposeType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for AddressPurposeType</p>.
+ * &lt;p&gt;Java class for AddressPurposeType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="AddressPurposeType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="B"/&gt;
@@ -21,7 +21,7 @@
  *     &lt;enumeration value="T"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "AddressPurposeType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/DateAccuracyIndicatorType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/DateAccuracyIndicatorType.java
index 87a19e0..b1fb0a2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/DateAccuracyIndicatorType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/DateAccuracyIndicatorType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for DateAccuracyIndicatorType</p>.
+ * &lt;p&gt;Java class for DateAccuracyIndicatorType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="DateAccuracyIndicatorType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;length value="3"/&gt;
@@ -44,7 +44,7 @@
  *     &lt;enumeration value="UUU"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "DateAccuracyIndicatorType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/IndividualNameUsageType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/IndividualNameUsageType.java
index 94caa85..40122b5 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/IndividualNameUsageType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/IndividualNameUsageType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for IndividualNameUsageType</p>.
+ * &lt;p&gt;Java class for IndividualNameUsageType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="IndividualNameUsageType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="M"/&gt;
@@ -22,7 +22,7 @@
  *     &lt;enumeration value="R"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "IndividualNameUsageType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/LevelType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/LevelType.java
index 4bad633..e1dd830 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/LevelType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/LevelType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for LevelType</p>.
+ * &lt;p&gt;Java class for LevelType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="LevelType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="B"/&gt;
@@ -31,7 +31,7 @@
  *     &lt;enumeration value="UG"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "LevelType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/MediumType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/MediumType.java
index e6462f1..1c0ed4d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/MediumType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/MediumType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for MediumType</p>.
+ * &lt;p&gt;Java class for MediumType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="MediumType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;minLength value="1"/&gt;
@@ -25,7 +25,7 @@
  *     &lt;enumeration value="U"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "MediumType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/NameSuffixType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/NameSuffixType.java
index 77a374f..5a1e2a9 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/NameSuffixType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/NameSuffixType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for NameSuffixType</p>.
+ * &lt;p&gt;Java class for NameSuffixType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="NameSuffixType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="BM"/&gt;
@@ -70,7 +70,7 @@
  *     &lt;enumeration value="VC"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "NameSuffixType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/ObjectFactory.java
index d90fe81..1274eba 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/PostalDeliveryType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/PostalDeliveryType.java
index 6dde2e2..16f8b38 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/PostalDeliveryType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/PostalDeliveryType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for PostalDeliveryType</p>.
+ * &lt;p&gt;Java class for PostalDeliveryType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="PostalDeliveryType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="Care PO"/&gt;
@@ -29,7 +29,7 @@
  *     &lt;enumeration value="RMS"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "PostalDeliveryType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SeverityType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SeverityType.java
index ee64407..307dca9 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SeverityType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SeverityType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for SeverityType</p>.
+ * &lt;p&gt;Java class for SeverityType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="SeverityType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="Fatal"/&gt;
@@ -21,7 +21,7 @@
  *     &lt;enumeration value="Informational"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "SeverityType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SexType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SexType.java
index 6244798..3b23a66 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SexType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/SexType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for SexType</p>.
+ * &lt;p&gt;Java class for SexType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="SexType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="F"/&gt;
@@ -21,7 +21,7 @@
  *     &lt;length value="1"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "SexType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StateType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StateType.java
index 4bb2698..17964dd 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StateType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StateType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for StateType</p>.
+ * &lt;p&gt;Java class for StateType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="StateType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="ACT"/&gt;
@@ -24,7 +24,7 @@
  *     &lt;enumeration value="WA"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "StateType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetSuffixType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetSuffixType.java
index 4e754bf..df340d1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetSuffixType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetSuffixType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for StreetSuffixType</p>.
+ * &lt;p&gt;Java class for StreetSuffixType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="StreetSuffixType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="CN"/&gt;
@@ -28,7 +28,7 @@
  *     &lt;enumeration value="W"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "StreetSuffixType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetType.java
index baf93e9..db5daa6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/StreetType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for StreetType</p>.
+ * &lt;p&gt;Java class for StreetType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="StreetType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="ACCS"/&gt;
@@ -220,7 +220,7 @@
  *     &lt;enumeration value="YARD"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "StreetType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/TrueFalseType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/TrueFalseType.java
index 76adf92..04c636c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/TrueFalseType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/TrueFalseType.java
@@ -1,24 +1,24 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for TrueFalseType</p>.
+ * &lt;p&gt;Java class for TrueFalseType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="TrueFalseType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="F"/&gt;
  *     &lt;enumeration value="T"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "TrueFalseType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UnitType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UnitType.java
index 1551261..46474c2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UnitType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UnitType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for UnitType</p>.
+ * &lt;p&gt;Java class for UnitType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="UnitType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="ANT"/&gt;
@@ -64,7 +64,7 @@
  *     &lt;enumeration value="WKSH"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "UnitType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UsageType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UsageType.java
index b6cd47e..bdc8fd5 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UsageType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoredatatypes/_3/UsageType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for UsageType</p>.
+ * &lt;p&gt;Java class for UsageType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="UsageType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="A"/&gt;
@@ -20,7 +20,7 @@
  *     &lt;length value="1"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "UsageType", namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/Detail.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/Detail.java
index ac601a1..3389e61 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/Detail.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/Detail.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for detail complex type</p>.
+ * &lt;p&gt;Java class for detail complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="detail"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -43,8 +43,8 @@ public class Detail {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the any property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -66,7 +66,7 @@ public class Detail {
      */
     public List<Object> getAny() {
         if (any == null) {
-            any = new ArrayList<Object>();
+            any = new ArrayList<>();
         }
         return this.any;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ObjectFactory.java
index 3de0d41..001e91c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ObjectFactory.java
@@ -1,22 +1,22 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -29,16 +29,16 @@
 @XmlRegistry
 public class ObjectFactory {
 
+    private static final QName _DateOfBirth_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfBirth");
     private static final QName _Sex_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "sex");
+    private static final QName _DateOfBirthAccuracyIndicator_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfBirthAccuracyIndicator");
+    private static final QName _DateOfDeath_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfDeath");
+    private static final QName _DateOfDeathAccuracyIndicator_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfDeathAccuracyIndicator");
     private static final QName _ServiceMessages_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "serviceMessages");
     private static final QName _ServiceMessage_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "serviceMessage");
     private static final QName _Preferred_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "preferred");
     private static final QName _StartDate_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "startDate");
     private static final QName _EndDate_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "endDate");
-    private static final QName _DateOfBirth_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfBirth");
-    private static final QName _DateOfBirthAccuracyIndicator_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfBirthAccuracyIndicator");
-    private static final QName _DateOfDeath_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfDeath");
-    private static final QName _DateOfDeathAccuracyIndicator_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "dateOfDeathAccuracyIndicator");
     private static final QName _Product_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "product");
     private static final QName _Signature_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "signature");
     private static final QName _Timestamp_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", "timestamp");
@@ -55,6 +55,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ServiceMessagesType }
      * 
+     * @return
+     *     the new instance of {@link ServiceMessagesType }
      */
     public ServiceMessagesType createServiceMessagesType() {
         return new ServiceMessagesType();
@@ -63,6 +65,8 @@ public ServiceMessagesType createServiceMessagesType() {
     /**
      * Create an instance of {@link ServiceMessageType }
      * 
+     * @return
+     *     the new instance of {@link ServiceMessageType }
      */
     public ServiceMessageType createServiceMessageType() {
         return new ServiceMessageType();
@@ -71,6 +75,8 @@ public ServiceMessageType createServiceMessageType() {
     /**
      * Create an instance of {@link ProductType }
      * 
+     * @return
+     *     the new instance of {@link ProductType }
      */
     public ProductType createProductType() {
         return new ProductType();
@@ -79,6 +85,8 @@ public ProductType createProductType() {
     /**
      * Create an instance of {@link SignatureContainerType }
      * 
+     * @return
+     *     the new instance of {@link SignatureContainerType }
      */
     public SignatureContainerType createSignatureContainerType() {
         return new SignatureContainerType();
@@ -87,6 +95,8 @@ public SignatureContainerType createSignatureContainerType() {
     /**
      * Create an instance of {@link TimestampType }
      * 
+     * @return
+     *     the new instance of {@link TimestampType }
      */
     public TimestampType createTimestampType() {
         return new TimestampType();
@@ -95,113 +105,115 @@ public TimestampType createTimestampType() {
     /**
      * Create an instance of {@link Detail }
      * 
+     * @return
+     *     the new instance of {@link Detail }
      */
     public Detail createDetail() {
         return new Detail();
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SexType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SexType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "sex")
-    public JAXBElement<SexType> createSex(SexType value) {
-        return new JAXBElement<SexType>(_Sex_QNAME, SexType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfBirth")
+    public JAXBElement<XMLGregorianCalendar> createDateOfBirth(XMLGregorianCalendar value) {
+        return new JAXBElement<>(_DateOfBirth_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceMessagesType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SexType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ServiceMessagesType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link SexType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "serviceMessages")
-    public JAXBElement<ServiceMessagesType> createServiceMessages(ServiceMessagesType value) {
-        return new JAXBElement<ServiceMessagesType>(_ServiceMessages_QNAME, ServiceMessagesType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "sex")
+    public JAXBElement<SexType> createSex(SexType value) {
+        return new JAXBElement<>(_Sex_QNAME, SexType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceMessageType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ServiceMessageType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "serviceMessage")
-    public JAXBElement<ServiceMessageType> createServiceMessage(ServiceMessageType value) {
-        return new JAXBElement<ServiceMessageType>(_ServiceMessage_QNAME, ServiceMessageType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfBirthAccuracyIndicator")
+    public JAXBElement<DateAccuracyIndicatorType> createDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        return new JAXBElement<>(_DateOfBirthAccuracyIndicator_QNAME, DateAccuracyIndicatorType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TrueFalseType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link TrueFalseType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "preferred")
-    public JAXBElement<TrueFalseType> createPreferred(TrueFalseType value) {
-        return new JAXBElement<TrueFalseType>(_Preferred_QNAME, TrueFalseType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfDeath")
+    public JAXBElement<XMLGregorianCalendar> createDateOfDeath(XMLGregorianCalendar value) {
+        return new JAXBElement<>(_DateOfDeath_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "startDate")
-    public JAXBElement<XMLGregorianCalendar> createStartDate(XMLGregorianCalendar value) {
-        return new JAXBElement<XMLGregorianCalendar>(_StartDate_QNAME, XMLGregorianCalendar.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfDeathAccuracyIndicator")
+    public JAXBElement<DateAccuracyIndicatorType> createDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        return new JAXBElement<>(_DateOfDeathAccuracyIndicator_QNAME, DateAccuracyIndicatorType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceMessagesType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ServiceMessagesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "endDate")
-    public JAXBElement<XMLGregorianCalendar> createEndDate(XMLGregorianCalendar value) {
-        return new JAXBElement<XMLGregorianCalendar>(_EndDate_QNAME, XMLGregorianCalendar.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "serviceMessages")
+    public JAXBElement<ServiceMessagesType> createServiceMessages(ServiceMessagesType value) {
+        return new JAXBElement<>(_ServiceMessages_QNAME, ServiceMessagesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServiceMessageType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ServiceMessageType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfBirth")
-    public JAXBElement<XMLGregorianCalendar> createDateOfBirth(XMLGregorianCalendar value) {
-        return new JAXBElement<XMLGregorianCalendar>(_DateOfBirth_QNAME, XMLGregorianCalendar.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "serviceMessage")
+    public JAXBElement<ServiceMessageType> createServiceMessage(ServiceMessageType value) {
+        return new JAXBElement<>(_ServiceMessage_QNAME, ServiceMessageType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TrueFalseType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link TrueFalseType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfBirthAccuracyIndicator")
-    public JAXBElement<DateAccuracyIndicatorType> createDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
-        return new JAXBElement<DateAccuracyIndicatorType>(_DateOfBirthAccuracyIndicator_QNAME, DateAccuracyIndicatorType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "preferred")
+    public JAXBElement<TrueFalseType> createPreferred(TrueFalseType value) {
+        return new JAXBElement<>(_Preferred_QNAME, TrueFalseType.class, null, value);
     }
 
     /**
@@ -212,22 +224,22 @@ public JAXBElement<DateAccuracyIndicatorType> createDateOfBirthAccuracyIndicator
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfDeath")
-    public JAXBElement<XMLGregorianCalendar> createDateOfDeath(XMLGregorianCalendar value) {
-        return new JAXBElement<XMLGregorianCalendar>(_DateOfDeath_QNAME, XMLGregorianCalendar.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "startDate")
+    public JAXBElement<XMLGregorianCalendar> createStartDate(XMLGregorianCalendar value) {
+        return new JAXBElement<>(_StartDate_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link DateAccuracyIndicatorType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "dateOfDeathAccuracyIndicator")
-    public JAXBElement<DateAccuracyIndicatorType> createDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
-        return new JAXBElement<DateAccuracyIndicatorType>(_DateOfDeathAccuracyIndicator_QNAME, DateAccuracyIndicatorType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "endDate")
+    public JAXBElement<XMLGregorianCalendar> createEndDate(XMLGregorianCalendar value) {
+        return new JAXBElement<>(_EndDate_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
     /**
@@ -240,7 +252,7 @@ public JAXBElement<DateAccuracyIndicatorType> createDateOfDeathAccuracyIndicator
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "product")
     public JAXBElement<ProductType> createProduct(ProductType value) {
-        return new JAXBElement<ProductType>(_Product_QNAME, ProductType.class, null, value);
+        return new JAXBElement<>(_Product_QNAME, ProductType.class, null, value);
     }
 
     /**
@@ -253,7 +265,7 @@ public JAXBElement<ProductType> createProduct(ProductType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "signature")
     public JAXBElement<SignatureContainerType> createSignature(SignatureContainerType value) {
-        return new JAXBElement<SignatureContainerType>(_Signature_QNAME, SignatureContainerType.class, null, value);
+        return new JAXBElement<>(_Signature_QNAME, SignatureContainerType.class, null, value);
     }
 
     /**
@@ -266,7 +278,7 @@ public JAXBElement<SignatureContainerType> createSignature(SignatureContainerTyp
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "timestamp")
     public JAXBElement<TimestampType> createTimestamp(TimestampType value) {
-        return new JAXBElement<TimestampType>(_Timestamp_QNAME, TimestampType.class, null, value);
+        return new JAXBElement<>(_Timestamp_QNAME, TimestampType.class, null, value);
     }
 
     /**
@@ -279,7 +291,7 @@ public JAXBElement<TimestampType> createTimestamp(TimestampType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "user")
     public JAXBElement<QualifiedId> createUser(QualifiedId value) {
-        return new JAXBElement<QualifiedId>(_User_QNAME, QualifiedId.class, null, value);
+        return new JAXBElement<>(_User_QNAME, QualifiedId.class, null, value);
     }
 
     /**
@@ -292,7 +304,7 @@ public JAXBElement<QualifiedId> createUser(QualifiedId value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", name = "hpio")
     public JAXBElement<QualifiedId> createHpio(QualifiedId value) {
-        return new JAXBElement<QualifiedId>(_Hpio_QNAME, QualifiedId.class, null, value);
+        return new JAXBElement<>(_Hpio_QNAME, QualifiedId.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ProductType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ProductType.java
index 617c230..c10e8b6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ProductType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ProductType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3.QualifiedId;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProductType complex type</p>.
+ * &lt;p&gt;Java class for ProductType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProductType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessageType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessageType.java
index 7429d2f..28b0d43 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessageType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessageType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SeverityType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ServiceMessageType complex type</p>.
+ * &lt;p&gt;Java class for ServiceMessageType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ServiceMessageType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessagesType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessagesType.java
index 6d43ac0..a5c5822 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessagesType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/ServiceMessagesType.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SeverityType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ServiceMessagesType complex type</p>.
+ * &lt;p&gt;Java class for ServiceMessagesType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ServiceMessagesType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -73,8 +73,8 @@ public void setHighestSeverity(SeverityType value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the serviceMessage property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the serviceMessage property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -95,7 +95,7 @@ public void setHighestSeverity(SeverityType value) {
      */
     public List<ServiceMessageType> getServiceMessage() {
         if (serviceMessage == null) {
-            serviceMessage = new ArrayList<ServiceMessageType>();
+            serviceMessage = new ArrayList<>();
         }
         return this.serviceMessage;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/SignatureContainerType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/SignatureContainerType.java
index fb6c9cc..6a2f74e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/SignatureContainerType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/SignatureContainerType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import hi_override.org.w3.xmldsig.SignatureType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3._2000._09.xmldsig_.SignatureType;
 
 
 /**
- * <p>Java class for SignatureContainerType complex type</p>.
+ * &lt;p&gt;Java class for SignatureContainerType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignatureContainerType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/TimestampType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/TimestampType.java
index 0692b45..019237b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/TimestampType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/TimestampType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for TimestampType complex type</p>.
+ * &lt;p&gt;Java class for TimestampType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="TimestampType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/package-info.java
index 35c948b..95cd9ee 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/commoncoreelements/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/electroniccommunicationcore/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/electroniccommunicationcore/_3/ObjectFactory.java
index d9bbe6b..61eb33f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/electroniccommunicationcore/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/electroniccommunicationcore/_3/ObjectFactory.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.MediumType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.UsageType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.electroniccommunicationcore._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -47,7 +47,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/ElectronicCommunicationCore/3.0", name = "usage")
     public JAXBElement<UsageType> createUsage(UsageType value) {
-        return new JAXBElement<UsageType>(_Usage_QNAME, UsageType.class, null, value);
+        return new JAXBElement<>(_Usage_QNAME, UsageType.class, null, value);
     }
 
     /**
@@ -60,7 +60,7 @@ public JAXBElement<UsageType> createUsage(UsageType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/ElectronicCommunicationCore/3.0", name = "medium")
     public JAXBElement<MediumType> createMedium(MediumType value) {
-        return new JAXBElement<MediumType>(_Medium_QNAME, MediumType.class, null, value);
+        return new JAXBElement<>(_Medium_QNAME, MediumType.class, null, value);
     }
 
     /**
@@ -73,7 +73,7 @@ public JAXBElement<MediumType> createMedium(MediumType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/ElectronicCommunicationCore/3.0", name = "details")
     public JAXBElement<String> createDetails(String value) {
-        return new JAXBElement<String>(_Details_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Details_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/individualnamecore/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/individualnamecore/_3/ObjectFactory.java
index 46a3772..8de034a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/individualnamecore/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/individualnamecore/_3/ObjectFactory.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.individualnamecore._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -49,7 +49,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", name = "familyName")
     public JAXBElement<String> createFamilyName(String value) {
-        return new JAXBElement<String>(_FamilyName_QNAME, String.class, null, value);
+        return new JAXBElement<>(_FamilyName_QNAME, String.class, null, value);
     }
 
     /**
@@ -62,7 +62,7 @@ public JAXBElement<String> createFamilyName(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", name = "givenName")
     public JAXBElement<String> createGivenName(String value) {
-        return new JAXBElement<String>(_GivenName_QNAME, String.class, null, value);
+        return new JAXBElement<>(_GivenName_QNAME, String.class, null, value);
     }
 
     /**
@@ -75,7 +75,7 @@ public JAXBElement<String> createGivenName(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", name = "nameTitle")
     public JAXBElement<String> createNameTitle(String value) {
-        return new JAXBElement<String>(_NameTitle_QNAME, String.class, null, value);
+        return new JAXBElement<>(_NameTitle_QNAME, String.class, null, value);
     }
 
     /**
@@ -88,7 +88,7 @@ public JAXBElement<String> createNameTitle(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", name = "nameSuffix")
     public JAXBElement<NameSuffixType> createNameSuffix(NameSuffixType value) {
-        return new JAXBElement<NameSuffixType>(_NameSuffix_QNAME, NameSuffixType.class, null, value);
+        return new JAXBElement<>(_NameSuffix_QNAME, NameSuffixType.class, null, value);
     }
 
     /**
@@ -101,7 +101,7 @@ public JAXBElement<NameSuffixType> createNameSuffix(NameSuffixType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", name = "usage")
     public JAXBElement<IndividualNameUsageType> createUsage(IndividualNameUsageType value) {
-        return new JAXBElement<IndividualNameUsageType>(_Usage_QNAME, IndividualNameUsageType.class, null, value);
+        return new JAXBElement<>(_Usage_QNAME, IndividualNameUsageType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/ObjectFactory.java
index 9cc14e3..66016ce 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link QualifiedId }
      * 
+     * @return
+     *     the new instance of {@link QualifiedId }
      */
     public QualifiedId createQualifiedId() {
         return new QualifiedId();
@@ -51,7 +53,7 @@ public QualifiedId createQualifiedId() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/QualifiedIdentifier/3.0", name = "qualifiedId")
     public JAXBElement<QualifiedId> createQualifiedId(QualifiedId value) {
-        return new JAXBElement<QualifiedId>(_QualifiedId_QNAME, QualifiedId.class, null, value);
+        return new JAXBElement<>(_QualifiedId_QNAME, QualifiedId.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/QualifiedId.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/QualifiedId.java
index 9df88f6..085389f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/QualifiedId.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/QualifiedId.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for QualifiedId complex type</p>.
+ * &lt;p&gt;Java class for QualifiedId complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="QualifiedId"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/package-info.java
index dd8d7f5..f8e4b5d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/common/qualifiedidentifier/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/QualifiedIdentifier/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/QualifiedIdentifier/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.common.qualifiedidentifier._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AddressType.java
index 3e7f5d3..118bbc7 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AddressType.java
@@ -1,21 +1,21 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.AddressPurposeType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AddressType complex type</p>.
+ * &lt;p&gt;Java class for AddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -30,7 +30,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianPostalAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianPostalAddressType.java
index 50d3016..66235f4 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianPostalAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianPostalAddressType.java
@@ -1,21 +1,21 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.PostalDeliveryGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AustralianPostalAddressType complex type</p>.
+ * &lt;p&gt;Java class for AustralianPostalAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AustralianPostalAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -28,7 +28,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianStreetAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianStreetAddressType.java
index 54860fb..465b3fb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianStreetAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianStreetAddressType.java
@@ -1,24 +1,24 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.LevelGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.UnitGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetSuffixType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AustralianStreetAddressType complex type</p>.
+ * &lt;p&gt;Java class for AustralianStreetAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AustralianStreetAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -38,7 +38,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianUnstructuredStreetAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianUnstructuredStreetAddressType.java
index 5200dbc..449dee9 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianUnstructuredStreetAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/AustralianUnstructuredStreetAddressType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AustralianUnstructuredStreetAddressType complex type</p>.
+ * &lt;p&gt;Java class for AustralianUnstructuredStreetAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AustralianUnstructuredStreetAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -28,7 +28,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/InternationalAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/InternationalAddressType.java
index 3fad4d2..3a61c43 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/InternationalAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/InternationalAddressType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for InternationalAddressType complex type</p>.
+ * &lt;p&gt;Java class for InternationalAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="InternationalAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/ObjectFactory.java
index b5746dd..988c07a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.address._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -26,8 +26,8 @@ public class ObjectFactory {
 
     private static final QName _AustralianPostalAddress_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "australianPostalAddress");
     private static final QName _AustralianStreetAddress_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "australianStreetAddress");
-    private static final QName _InternationalAddress_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "internationalAddress");
     private static final QName _AustralianUnstructuredStreetAddress_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "australianUnstructuredStreetAddress");
+    private static final QName _InternationalAddress_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "internationalAddress");
     private static final QName _Suburb_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "suburb");
     private static final QName _InternationalAddressLine_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "internationalAddressLine");
     private static final QName _Address_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", "address");
@@ -44,6 +44,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link AustralianPostalAddressType }
      * 
+     * @return
+     *     the new instance of {@link AustralianPostalAddressType }
      */
     public AustralianPostalAddressType createAustralianPostalAddressType() {
         return new AustralianPostalAddressType();
@@ -52,30 +54,38 @@ public AustralianPostalAddressType createAustralianPostalAddressType() {
     /**
      * Create an instance of {@link AustralianStreetAddressType }
      * 
+     * @return
+     *     the new instance of {@link AustralianStreetAddressType }
      */
     public AustralianStreetAddressType createAustralianStreetAddressType() {
         return new AustralianStreetAddressType();
     }
 
     /**
-     * Create an instance of {@link InternationalAddressType }
+     * Create an instance of {@link AustralianUnstructuredStreetAddressType }
      * 
+     * @return
+     *     the new instance of {@link AustralianUnstructuredStreetAddressType }
      */
-    public InternationalAddressType createInternationalAddressType() {
-        return new InternationalAddressType();
+    public AustralianUnstructuredStreetAddressType createAustralianUnstructuredStreetAddressType() {
+        return new AustralianUnstructuredStreetAddressType();
     }
 
     /**
-     * Create an instance of {@link AustralianUnstructuredStreetAddressType }
+     * Create an instance of {@link InternationalAddressType }
      * 
+     * @return
+     *     the new instance of {@link InternationalAddressType }
      */
-    public AustralianUnstructuredStreetAddressType createAustralianUnstructuredStreetAddressType() {
-        return new AustralianUnstructuredStreetAddressType();
+    public InternationalAddressType createInternationalAddressType() {
+        return new InternationalAddressType();
     }
 
     /**
      * Create an instance of {@link AddressType }
      * 
+     * @return
+     *     the new instance of {@link AddressType }
      */
     public AddressType createAddressType() {
         return new AddressType();
@@ -91,7 +101,7 @@ public AddressType createAddressType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "australianPostalAddress")
     public JAXBElement<AustralianPostalAddressType> createAustralianPostalAddress(AustralianPostalAddressType value) {
-        return new JAXBElement<AustralianPostalAddressType>(_AustralianPostalAddress_QNAME, AustralianPostalAddressType.class, null, value);
+        return new JAXBElement<>(_AustralianPostalAddress_QNAME, AustralianPostalAddressType.class, null, value);
     }
 
     /**
@@ -104,33 +114,33 @@ public JAXBElement<AustralianPostalAddressType> createAustralianPostalAddress(Au
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "australianStreetAddress")
     public JAXBElement<AustralianStreetAddressType> createAustralianStreetAddress(AustralianStreetAddressType value) {
-        return new JAXBElement<AustralianStreetAddressType>(_AustralianStreetAddress_QNAME, AustralianStreetAddressType.class, null, value);
+        return new JAXBElement<>(_AustralianStreetAddress_QNAME, AustralianStreetAddressType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link InternationalAddressType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AustralianUnstructuredStreetAddressType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link InternationalAddressType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AustralianUnstructuredStreetAddressType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "internationalAddress")
-    public JAXBElement<InternationalAddressType> createInternationalAddress(InternationalAddressType value) {
-        return new JAXBElement<InternationalAddressType>(_InternationalAddress_QNAME, InternationalAddressType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "australianUnstructuredStreetAddress")
+    public JAXBElement<AustralianUnstructuredStreetAddressType> createAustralianUnstructuredStreetAddress(AustralianUnstructuredStreetAddressType value) {
+        return new JAXBElement<>(_AustralianUnstructuredStreetAddress_QNAME, AustralianUnstructuredStreetAddressType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AustralianUnstructuredStreetAddressType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link InternationalAddressType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AustralianUnstructuredStreetAddressType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link InternationalAddressType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "australianUnstructuredStreetAddress")
-    public JAXBElement<AustralianUnstructuredStreetAddressType> createAustralianUnstructuredStreetAddress(AustralianUnstructuredStreetAddressType value) {
-        return new JAXBElement<AustralianUnstructuredStreetAddressType>(_AustralianUnstructuredStreetAddress_QNAME, AustralianUnstructuredStreetAddressType.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "internationalAddress")
+    public JAXBElement<InternationalAddressType> createInternationalAddress(InternationalAddressType value) {
+        return new JAXBElement<>(_InternationalAddress_QNAME, InternationalAddressType.class, null, value);
     }
 
     /**
@@ -143,7 +153,7 @@ public JAXBElement<AustralianUnstructuredStreetAddressType> createAustralianUnst
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "suburb")
     public JAXBElement<String> createSuburb(String value) {
-        return new JAXBElement<String>(_Suburb_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Suburb_QNAME, String.class, null, value);
     }
 
     /**
@@ -156,7 +166,7 @@ public JAXBElement<String> createSuburb(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "internationalAddressLine")
     public JAXBElement<String> createInternationalAddressLine(String value) {
-        return new JAXBElement<String>(_InternationalAddressLine_QNAME, String.class, null, value);
+        return new JAXBElement<>(_InternationalAddressLine_QNAME, String.class, null, value);
     }
 
     /**
@@ -169,7 +179,7 @@ public JAXBElement<String> createInternationalAddressLine(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "address")
     public JAXBElement<AddressType> createAddress(AddressType value) {
-        return new JAXBElement<AddressType>(_Address_QNAME, AddressType.class, null, value);
+        return new JAXBElement<>(_Address_QNAME, AddressType.class, null, value);
     }
 
     /**
@@ -182,7 +192,7 @@ public JAXBElement<AddressType> createAddress(AddressType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "addressLineOne")
     public JAXBElement<String> createAddressLineOne(String value) {
-        return new JAXBElement<String>(_AddressLineOne_QNAME, String.class, null, value);
+        return new JAXBElement<>(_AddressLineOne_QNAME, String.class, null, value);
     }
 
     /**
@@ -195,7 +205,7 @@ public JAXBElement<String> createAddressLineOne(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", name = "addressLineTwo")
     public JAXBElement<String> createAddressLineTwo(String value) {
-        return new JAXBElement<String>(_AddressLineTwo_QNAME, String.class, null, value);
+        return new JAXBElement<>(_AddressLineTwo_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/package-info.java
index b154856..7b60091 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/address/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.consumercore.address._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIRecordStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIRecordStatusType.java
index 23422ff..01e2b4c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIRecordStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIRecordStatusType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for IHIRecordStatusType</p>.
+ * &lt;p&gt;Java class for IHIRecordStatusType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="IHIRecordStatusType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
  *     &lt;enumeration value="Provisional"/&gt;
@@ -20,7 +20,7 @@
  *     &lt;enumeration value="Verified"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "IHIRecordStatusType", namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIStatusType.java
index 068e45f..db5cce5 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/IHIStatusType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for IHIStatusType</p>.
+ * &lt;p&gt;Java class for IHIStatusType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="IHIStatusType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
  *     &lt;enumeration value="Active"/&gt;
@@ -22,7 +22,7 @@
  *     &lt;enumeration value="Retired"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "IHIStatusType", namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/ObjectFactory.java
index 7810f03..0348fee 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/SourceOfDeathNotificationType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/SourceOfDeathNotificationType.java
index 75cbe77..426032b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/SourceOfDeathNotificationType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3/SourceOfDeathNotificationType.java
@@ -1,24 +1,24 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for SourceOfDeathNotificationType</p>.
+ * &lt;p&gt;Java class for SourceOfDeathNotificationType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="SourceOfDeathNotificationType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
  *     &lt;length value="1"/&gt;
  *     &lt;enumeration value="H"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "SourceOfDeathNotificationType", namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreDatatypes/3.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/IHIRecordStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/IHIRecordStatusType.java
new file mode 100644
index 0000000..8ab288a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/IHIRecordStatusType.java
@@ -0,0 +1,86 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2;
+
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ * &lt;p&gt;Java class for IHIRecordStatusType&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
+ * &lt;simpleType name="IHIRecordStatusType"&gt;
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
+ *     &lt;enumeration value="Provisional"/&gt;
+ *     &lt;enumeration value="Unverified"/&gt;
+ *     &lt;enumeration value="Verified"/&gt;
+ *   &lt;/restriction&gt;
+ * &lt;/simpleType&gt;
+ * }&lt;/pre&gt;
+ * 
+ */
+@XmlType(name = "IHIRecordStatusType", namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreDatatypes/3.2.0")
+@XmlEnum
+public enum IHIRecordStatusType {
+
+
+    /**
+     * Provisional
+     * 
+     */
+    @XmlEnumValue("Provisional")
+    PROVISIONAL("Provisional"),
+
+    /**
+     * Unverified
+     * 
+     */
+    @XmlEnumValue("Unverified")
+    UNVERIFIED("Unverified"),
+
+    /**
+     * Verified
+     * 
+     */
+    @XmlEnumValue("Verified")
+    VERIFIED("Verified");
+    private final String value;
+
+    IHIRecordStatusType(String v) {
+        value = v;
+    }
+
+    /**
+     * Gets the value associated to the enum constant.
+     * 
+     * @return
+     *     The value linked to the enum.
+     */
+    public String value() {
+        return value;
+    }
+
+    /**
+     * Gets the enum associated to the value passed as parameter.
+     * 
+     * @param v
+     *     The value to get the enum from.
+     * @return
+     *     The enum which corresponds to the value, if it exists.
+     * @throws IllegalArgumentException
+     *     If no value matches in the enum declaration.
+     */
+    public static IHIRecordStatusType fromValue(String v) {
+        for (IHIRecordStatusType c: IHIRecordStatusType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/IHIStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/IHIStatusType.java
new file mode 100644
index 0000000..96c9b53
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/IHIStatusType.java
@@ -0,0 +1,102 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2;
+
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ * &lt;p&gt;Java class for IHIStatusType&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
+ * &lt;simpleType name="IHIStatusType"&gt;
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
+ *     &lt;enumeration value="Active"/&gt;
+ *     &lt;enumeration value="Deceased"/&gt;
+ *     &lt;enumeration value="Expired"/&gt;
+ *     &lt;enumeration value="Resolved"/&gt;
+ *     &lt;enumeration value="Retired"/&gt;
+ *   &lt;/restriction&gt;
+ * &lt;/simpleType&gt;
+ * }&lt;/pre&gt;
+ * 
+ */
+@XmlType(name = "IHIStatusType", namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreDatatypes/3.2.0")
+@XmlEnum
+public enum IHIStatusType {
+
+
+    /**
+     * Active
+     * 
+     */
+    @XmlEnumValue("Active")
+    ACTIVE("Active"),
+
+    /**
+     * Deceased
+     * 
+     */
+    @XmlEnumValue("Deceased")
+    DECEASED("Deceased"),
+
+    /**
+     * Expired
+     * 
+     */
+    @XmlEnumValue("Expired")
+    EXPIRED("Expired"),
+
+    /**
+     * Resolved
+     * 
+     */
+    @XmlEnumValue("Resolved")
+    RESOLVED("Resolved"),
+
+    /**
+     * Retired
+     * 
+     */
+    @XmlEnumValue("Retired")
+    RETIRED("Retired");
+    private final String value;
+
+    IHIStatusType(String v) {
+        value = v;
+    }
+
+    /**
+     * Gets the value associated to the enum constant.
+     * 
+     * @return
+     *     The value linked to the enum.
+     */
+    public String value() {
+        return value;
+    }
+
+    /**
+     * Gets the enum associated to the value passed as parameter.
+     * 
+     * @param v
+     *     The value to get the enum from.
+     * @return
+     *     The enum which corresponds to the value, if it exists.
+     * @throws IllegalArgumentException
+     *     If no value matches in the enum declaration.
+     */
+    public static IHIStatusType fromValue(String v) {
+        for (IHIStatusType c: IHIStatusType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..a2497bc
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/ObjectFactory.java
@@ -0,0 +1,32 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/SourceOfDeathNotificationType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/SourceOfDeathNotificationType.java
new file mode 100644
index 0000000..4f2852a
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoredatatypes/_3_2/SourceOfDeathNotificationType.java
@@ -0,0 +1,43 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2;
+
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ * &lt;p&gt;Java class for SourceOfDeathNotificationType&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
+ * &lt;simpleType name="SourceOfDeathNotificationType"&gt;
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token"&gt;
+ *     &lt;length value="1"/&gt;
+ *     &lt;enumeration value="H"/&gt;
+ *   &lt;/restriction&gt;
+ * &lt;/simpleType&gt;
+ * }&lt;/pre&gt;
+ * 
+ */
+@XmlType(name = "SourceOfDeathNotificationType", namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreDatatypes/3.2.0")
+@XmlEnum
+public enum SourceOfDeathNotificationType {
+
+
+    /**
+     * Health Care Provider
+     * 
+     */
+    H;
+
+    public String value() {
+        return name();
+    }
+
+    public static SourceOfDeathNotificationType fromValue(String v) {
+        return valueOf(v);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3/ObjectFactory.java
index ead42d2..d54da5f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3/ObjectFactory.java
@@ -1,23 +1,23 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -59,7 +59,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "ihiNumber")
     public JAXBElement<String> createIhiNumber(String value) {
-        return new JAXBElement<String>(_IhiNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_IhiNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -73,7 +73,7 @@ public JAXBElement<String> createIhiNumber(String value) {
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "medicareCardNumber")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     public JAXBElement<String> createMedicareCardNumber(String value) {
-        return new JAXBElement<String>(_MedicareCardNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_MedicareCardNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -86,7 +86,7 @@ public JAXBElement<String> createMedicareCardNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "medicareIRN")
     public JAXBElement<Integer> createMedicareIRN(Integer value) {
-        return new JAXBElement<Integer>(_MedicareIRN_QNAME, Integer.class, null, value);
+        return new JAXBElement<>(_MedicareIRN_QNAME, Integer.class, null, value);
     }
 
     /**
@@ -100,7 +100,7 @@ public JAXBElement<Integer> createMedicareIRN(Integer value) {
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "dvaFileNumber")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     public JAXBElement<String> createDvaFileNumber(String value) {
-        return new JAXBElement<String>(_DvaFileNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_DvaFileNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -113,7 +113,7 @@ public JAXBElement<String> createDvaFileNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "history")
     public JAXBElement<TrueFalseType> createHistory(TrueFalseType value) {
-        return new JAXBElement<TrueFalseType>(_History_QNAME, TrueFalseType.class, null, value);
+        return new JAXBElement<>(_History_QNAME, TrueFalseType.class, null, value);
     }
 
     /**
@@ -126,7 +126,7 @@ public JAXBElement<TrueFalseType> createHistory(TrueFalseType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "ihiRecordStatus")
     public JAXBElement<IHIRecordStatusType> createIhiRecordStatus(IHIRecordStatusType value) {
-        return new JAXBElement<IHIRecordStatusType>(_IhiRecordStatus_QNAME, IHIRecordStatusType.class, null, value);
+        return new JAXBElement<>(_IhiRecordStatus_QNAME, IHIRecordStatusType.class, null, value);
     }
 
     /**
@@ -139,7 +139,7 @@ public JAXBElement<IHIRecordStatusType> createIhiRecordStatus(IHIRecordStatusTyp
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "ihiStatus")
     public JAXBElement<IHIStatusType> createIhiStatus(IHIStatusType value) {
-        return new JAXBElement<IHIStatusType>(_IhiStatus_QNAME, IHIStatusType.class, null, value);
+        return new JAXBElement<>(_IhiStatus_QNAME, IHIStatusType.class, null, value);
     }
 
     /**
@@ -153,7 +153,7 @@ public JAXBElement<IHIStatusType> createIhiStatus(IHIStatusType value) {
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "birthPlurality")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     public JAXBElement<String> createBirthPlurality(String value) {
-        return new JAXBElement<String>(_BirthPlurality_QNAME, String.class, null, value);
+        return new JAXBElement<>(_BirthPlurality_QNAME, String.class, null, value);
     }
 
     /**
@@ -167,7 +167,7 @@ public JAXBElement<String> createBirthPlurality(String value) {
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "birthOrder")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     public JAXBElement<String> createBirthOrder(String value) {
-        return new JAXBElement<String>(_BirthOrder_QNAME, String.class, null, value);
+        return new JAXBElement<>(_BirthOrder_QNAME, String.class, null, value);
     }
 
     /**
@@ -180,7 +180,7 @@ public JAXBElement<String> createBirthOrder(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "sourceOfDeathNotification")
     public JAXBElement<SourceOfDeathNotificationType> createSourceOfDeathNotification(SourceOfDeathNotificationType value) {
-        return new JAXBElement<SourceOfDeathNotificationType>(_SourceOfDeathNotification_QNAME, SourceOfDeathNotificationType.class, null, value);
+        return new JAXBElement<>(_SourceOfDeathNotification_QNAME, SourceOfDeathNotificationType.class, null, value);
     }
 
     /**
@@ -193,7 +193,7 @@ public JAXBElement<SourceOfDeathNotificationType> createSourceOfDeathNotificatio
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", name = "privacyNotification")
     public JAXBElement<Boolean> createPrivacyNotification(Boolean value) {
-        return new JAXBElement<Boolean>(_PrivacyNotification_QNAME, Boolean.class, null, value);
+        return new JAXBElement<>(_PrivacyNotification_QNAME, Boolean.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/IHINumberStatusGroupType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/IHINumberStatusGroupType.java
new file mode 100644
index 0000000..7dec0d1
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/IHINumberStatusGroupType.java
@@ -0,0 +1,124 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for IHINumberStatusGroupType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="IHINumberStatusGroupType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiRecordStatus"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiStatus"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IHINumberStatusGroupType", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus"
+})
+public class IHINumberStatusGroupType {
+
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..b325af1
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/ObjectFactory.java
@@ -0,0 +1,223 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2;
+
+import javax.xml.namespace.QName;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.SourceOfDeathNotificationType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _IhiNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "ihiNumber");
+    private static final QName _Comment_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "comment");
+    private static final QName _IhiNumberStatusGroup_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "ihiNumberStatusGroup");
+    private static final QName _BirthPlurality_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "birthPlurality");
+    private static final QName _BirthOrder_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "birthOrder");
+    private static final QName _SourceOfDeathNotification_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "sourceOfDeathNotification");
+    private static final QName _MedicareIRN_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "medicareIRN");
+    private static final QName _MedicareCardNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "medicareCardNumber");
+    private static final QName _DvaFileNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "dvaFileNumber");
+    private static final QName _IhiRecordStatus_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "ihiRecordStatus");
+    private static final QName _IhiStatus_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "ihiStatus");
+    private static final QName _History_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", "history");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link IHINumberStatusGroupType }
+     * 
+     * @return
+     *     the new instance of {@link IHINumberStatusGroupType }
+     */
+    public IHINumberStatusGroupType createIHINumberStatusGroupType() {
+        return new IHINumberStatusGroupType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "ihiNumber")
+    public JAXBElement<String> createIhiNumber(String value) {
+        return new JAXBElement<>(_IhiNumber_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "comment")
+    public JAXBElement<String> createComment(String value) {
+        return new JAXBElement<>(_Comment_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IHINumberStatusGroupType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link IHINumberStatusGroupType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "ihiNumberStatusGroup")
+    public JAXBElement<IHINumberStatusGroupType> createIhiNumberStatusGroup(IHINumberStatusGroupType value) {
+        return new JAXBElement<>(_IhiNumberStatusGroup_QNAME, IHINumberStatusGroupType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "birthPlurality")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createBirthPlurality(String value) {
+        return new JAXBElement<>(_BirthPlurality_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "birthOrder")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createBirthOrder(String value) {
+        return new JAXBElement<>(_BirthOrder_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SourceOfDeathNotificationType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SourceOfDeathNotificationType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "sourceOfDeathNotification")
+    public JAXBElement<SourceOfDeathNotificationType> createSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        return new JAXBElement<>(_SourceOfDeathNotification_QNAME, SourceOfDeathNotificationType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "medicareIRN")
+    public JAXBElement<Integer> createMedicareIRN(Integer value) {
+        return new JAXBElement<>(_MedicareIRN_QNAME, Integer.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "medicareCardNumber")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createMedicareCardNumber(String value) {
+        return new JAXBElement<>(_MedicareCardNumber_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "dvaFileNumber")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createDvaFileNumber(String value) {
+        return new JAXBElement<>(_DvaFileNumber_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IHIRecordStatusType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link IHIRecordStatusType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "ihiRecordStatus")
+    public JAXBElement<IHIRecordStatusType> createIhiRecordStatus(IHIRecordStatusType value) {
+        return new JAXBElement<>(_IhiRecordStatus_QNAME, IHIRecordStatusType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IHIStatusType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link IHIStatusType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "ihiStatus")
+    public JAXBElement<IHIStatusType> createIhiStatus(IHIStatusType value) {
+        return new JAXBElement<>(_IhiStatus_QNAME, IHIStatusType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TrueFalseType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link TrueFalseType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", name = "history")
+    public JAXBElement<TrueFalseType> createHistory(TrueFalseType value) {
+        return new JAXBElement<>(_History_QNAME, TrueFalseType.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/package-info.java
new file mode 100644
index 0000000..d0e2ffe
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/consumercoreelements/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ElectronicCommunicationType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ElectronicCommunicationType.java
index bfbc564..9c64356 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ElectronicCommunicationType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ElectronicCommunicationType.java
@@ -1,22 +1,22 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.MediumType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.UsageType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ElectronicCommunicationType complex type</p>.
+ * &lt;p&gt;Java class for ElectronicCommunicationType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ElectronicCommunicationType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ObjectFactory.java
index acb61f7..b2c0cd8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ElectronicCommunicationType }
      * 
+     * @return
+     *     the new instance of {@link ElectronicCommunicationType }
      */
     public ElectronicCommunicationType createElectronicCommunicationType() {
         return new ElectronicCommunicationType();
@@ -52,7 +54,7 @@ public ElectronicCommunicationType createElectronicCommunicationType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0", name = "electronicCommunication")
     public JAXBElement<ElectronicCommunicationType> createElectronicCommunication(ElectronicCommunicationType value) {
-        return new JAXBElement<ElectronicCommunicationType>(_ElectronicCommunication_QNAME, ElectronicCommunicationType.class, null, value);
+        return new JAXBElement<>(_ElectronicCommunication_QNAME, ElectronicCommunicationType.class, null, value);
     }
 
     /**
@@ -65,7 +67,7 @@ public JAXBElement<ElectronicCommunicationType> createElectronicCommunication(El
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0", name = "details")
     public JAXBElement<String> createDetails(String value) {
-        return new JAXBElement<String>(_Details_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Details_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/package-info.java
index ad796ee..8a6a50c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/electroniccommunication/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/IndividualHealthcareIdentityType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/IndividualHealthcareIdentityType.java
new file mode 100644
index 0000000..58138cd
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/IndividualHealthcareIdentityType.java
@@ -0,0 +1,275 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for IndividualHealthcareIdentityType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="IndividualHealthcareIdentityType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IndividualHealthcareIdentityType", propOrder = {
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification"
+})
+public class IndividualHealthcareIdentityType {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..f9956ad
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/ObjectFactory.java
@@ -0,0 +1,59 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _IndividualHealthcareIdentity_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0", "individualHealthcareIdentity");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link IndividualHealthcareIdentityType }
+     * 
+     * @return
+     *     the new instance of {@link IndividualHealthcareIdentityType }
+     */
+    public IndividualHealthcareIdentityType createIndividualHealthcareIdentityType() {
+        return new IndividualHealthcareIdentityType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IndividualHealthcareIdentityType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link IndividualHealthcareIdentityType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0", name = "individualHealthcareIdentity")
+    public JAXBElement<IndividualHealthcareIdentityType> createIndividualHealthcareIdentity(IndividualHealthcareIdentityType value) {
+        return new JAXBElement<>(_IndividualHealthcareIdentity_QNAME, IndividualHealthcareIdentityType.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/package-info.java
new file mode 100644
index 0000000..9ede1bc
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/ihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/NameType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/NameType.java
new file mode 100644
index 0000000..ecb63be
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/NameType.java
@@ -0,0 +1,246 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for NameType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="NameType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}preferred"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NameType", propOrder = {
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix",
+    "usage",
+    "preferred",
+    "conditionalUse"
+})
+public class NameType {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected TrueFalseType preferred;
+    protected String conditionalUse;
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the preferred property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrueFalseType }
+     *     
+     */
+    public TrueFalseType getPreferred() {
+        return preferred;
+    }
+
+    /**
+     * Sets the value of the preferred property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrueFalseType }
+     *     
+     */
+    public void setPreferred(TrueFalseType value) {
+        this.preferred = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/ObjectFactory.java
new file mode 100644
index 0000000..be24b4d
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/ObjectFactory.java
@@ -0,0 +1,87 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.name._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _ConditionalUse_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", "conditionalUse");
+    private static final QName _Name_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", "name");
+    private static final QName _OnlyNameIndicator_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", "onlyNameIndicator");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumercore.name._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NameType }
+     * 
+     * @return
+     *     the new instance of {@link NameType }
+     */
+    public NameType createNameType() {
+        return new NameType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", name = "conditionalUse")
+    public JAXBElement<String> createConditionalUse(String value) {
+        return new JAXBElement<>(_ConditionalUse_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NameType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link NameType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", name = "name")
+    public JAXBElement<NameType> createName(NameType value) {
+        return new JAXBElement<>(_Name_QNAME, NameType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", name = "onlyNameIndicator")
+    public JAXBElement<Boolean> createOnlyNameIndicator(Boolean value) {
+        return new JAXBElement<>(_OnlyNameIndicator_QNAME, Boolean.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/package-info.java
new file mode 100644
index 0000000..5240229
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/CurrentNameType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/CurrentNameType.java
new file mode 100644
index 0000000..4620f15
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/CurrentNameType.java
@@ -0,0 +1,159 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for CurrentNameType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="CurrentNameType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CurrentNameType", propOrder = {
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix"
+})
+public class CurrentNameType {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/NameType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/NameType.java
new file mode 100644
index 0000000..57aceb5
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/NameType.java
@@ -0,0 +1,246 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for NameType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="NameType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}preferred" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}conditionalUse" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NameType", propOrder = {
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix",
+    "usage",
+    "preferred",
+    "conditionalUse"
+})
+public class NameType {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected TrueFalseType preferred;
+    protected String conditionalUse;
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the preferred property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TrueFalseType }
+     *     
+     */
+    public TrueFalseType getPreferred() {
+        return preferred;
+    }
+
+    /**
+     * Sets the value of the preferred property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TrueFalseType }
+     *     
+     */
+    public void setPreferred(TrueFalseType value) {
+        this.preferred = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/NameUpdateGroupType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/NameUpdateGroupType.java
new file mode 100644
index 0000000..ac6ba9f
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/NameUpdateGroupType.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for NameUpdateGroupType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="NameUpdateGroupType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}currentName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}updateName"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NameUpdateGroupType", propOrder = {
+    "currentName",
+    "updateName"
+})
+public class NameUpdateGroupType {
+
+    @XmlElement(required = true)
+    protected CurrentNameType currentName;
+    @XmlElement(required = true)
+    protected NameType updateName;
+
+    /**
+     * Gets the value of the currentName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CurrentNameType }
+     *     
+     */
+    public CurrentNameType getCurrentName() {
+        return currentName;
+    }
+
+    /**
+     * Sets the value of the currentName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CurrentNameType }
+     *     
+     */
+    public void setCurrentName(CurrentNameType value) {
+        this.currentName = value;
+    }
+
+    /**
+     * Gets the value of the updateName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameType }
+     *     
+     */
+    public NameType getUpdateName() {
+        return updateName;
+    }
+
+    /**
+     * Sets the value of the updateName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameType }
+     *     
+     */
+    public void setUpdateName(NameType value) {
+        this.updateName = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..f59dc66
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/ObjectFactory.java
@@ -0,0 +1,135 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _Name_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", "name");
+    private static final QName _NameUpdateGroup_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", "nameUpdateGroup");
+    private static final QName _CurrentName_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", "currentName");
+    private static final QName _UpdateName_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", "updateName");
+    private static final QName _ConditionalUse_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", "conditionalUse");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NameType }
+     * 
+     * @return
+     *     the new instance of {@link NameType }
+     */
+    public NameType createNameType() {
+        return new NameType();
+    }
+
+    /**
+     * Create an instance of {@link NameUpdateGroupType }
+     * 
+     * @return
+     *     the new instance of {@link NameUpdateGroupType }
+     */
+    public NameUpdateGroupType createNameUpdateGroupType() {
+        return new NameUpdateGroupType();
+    }
+
+    /**
+     * Create an instance of {@link CurrentNameType }
+     * 
+     * @return
+     *     the new instance of {@link CurrentNameType }
+     */
+    public CurrentNameType createCurrentNameType() {
+        return new CurrentNameType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NameType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link NameType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", name = "name")
+    public JAXBElement<NameType> createName(NameType value) {
+        return new JAXBElement<>(_Name_QNAME, NameType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NameUpdateGroupType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link NameUpdateGroupType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", name = "nameUpdateGroup")
+    public JAXBElement<NameUpdateGroupType> createNameUpdateGroup(NameUpdateGroupType value) {
+        return new JAXBElement<>(_NameUpdateGroup_QNAME, NameUpdateGroupType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CurrentNameType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link CurrentNameType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", name = "currentName")
+    public JAXBElement<CurrentNameType> createCurrentName(CurrentNameType value) {
+        return new JAXBElement<>(_CurrentName_QNAME, CurrentNameType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NameType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link NameType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", name = "updateName")
+    public JAXBElement<NameType> createUpdateName(NameType value) {
+        return new JAXBElement<>(_UpdateName_QNAME, NameType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", name = "conditionalUse")
+    public JAXBElement<String> createConditionalUse(String value) {
+        return new JAXBElement<>(_ConditionalUse_QNAME, String.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/package-info.java
new file mode 100644
index 0000000..02b4a78
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumercore/name/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHI.java
new file mode 100644
index 0000000..68b04c4
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHI.java
@@ -0,0 +1,271 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "familyName",
+    "givenName",
+    "sex",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification"
+})
+@XmlRootElement(name = "createProvisionalIHI")
+public class CreateProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGivenName() {
+        return givenName;
+    }
+
+    /**
+     * Sets the value of the givenName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGivenName(String value) {
+        this.givenName = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHIResponse.java
new file mode 100644
index 0000000..b5d72f7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateProvisionalIHI/3.0}createProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "createProvisionalIHIResult"
+})
+@XmlRootElement(name = "createProvisionalIHIResponse")
+public class CreateProvisionalIHIResponse {
+
+    @XmlElement(required = true)
+    protected CreateProvisionalIHIResult createProvisionalIHIResult;
+
+    /**
+     * Gets the value of the createProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CreateProvisionalIHIResult }
+     *     
+     */
+    public CreateProvisionalIHIResult getCreateProvisionalIHIResult() {
+        return createProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the createProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CreateProvisionalIHIResult }
+     *     
+     */
+    public void setCreateProvisionalIHIResult(CreateProvisionalIHIResult value) {
+        this.createProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHIResult.java
new file mode 100644
index 0000000..c34a1e7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/CreateProvisionalIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "createProvisionalIHIResult")
+public class CreateProvisionalIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..311c171
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link CreateProvisionalIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link CreateProvisionalIHIResult }
+     */
+    public CreateProvisionalIHIResult createCreateProvisionalIHIResult() {
+        return new CreateProvisionalIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link CreateProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link CreateProvisionalIHI }
+     */
+    public CreateProvisionalIHI createCreateProvisionalIHI() {
+        return new CreateProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link CreateProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link CreateProvisionalIHIResponse }
+     */
+    public CreateProvisionalIHIResponse createCreateProvisionalIHIResponse() {
+        return new CreateProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..bf32ff9
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHI.java
new file mode 100644
index 0000000..1511236
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHI.java
@@ -0,0 +1,322 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.ihi._3.IndividualHealthcareIdentityType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0}individualHealthcareIdentity"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address" maxOccurs="2" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "individualHealthcareIdentity",
+    "electronicCommunication",
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix",
+    "usage",
+    "conditionalUse",
+    "address"
+})
+@XmlRootElement(name = "createUnverifiedIHI")
+public class CreateUnverifiedIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0", required = true)
+    protected IndividualHealthcareIdentityType individualHealthcareIdentity;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected String conditionalUse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected List<AddressType> address;
+
+    /**
+     * Gets the value of the individualHealthcareIdentity property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualHealthcareIdentityType }
+     *     
+     */
+    public IndividualHealthcareIdentityType getIndividualHealthcareIdentity() {
+        return individualHealthcareIdentity;
+    }
+
+    /**
+     * Sets the value of the individualHealthcareIdentity property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualHealthcareIdentityType }
+     *     
+     */
+    public void setIndividualHealthcareIdentity(IndividualHealthcareIdentityType value) {
+        this.individualHealthcareIdentity = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the address property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddress().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AddressType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the address property.
+     */
+    public List<AddressType> getAddress() {
+        if (address == null) {
+            address = new ArrayList<>();
+        }
+        return this.address;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHIResponse.java
new file mode 100644
index 0000000..0412013
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateUnverifiedIHI/3.0}createUnverifiedIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "createUnverifiedIHIResult"
+})
+@XmlRootElement(name = "createUnverifiedIHIResponse")
+public class CreateUnverifiedIHIResponse {
+
+    @XmlElement(required = true)
+    protected CreateUnverifiedIHIResult createUnverifiedIHIResult;
+
+    /**
+     * Gets the value of the createUnverifiedIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CreateUnverifiedIHIResult }
+     *     
+     */
+    public CreateUnverifiedIHIResult getCreateUnverifiedIHIResult() {
+        return createUnverifiedIHIResult;
+    }
+
+    /**
+     * Sets the value of the createUnverifiedIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CreateUnverifiedIHIResult }
+     *     
+     */
+    public void setCreateUnverifiedIHIResult(CreateUnverifiedIHIResult value) {
+        this.createUnverifiedIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHIResult.java
new file mode 100644
index 0000000..579c9ca
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/CreateUnverifiedIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "createUnverifiedIHIResult")
+public class CreateUnverifiedIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..2d1bacb
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link CreateUnverifiedIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link CreateUnverifiedIHIResult }
+     */
+    public CreateUnverifiedIHIResult createCreateUnverifiedIHIResult() {
+        return new CreateUnverifiedIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link CreateUnverifiedIHI }
+     * 
+     * @return
+     *     the new instance of {@link CreateUnverifiedIHI }
+     */
+    public CreateUnverifiedIHI createCreateUnverifiedIHI() {
+        return new CreateUnverifiedIHI();
+    }
+
+    /**
+     * Create an instance of {@link CreateUnverifiedIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link CreateUnverifiedIHIResponse }
+     */
+    public CreateUnverifiedIHIResponse createCreateUnverifiedIHIResponse() {
+        return new CreateUnverifiedIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/package-info.java
new file mode 100644
index 0000000..bdcff45
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createunverifiedihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateUnverifiedIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createunverifiedihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIResponse.java
new file mode 100644
index 0000000..20cd8df
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0}createVerifiedIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "createVerifiedIHIResult"
+})
+@XmlRootElement(name = "createVerifiedIHIResponse")
+public class CreateVerifiedIHIResponse {
+
+    @XmlElement(required = true)
+    protected CreateVerifiedIHIResultType createVerifiedIHIResult;
+
+    /**
+     * Gets the value of the createVerifiedIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CreateVerifiedIHIResultType }
+     *     
+     */
+    public CreateVerifiedIHIResultType getCreateVerifiedIHIResult() {
+        return createVerifiedIHIResult;
+    }
+
+    /**
+     * Sets the value of the createVerifiedIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CreateVerifiedIHIResultType }
+     *     
+     */
+    public void setCreateVerifiedIHIResult(CreateVerifiedIHIResultType value) {
+        this.createVerifiedIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIResultType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIResultType.java
new file mode 100644
index 0000000..bf683eb
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIResultType.java
@@ -0,0 +1,153 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for CreateVerifiedIHIResultType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="CreateVerifiedIHIResultType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CreateVerifiedIHIResultType", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+public class CreateVerifiedIHIResultType {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIType.java
new file mode 100644
index 0000000..bd728d3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/CreateVerifiedIHIType.java
@@ -0,0 +1,571 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for CreateVerifiedIHIType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="CreateVerifiedIHIType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}onlyNameIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}privacyNotification"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CreateVerifiedIHIType", propOrder = {
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification",
+    "electronicCommunication",
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "onlyNameIndicator",
+    "nameSuffix",
+    "usage",
+    "conditionalUse",
+    "address",
+    "privacyNotification"
+})
+public class CreateVerifiedIHIType {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected Boolean onlyNameIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected String conditionalUse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0", required = true)
+    protected AddressType address;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    protected boolean privacyNotification;
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the onlyNameIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isOnlyNameIndicator() {
+        return onlyNameIndicator;
+    }
+
+    /**
+     * Sets the value of the onlyNameIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setOnlyNameIndicator(Boolean value) {
+        this.onlyNameIndicator = value;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AddressType }
+     *     
+     */
+    public AddressType getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the value of the address property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AddressType }
+     *     
+     */
+    public void setAddress(AddressType value) {
+        this.address = value;
+    }
+
+    /**
+     * Gets the value of the privacyNotification property.
+     * 
+     */
+    public boolean isPrivacyNotification() {
+        return privacyNotification;
+    }
+
+    /**
+     * Sets the value of the privacyNotification property.
+     * 
+     */
+    public void setPrivacyNotification(boolean value) {
+        this.privacyNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/ObjectFactory.java
new file mode 100644
index 0000000..53a3226
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/ObjectFactory.java
@@ -0,0 +1,93 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _CreateVerifiedIHIResult_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0", "createVerifiedIHIResult");
+    private static final QName _CreateVerifiedIHI_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0", "createVerifiedIHI");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link CreateVerifiedIHIResultType }
+     * 
+     * @return
+     *     the new instance of {@link CreateVerifiedIHIResultType }
+     */
+    public CreateVerifiedIHIResultType createCreateVerifiedIHIResultType() {
+        return new CreateVerifiedIHIResultType();
+    }
+
+    /**
+     * Create an instance of {@link CreateVerifiedIHIType }
+     * 
+     * @return
+     *     the new instance of {@link CreateVerifiedIHIType }
+     */
+    public CreateVerifiedIHIType createCreateVerifiedIHIType() {
+        return new CreateVerifiedIHIType();
+    }
+
+    /**
+     * Create an instance of {@link CreateVerifiedIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link CreateVerifiedIHIResponse }
+     */
+    public CreateVerifiedIHIResponse createCreateVerifiedIHIResponse() {
+        return new CreateVerifiedIHIResponse();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CreateVerifiedIHIResultType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link CreateVerifiedIHIResultType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0", name = "createVerifiedIHIResult")
+    public JAXBElement<CreateVerifiedIHIResultType> createCreateVerifiedIHIResult(CreateVerifiedIHIResultType value) {
+        return new JAXBElement<>(_CreateVerifiedIHIResult_QNAME, CreateVerifiedIHIResultType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CreateVerifiedIHIType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link CreateVerifiedIHIType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0", name = "createVerifiedIHI")
+    public JAXBElement<CreateVerifiedIHIType> createCreateVerifiedIHI(CreateVerifiedIHIType value) {
+        return new JAXBElement<>(_CreateVerifiedIHI_QNAME, CreateVerifiedIHIType.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/package-info.java
new file mode 100644
index 0000000..3cc762e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/createverifiedihi/_4_0/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/CreateVerifiedIHI/4.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.createverifiedihi._4_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHI.java
new file mode 100644
index 0000000..69deda3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHI.java
@@ -0,0 +1,76 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber" maxOccurs="2" minOccurs="2"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber"
+})
+@XmlRootElement(name = "mergeProvisionalIHI")
+public class MergeProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected List<String> ihiNumber;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the ihiNumber property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIhiNumber().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the ihiNumber property.
+     */
+    public List<String> getIhiNumber() {
+        if (ihiNumber == null) {
+            ihiNumber = new ArrayList<>();
+        }
+        return this.ihiNumber;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHIResponse.java
new file mode 100644
index 0000000..a053d50
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/MergeProvisionalIHI/3.0}mergeProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "mergeProvisionalIHIResult"
+})
+@XmlRootElement(name = "mergeProvisionalIHIResponse")
+public class MergeProvisionalIHIResponse {
+
+    @XmlElement(required = true)
+    protected MergeProvisionalIHIResult mergeProvisionalIHIResult;
+
+    /**
+     * Gets the value of the mergeProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MergeProvisionalIHIResult }
+     *     
+     */
+    public MergeProvisionalIHIResult getMergeProvisionalIHIResult() {
+        return mergeProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the mergeProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MergeProvisionalIHIResult }
+     *     
+     */
+    public void setMergeProvisionalIHIResult(MergeProvisionalIHIResult value) {
+        this.mergeProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHIResult.java
new file mode 100644
index 0000000..606eb71
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/MergeProvisionalIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "mergeProvisionalIHIResult")
+public class MergeProvisionalIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..c4dc2a8
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link MergeProvisionalIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link MergeProvisionalIHIResult }
+     */
+    public MergeProvisionalIHIResult createMergeProvisionalIHIResult() {
+        return new MergeProvisionalIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link MergeProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link MergeProvisionalIHI }
+     */
+    public MergeProvisionalIHI createMergeProvisionalIHI() {
+        return new MergeProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link MergeProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link MergeProvisionalIHIResponse }
+     */
+    public MergeProvisionalIHIResponse createMergeProvisionalIHIResponse() {
+        return new MergeProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..6e718d3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/mergeprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/MergeProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.mergeprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHI.java
new file mode 100644
index 0000000..e12c8fb
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHI.java
@@ -0,0 +1,104 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber" maxOccurs="12" minOccurs="2"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}comment"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "comment"
+})
+@XmlRootElement(name = "notifyDuplicateIHI")
+public class NotifyDuplicateIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected List<String> ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    protected String comment;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the ihiNumber property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIhiNumber().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the ihiNumber property.
+     */
+    public List<String> getIhiNumber() {
+        if (ihiNumber == null) {
+            ihiNumber = new ArrayList<>();
+        }
+        return this.ihiNumber;
+    }
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHIResponse.java
new file mode 100644
index 0000000..d482313
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyDuplicateIHI/3.2.0}notifyDuplicateIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "notifyDuplicateIHIResult"
+})
+@XmlRootElement(name = "notifyDuplicateIHIResponse")
+public class NotifyDuplicateIHIResponse {
+
+    @XmlElement(required = true)
+    protected NotifyDuplicateIHIResult notifyDuplicateIHIResult;
+
+    /**
+     * Gets the value of the notifyDuplicateIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NotifyDuplicateIHIResult }
+     *     
+     */
+    public NotifyDuplicateIHIResult getNotifyDuplicateIHIResult() {
+        return notifyDuplicateIHIResult;
+    }
+
+    /**
+     * Sets the value of the notifyDuplicateIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NotifyDuplicateIHIResult }
+     *     
+     */
+    public void setNotifyDuplicateIHIResult(NotifyDuplicateIHIResult value) {
+        this.notifyDuplicateIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHIResult.java
new file mode 100644
index 0000000..a2bbfc8
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/NotifyDuplicateIHIResult.java
@@ -0,0 +1,104 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoreelements._3_2.IHINumberStatusGroupType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumberStatusGroup" maxOccurs="12" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumberStatusGroup",
+    "serviceMessages"
+})
+@XmlRootElement(name = "notifyDuplicateIHIResult")
+public class NotifyDuplicateIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    protected List<IHINumberStatusGroupType> ihiNumberStatusGroup;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumberStatusGroup property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the ihiNumberStatusGroup property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIhiNumberStatusGroup().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link IHINumberStatusGroupType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the ihiNumberStatusGroup property.
+     */
+    public List<IHINumberStatusGroupType> getIhiNumberStatusGroup() {
+        if (ihiNumberStatusGroup == null) {
+            ihiNumberStatusGroup = new ArrayList<>();
+        }
+        return this.ihiNumberStatusGroup;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..989ef5d
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NotifyDuplicateIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link NotifyDuplicateIHIResult }
+     */
+    public NotifyDuplicateIHIResult createNotifyDuplicateIHIResult() {
+        return new NotifyDuplicateIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link NotifyDuplicateIHI }
+     * 
+     * @return
+     *     the new instance of {@link NotifyDuplicateIHI }
+     */
+    public NotifyDuplicateIHI createNotifyDuplicateIHI() {
+        return new NotifyDuplicateIHI();
+    }
+
+    /**
+     * Create an instance of {@link NotifyDuplicateIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link NotifyDuplicateIHIResponse }
+     */
+    public NotifyDuplicateIHIResponse createNotifyDuplicateIHIResponse() {
+        return new NotifyDuplicateIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/package-info.java
new file mode 100644
index 0000000..390f976
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyduplicateihi/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyDuplicateIHI/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyduplicateihi._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHI.java
new file mode 100644
index 0000000..6c69456
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHI.java
@@ -0,0 +1,94 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}comment"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "comment"
+})
+@XmlRootElement(name = "notifyReplicaIHI")
+public class NotifyReplicaIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    protected String comment;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHIResponse.java
new file mode 100644
index 0000000..db3f321
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyReplicaIHI/3.2.0}notifyReplicaIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "notifyReplicaIHIResult"
+})
+@XmlRootElement(name = "notifyReplicaIHIResponse")
+public class NotifyReplicaIHIResponse {
+
+    @XmlElement(required = true)
+    protected NotifyReplicaIHIResult notifyReplicaIHIResult;
+
+    /**
+     * Gets the value of the notifyReplicaIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NotifyReplicaIHIResult }
+     *     
+     */
+    public NotifyReplicaIHIResult getNotifyReplicaIHIResult() {
+        return notifyReplicaIHIResult;
+    }
+
+    /**
+     * Sets the value of the notifyReplicaIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NotifyReplicaIHIResult }
+     *     
+     */
+    public void setNotifyReplicaIHIResult(NotifyReplicaIHIResult value) {
+        this.notifyReplicaIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHIResult.java
new file mode 100644
index 0000000..9d0a910
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/NotifyReplicaIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "notifyReplicaIHIResult")
+public class NotifyReplicaIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..e877ffb
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link NotifyReplicaIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link NotifyReplicaIHIResult }
+     */
+    public NotifyReplicaIHIResult createNotifyReplicaIHIResult() {
+        return new NotifyReplicaIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link NotifyReplicaIHI }
+     * 
+     * @return
+     *     the new instance of {@link NotifyReplicaIHI }
+     */
+    public NotifyReplicaIHI createNotifyReplicaIHI() {
+        return new NotifyReplicaIHI();
+    }
+
+    /**
+     * Create an instance of {@link NotifyReplicaIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link NotifyReplicaIHIResponse }
+     */
+    public NotifyReplicaIHIResponse createNotifyReplicaIHIResponse() {
+        return new NotifyReplicaIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/package-info.java
new file mode 100644
index 0000000..24a8c50
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/notifyreplicaihi/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/NotifyReplicaIHI/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.notifyreplicaihi._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..daf3dbb
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ResolveProvisionalIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link ResolveProvisionalIHIResult }
+     */
+    public ResolveProvisionalIHIResult createResolveProvisionalIHIResult() {
+        return new ResolveProvisionalIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link ResolveProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link ResolveProvisionalIHI }
+     */
+    public ResolveProvisionalIHI createResolveProvisionalIHI() {
+        return new ResolveProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link ResolveProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link ResolveProvisionalIHIResponse }
+     */
+    public ResolveProvisionalIHIResponse createResolveProvisionalIHIResponse() {
+        return new ResolveProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHI.java
new file mode 100644
index 0000000..adc3705
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHI.java
@@ -0,0 +1,554 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameTitle" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" maxOccurs="2" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}nameSuffix" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}usage"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0}conditionalUse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification",
+    "electronicCommunication",
+    "nameTitle",
+    "familyName",
+    "givenName",
+    "nameSuffix",
+    "usage",
+    "conditionalUse",
+    "address"
+})
+@XmlRootElement(name = "resolveProvisionalIHI")
+public class ResolveProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String nameTitle;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected List<String> givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    @XmlSchemaType(name = "string")
+    protected NameSuffixType nameSuffix;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected IndividualNameUsageType usage;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.0")
+    protected String conditionalUse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected AddressType address;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the nameTitle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNameTitle() {
+        return nameTitle;
+    }
+
+    /**
+     * Sets the value of the nameTitle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNameTitle(String value) {
+        this.nameTitle = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the nameSuffix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public NameSuffixType getNameSuffix() {
+        return nameSuffix;
+    }
+
+    /**
+     * Sets the value of the nameSuffix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NameSuffixType }
+     *     
+     */
+    public void setNameSuffix(NameSuffixType value) {
+        this.nameSuffix = value;
+    }
+
+    /**
+     * Gets the value of the usage property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public IndividualNameUsageType getUsage() {
+        return usage;
+    }
+
+    /**
+     * Sets the value of the usage property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualNameUsageType }
+     *     
+     */
+    public void setUsage(IndividualNameUsageType value) {
+        this.usage = value;
+    }
+
+    /**
+     * Gets the value of the conditionalUse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getConditionalUse() {
+        return conditionalUse;
+    }
+
+    /**
+     * Sets the value of the conditionalUse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setConditionalUse(String value) {
+        this.conditionalUse = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AddressType }
+     *     
+     */
+    public AddressType getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the value of the address property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AddressType }
+     *     
+     */
+    public void setAddress(AddressType value) {
+        this.address = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHIResponse.java
new file mode 100644
index 0000000..c4e4aef
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/ResolveProvisionalIHI/3.0}resolveProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "resolveProvisionalIHIResult"
+})
+@XmlRootElement(name = "resolveProvisionalIHIResponse")
+public class ResolveProvisionalIHIResponse {
+
+    @XmlElement(required = true)
+    protected ResolveProvisionalIHIResult resolveProvisionalIHIResult;
+
+    /**
+     * Gets the value of the resolveProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ResolveProvisionalIHIResult }
+     *     
+     */
+    public ResolveProvisionalIHIResult getResolveProvisionalIHIResult() {
+        return resolveProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the resolveProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ResolveProvisionalIHIResult }
+     *     
+     */
+    public void setResolveProvisionalIHIResult(ResolveProvisionalIHIResult value) {
+        this.resolveProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHIResult.java
new file mode 100644
index 0000000..c138bc5
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/ResolveProvisionalIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "resolveProvisionalIHIResult")
+public class ResolveProvisionalIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..24b1a20
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/resolveprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/ResolveProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.resolveprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/ObjectFactory.java
index 665fd64..1461171 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -29,9 +29,21 @@ public class ObjectFactory {
     public ObjectFactory() {
     }
 
+    /**
+     * Create an instance of {@link SearchIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link SearchIHIResult }
+     */
+    public SearchIHIResult createSearchIHIResult() {
+        return new SearchIHIResult();
+    }
+
     /**
      * Create an instance of {@link SearchIHI }
      * 
+     * @return
+     *     the new instance of {@link SearchIHI }
      */
     public SearchIHI createSearchIHI() {
         return new SearchIHI();
@@ -40,17 +52,11 @@ public SearchIHI createSearchIHI() {
     /**
      * Create an instance of {@link SearchIHIResponse }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIResponse }
      */
     public SearchIHIResponse createSearchIHIResponse() {
         return new SearchIHIResponse();
     }
 
-    /**
-     * Create an instance of {@link SearchIHIResult }
-     * 
-     */
-    public SearchIHIResult createSearchIHIResult() {
-        return new SearchIHIResult();
-    }
-
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHI.java
index c5fdecc..46f929d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHI.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHI.java
@@ -1,14 +1,6 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.TrueFalseType;
@@ -17,20 +9,22 @@
 import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AustralianUnstructuredStreetAddressType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.InternationalAddressType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>
- * Java class for anonymous complex type
- * </p>
- * .
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>
- * The following schema fragment specifies the expected content contained within
- * this class.
- * </p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -53,7 +47,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -91,6 +85,8 @@ public class SearchIHI {
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlSchemaType(name = "token")
     protected String dvaFileNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected ElectronicCommunicationType electronicCommunication;
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
     @XmlSchemaType(name = "date")
     protected XMLGregorianCalendar dateOfBirth;
@@ -109,8 +105,6 @@ public class SearchIHI {
     protected InternationalAddressType internationalAddress;
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
     protected AustralianUnstructuredStreetAddressType australianUnstructuredStreetAddress;
-    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
-    protected ElectronicCommunicationType electronicCommunication;
     @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
     @XmlSchemaType(name = "string")
     protected TrueFalseType history;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResponse.java
index fb4fa9e..ec5e8e0 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResponse.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResult.java
index 0bbb6f4..314660d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/SearchIHIResult.java
@@ -1,28 +1,28 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
 import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -45,7 +45,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/package-info.java
index 9cf7568..8f2fb6e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihi/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHI/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/BatchResponseStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/BatchResponseStatusType.java
index ef21f54..60f927d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/BatchResponseStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/BatchResponseStatusType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for BatchResponseStatusType</p>.
+ * &lt;p&gt;Java class for BatchResponseStatusType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="BatchResponseStatusType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="RECEIVED"/&gt;
@@ -23,7 +23,7 @@
  *     &lt;enumeration value="ERROR"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "BatchResponseStatusType")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatch.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatch.java
index 3691b0d..c6bfaad 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatch.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatch.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatchResponse.java
index 98aa621..9a81aac 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatchResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/DeleteSearchIHIBatchResponse.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatus.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatus.java
index 630220b..541ef8d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatus.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatus.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatusResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatusResponse.java
index 7063561..7e9c4fc 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatusResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/GetSearchIHIBatchStatusResponse.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/ObjectFactory.java
index 1595a44..9a8422d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchIHIRequestType }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIRequestType }
      */
     public SearchIHIRequestType createSearchIHIRequestType() {
         return new SearchIHIRequestType();
@@ -44,6 +46,8 @@ public SearchIHIRequestType createSearchIHIRequestType() {
     /**
      * Create an instance of {@link SearchIHIResultType }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIResultType }
      */
     public SearchIHIResultType createSearchIHIResultType() {
         return new SearchIHIResultType();
@@ -52,6 +56,8 @@ public SearchIHIResultType createSearchIHIResultType() {
     /**
      * Create an instance of {@link SubmitSearchIHIBatch }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchIHIBatch }
      */
     public SubmitSearchIHIBatch createSubmitSearchIHIBatch() {
         return new SubmitSearchIHIBatch();
@@ -60,6 +66,8 @@ public SubmitSearchIHIBatch createSubmitSearchIHIBatch() {
     /**
      * Create an instance of {@link SubmitSearchIHIBatchResponse }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchIHIBatchResponse }
      */
     public SubmitSearchIHIBatchResponse createSubmitSearchIHIBatchResponse() {
         return new SubmitSearchIHIBatchResponse();
@@ -68,6 +76,8 @@ public SubmitSearchIHIBatchResponse createSubmitSearchIHIBatchResponse() {
     /**
      * Create an instance of {@link RetrieveSearchIHIBatch }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchIHIBatch }
      */
     public RetrieveSearchIHIBatch createRetrieveSearchIHIBatch() {
         return new RetrieveSearchIHIBatch();
@@ -76,6 +86,8 @@ public RetrieveSearchIHIBatch createRetrieveSearchIHIBatch() {
     /**
      * Create an instance of {@link RetrieveSearchIHIBatchResponse }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchIHIBatchResponse }
      */
     public RetrieveSearchIHIBatchResponse createRetrieveSearchIHIBatchResponse() {
         return new RetrieveSearchIHIBatchResponse();
@@ -84,6 +96,8 @@ public RetrieveSearchIHIBatchResponse createRetrieveSearchIHIBatchResponse() {
     /**
      * Create an instance of {@link GetSearchIHIBatchStatus }
      * 
+     * @return
+     *     the new instance of {@link GetSearchIHIBatchStatus }
      */
     public GetSearchIHIBatchStatus createGetSearchIHIBatchStatus() {
         return new GetSearchIHIBatchStatus();
@@ -92,6 +106,8 @@ public GetSearchIHIBatchStatus createGetSearchIHIBatchStatus() {
     /**
      * Create an instance of {@link GetSearchIHIBatchStatusResponse }
      * 
+     * @return
+     *     the new instance of {@link GetSearchIHIBatchStatusResponse }
      */
     public GetSearchIHIBatchStatusResponse createGetSearchIHIBatchStatusResponse() {
         return new GetSearchIHIBatchStatusResponse();
@@ -100,6 +116,8 @@ public GetSearchIHIBatchStatusResponse createGetSearchIHIBatchStatusResponse() {
     /**
      * Create an instance of {@link SearchIHIBatchStatusType }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIBatchStatusType }
      */
     public SearchIHIBatchStatusType createSearchIHIBatchStatusType() {
         return new SearchIHIBatchStatusType();
@@ -108,6 +126,8 @@ public SearchIHIBatchStatusType createSearchIHIBatchStatusType() {
     /**
      * Create an instance of {@link DeleteSearchIHIBatch }
      * 
+     * @return
+     *     the new instance of {@link DeleteSearchIHIBatch }
      */
     public DeleteSearchIHIBatch createDeleteSearchIHIBatch() {
         return new DeleteSearchIHIBatch();
@@ -116,6 +136,8 @@ public DeleteSearchIHIBatch createDeleteSearchIHIBatch() {
     /**
      * Create an instance of {@link DeleteSearchIHIBatchResponse }
      * 
+     * @return
+     *     the new instance of {@link DeleteSearchIHIBatchResponse }
      */
     public DeleteSearchIHIBatchResponse createDeleteSearchIHIBatchResponse() {
         return new DeleteSearchIHIBatchResponse();
@@ -124,6 +146,8 @@ public DeleteSearchIHIBatchResponse createDeleteSearchIHIBatchResponse() {
     /**
      * Create an instance of {@link SearchIHIBatchRetrieveRequestType }
      * 
+     * @return
+     *     the new instance of {@link SearchIHIBatchRetrieveRequestType }
      */
     public SearchIHIBatchRetrieveRequestType createSearchIHIBatchRetrieveRequestType() {
         return new SearchIHIBatchRetrieveRequestType();
@@ -139,7 +163,7 @@ public SearchIHIBatchRetrieveRequestType createSearchIHIBatchRetrieveRequestType
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", name = "batchIdentifier")
     public JAXBElement<String> createBatchIdentifier(String value) {
-        return new JAXBElement<String>(_BatchIdentifier_QNAME, String.class, null, value);
+        return new JAXBElement<>(_BatchIdentifier_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatch.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatch.java
index f6de70a..5b2b73c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatch.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatch.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatchResponse.java
index dcf980e..3aff891 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatchResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/RetrieveSearchIHIBatchResponse.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -48,8 +48,8 @@ public class RetrieveSearchIHIBatchResponse {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the searchIHIBatchResult property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the searchIHIBatchResult property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -70,7 +70,7 @@ public class RetrieveSearchIHIBatchResponse {
      */
     public List<SearchIHIResultType> getSearchIHIBatchResult() {
         if (searchIHIBatchResult == null) {
-            searchIHIBatchResult = new ArrayList<SearchIHIResultType>();
+            searchIHIBatchResult = new ArrayList<>();
         }
         return this.searchIHIBatchResult;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchRetrieveRequestType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchRetrieveRequestType.java
index 541f608..71e0d7c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchRetrieveRequestType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchRetrieveRequestType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SearchIHIBatchRetrieveRequestType complex type</p>.
+ * &lt;p&gt;Java class for SearchIHIBatchRetrieveRequestType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SearchIHIBatchRetrieveRequestType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchStatusType.java
index fe7b7f7..a3bc1ab 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIBatchStatusType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessageType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SearchIHIBatchStatusType complex type</p>.
+ * &lt;p&gt;Java class for SearchIHIBatchStatusType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SearchIHIBatchStatusType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIRequestType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIRequestType.java
index 19da5d9..b2d75d2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIRequestType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIRequestType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.SearchIHI;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SearchIHIRequestType complex type</p>.
+ * &lt;p&gt;Java class for SearchIHIRequestType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SearchIHIRequestType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIResultType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIResultType.java
index 6e122c8..026dc22 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIResultType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SearchIHIResultType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.SearchIHIResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SearchIHIResultType complex type</p>.
+ * &lt;p&gt;Java class for SearchIHIResultType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SearchIHIResultType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatch.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatch.java
index 488e423..ef00f4d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatch.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatch.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -44,8 +44,8 @@ public class SubmitSearchIHIBatch {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the searchIHIBatchRequest property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the searchIHIBatchRequest property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -66,7 +66,7 @@ public class SubmitSearchIHIBatch {
      */
     public List<SearchIHIRequestType> getSearchIHIBatchRequest() {
         if (searchIHIBatchRequest == null) {
-            searchIHIBatchRequest = new ArrayList<SearchIHIRequestType>();
+            searchIHIBatchRequest = new ArrayList<>();
         }
         return this.searchIHIBatchRequest;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatchResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatchResponse.java
index 3e67362..396a8aa 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatchResponse.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/SubmitSearchIHIBatchResponse.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/package-info.java
index cd76885..07c951f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/searchihibatch/_3/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHIBatch/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.consumermessages.searchihibatch._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..4c50d40
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link UpdateIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link UpdateIHIResult }
+     */
+    public UpdateIHIResult createUpdateIHIResult() {
+        return new UpdateIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link UpdateIHI }
+     * 
+     * @return
+     *     the new instance of {@link UpdateIHI }
+     */
+    public UpdateIHI createUpdateIHI() {
+        return new UpdateIHI();
+    }
+
+    /**
+     * Create an instance of {@link UpdateIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link UpdateIHIResponse }
+     */
+    public UpdateIHIResponse createUpdateIHIResponse() {
+        return new UpdateIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHI.java
new file mode 100644
index 0000000..8a20202
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHI.java
@@ -0,0 +1,456 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AddressType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.SourceOfDeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.electroniccommunication._3.ElectronicCommunicationType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2.NameType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.name._3_2.NameUpdateGroupType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}birthPlurality" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}birthOrder" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0}electronicCommunication" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}name" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0}nameUpdateGroup" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0}address" maxOccurs="2" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "sex",
+    "birthPlurality",
+    "birthOrder",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification",
+    "electronicCommunication",
+    "name",
+    "nameUpdateGroup",
+    "address"
+})
+@XmlRootElement(name = "updateIHI")
+public class UpdateIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthPlurality;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String birthOrder;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0")
+    protected List<ElectronicCommunicationType> electronicCommunication;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0")
+    protected List<NameType> name;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Name/3.2.0")
+    protected List<NameUpdateGroupType> nameUpdateGroup;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0")
+    protected List<AddressType> address;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the birthPlurality property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthPlurality() {
+        return birthPlurality;
+    }
+
+    /**
+     * Sets the value of the birthPlurality property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthPlurality(String value) {
+        this.birthPlurality = value;
+    }
+
+    /**
+     * Gets the value of the birthOrder property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBirthOrder() {
+        return birthOrder;
+    }
+
+    /**
+     * Sets the value of the birthOrder property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBirthOrder(String value) {
+        this.birthOrder = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunication property.
+     */
+    public List<ElectronicCommunicationType> getElectronicCommunication() {
+        if (electronicCommunication == null) {
+            electronicCommunication = new ArrayList<>();
+        }
+        return this.electronicCommunication;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the name property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link NameType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the name property.
+     */
+    public List<NameType> getName() {
+        if (name == null) {
+            name = new ArrayList<>();
+        }
+        return this.name;
+    }
+
+    /**
+     * Gets the value of the nameUpdateGroup property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the nameUpdateGroup property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getNameUpdateGroup().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link NameUpdateGroupType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the nameUpdateGroup property.
+     */
+    public List<NameUpdateGroupType> getNameUpdateGroup() {
+        if (nameUpdateGroup == null) {
+            nameUpdateGroup = new ArrayList<>();
+        }
+        return this.nameUpdateGroup;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the address property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddress().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AddressType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the address property.
+     */
+    public List<AddressType> getAddress() {
+        if (address == null) {
+            address = new ArrayList<>();
+        }
+        return this.address;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHIResponse.java
new file mode 100644
index 0000000..aaec915
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateIHI/3.2.0}updateIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "updateIHIResult"
+})
+@XmlRootElement(name = "updateIHIResponse")
+public class UpdateIHIResponse {
+
+    @XmlElement(required = true)
+    protected UpdateIHIResult updateIHIResult;
+
+    /**
+     * Gets the value of the updateIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link UpdateIHIResult }
+     *     
+     */
+    public UpdateIHIResult getUpdateIHIResult() {
+        return updateIHIResult;
+    }
+
+    /**
+     * Sets the value of the updateIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link UpdateIHIResult }
+     *     
+     */
+    public void setUpdateIHIResult(UpdateIHIResult value) {
+        this.updateIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHIResult.java
new file mode 100644
index 0000000..a58d2c0
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/UpdateIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3_2.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "updateIHIResult")
+public class UpdateIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.2.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/package-info.java
new file mode 100644
index 0000000..07a4932
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateihi/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateIHI/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateihi._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/ObjectFactory.java
new file mode 100644
index 0000000..2eb8dc7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/ObjectFactory.java
@@ -0,0 +1,62 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link UpdateProvisionalIHIResult }
+     * 
+     * @return
+     *     the new instance of {@link UpdateProvisionalIHIResult }
+     */
+    public UpdateProvisionalIHIResult createUpdateProvisionalIHIResult() {
+        return new UpdateProvisionalIHIResult();
+    }
+
+    /**
+     * Create an instance of {@link UpdateProvisionalIHI }
+     * 
+     * @return
+     *     the new instance of {@link UpdateProvisionalIHI }
+     */
+    public UpdateProvisionalIHI createUpdateProvisionalIHI() {
+        return new UpdateProvisionalIHI();
+    }
+
+    /**
+     * Create an instance of {@link UpdateProvisionalIHIResponse }
+     * 
+     * @return
+     *     the new instance of {@link UpdateProvisionalIHIResponse }
+     */
+    public UpdateProvisionalIHIResponse createUpdateProvisionalIHIResponse() {
+        return new UpdateProvisionalIHIResponse();
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHI.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHI.java
new file mode 100644
index 0000000..d6ce867
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHI.java
@@ -0,0 +1,300 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.SourceOfDeathNotificationType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0}givenName" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}sex"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfBirthAccuracyIndicator"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeath" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}dateOfDeathAccuracyIndicator" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}sourceOfDeathNotification" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "familyName",
+    "givenName",
+    "sex",
+    "dateOfBirth",
+    "dateOfBirthAccuracyIndicator",
+    "dateOfDeath",
+    "dateOfDeathAccuracyIndicator",
+    "sourceOfDeathNotification"
+})
+@XmlRootElement(name = "updateProvisionalIHI")
+public class UpdateProvisionalIHI {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0", required = true)
+    protected String familyName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0")
+    protected String givenName;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfBirthAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfDeath;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    @XmlSchemaType(name = "string")
+    protected DateAccuracyIndicatorType dateOfDeathAccuracyIndicator;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected SourceOfDeathNotificationType sourceOfDeathNotification;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getGivenName() {
+        return givenName;
+    }
+
+    /**
+     * Sets the value of the givenName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGivenName(String value) {
+        this.givenName = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfBirthAccuracyIndicator() {
+        return dateOfBirthAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfBirthAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfBirthAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfBirthAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeath property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfDeath() {
+        return dateOfDeath;
+    }
+
+    /**
+     * Sets the value of the dateOfDeath property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfDeath(XMLGregorianCalendar value) {
+        this.dateOfDeath = value;
+    }
+
+    /**
+     * Gets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public DateAccuracyIndicatorType getDateOfDeathAccuracyIndicator() {
+        return dateOfDeathAccuracyIndicator;
+    }
+
+    /**
+     * Sets the value of the dateOfDeathAccuracyIndicator property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DateAccuracyIndicatorType }
+     *     
+     */
+    public void setDateOfDeathAccuracyIndicator(DateAccuracyIndicatorType value) {
+        this.dateOfDeathAccuracyIndicator = value;
+    }
+
+    /**
+     * Gets the value of the sourceOfDeathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public SourceOfDeathNotificationType getSourceOfDeathNotification() {
+        return sourceOfDeathNotification;
+    }
+
+    /**
+     * Sets the value of the sourceOfDeathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SourceOfDeathNotificationType }
+     *     
+     */
+    public void setSourceOfDeathNotification(SourceOfDeathNotificationType value) {
+        this.sourceOfDeathNotification = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHIResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHIResponse.java
new file mode 100644
index 0000000..36ec4c3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHIResponse.java
@@ -0,0 +1,64 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateProvisionalIHI/3.0}updateProvisionalIHIResult"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "updateProvisionalIHIResult"
+})
+@XmlRootElement(name = "updateProvisionalIHIResponse")
+public class UpdateProvisionalIHIResponse {
+
+    @XmlElement(required = true)
+    protected UpdateProvisionalIHIResult updateProvisionalIHIResult;
+
+    /**
+     * Gets the value of the updateProvisionalIHIResult property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link UpdateProvisionalIHIResult }
+     *     
+     */
+    public UpdateProvisionalIHIResult getUpdateProvisionalIHIResult() {
+        return updateProvisionalIHIResult;
+    }
+
+    /**
+     * Sets the value of the updateProvisionalIHIResult property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link UpdateProvisionalIHIResult }
+     *     
+     */
+    public void setUpdateProvisionalIHIResult(UpdateProvisionalIHIResult value) {
+        this.updateProvisionalIHIResult = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHIResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHIResult.java
new file mode 100644
index 0000000..fb55b16
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/UpdateProvisionalIHIResult.java
@@ -0,0 +1,155 @@
+
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3;
+
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIRecordStatusType;
+import au.net.electronichealth.ns.hi.xsd.consumercore.consumercoredatatypes._3.IHIStatusType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiNumber"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiRecordStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0}ihiStatus" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "ihiNumber",
+    "ihiRecordStatus",
+    "ihiStatus",
+    "serviceMessages"
+})
+@XmlRootElement(name = "updateProvisionalIHIResult")
+public class UpdateProvisionalIHIResult {
+
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String ihiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIRecordStatusType ihiRecordStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0")
+    @XmlSchemaType(name = "token")
+    protected IHIStatusType ihiStatus;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the ihiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIhiNumber() {
+        return ihiNumber;
+    }
+
+    /**
+     * Sets the value of the ihiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIhiNumber(String value) {
+        this.ihiNumber = value;
+    }
+
+    /**
+     * Gets the value of the ihiRecordStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public IHIRecordStatusType getIhiRecordStatus() {
+        return ihiRecordStatus;
+    }
+
+    /**
+     * Sets the value of the ihiRecordStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIRecordStatusType }
+     *     
+     */
+    public void setIhiRecordStatus(IHIRecordStatusType value) {
+        this.ihiRecordStatus = value;
+    }
+
+    /**
+     * Gets the value of the ihiStatus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public IHIStatusType getIhiStatus() {
+        return ihiStatus;
+    }
+
+    /**
+     * Sets the value of the ihiStatus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IHIStatusType }
+     *     
+     */
+    public void setIhiStatus(IHIStatusType value) {
+        this.ihiStatus = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/package-info.java
new file mode 100644
index 0000000..9ed58d4
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/consumermessages/updateprovisionalihi/_3/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/consumermessages/UpdateProvisionalIHI/3.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.consumermessages.updateprovisionalihi._3;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/Address.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/Address.java
index 3bdb111..861cd53 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/Address.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/Address.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for Address complex type</p>.
+ * &lt;p&gt;Java class for Address complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="Address"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressPurposeAndDateType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressPurposeAndDateType.java
index e057dbd..5bbcfdc 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressPurposeAndDateType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressPurposeAndDateType.java
@@ -3,21 +3,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.AddressPurposeType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AddressPurposeAndDateType complex type</p>.
+ * &lt;p&gt;Java class for AddressPurposeAndDateType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AddressPurposeAndDateType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -52,8 +52,8 @@ public class AddressPurposeAndDateType {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the purpose property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the purpose property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -74,7 +74,7 @@ public class AddressPurposeAndDateType {
      */
     public List<AddressPurposeType> getPurpose() {
         if (purpose == null) {
-            purpose = new ArrayList<AddressPurposeType>();
+            purpose = new ArrayList<>();
         }
         return this.purpose;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressRecord.java
index 917a4be..bbb3d32 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AddressRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AddressRecord complex type</p>.
+ * &lt;p&gt;Java class for AddressRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AddressRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0}Address"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressCriteriaType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressCriteriaType.java
index 0b814ac..eba0764 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressCriteriaType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressCriteriaType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.LevelGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.PostalDeliveryGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.UnitGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetSuffixType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AustralianAddressCriteriaType complex type</p>.
+ * &lt;p&gt;Java class for AustralianAddressCriteriaType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AustralianAddressCriteriaType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -41,7 +41,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressType.java
index f9e2159..399f839 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/AustralianAddressType.java
@@ -1,27 +1,27 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.LevelGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.PostalDeliveryGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._3.UnitGroupType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetSuffixType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StreetType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * An AddressType should not contain both 'addressLine' and 'unstructuredAddressLine' elements.
  * 
- * <p>Java class for AustralianAddressType complex type</p>.
+ * &lt;p&gt;Java class for AustralianAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="AustralianAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -43,7 +43,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressCriteriaType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressCriteriaType.java
index 231dc9b..79fd1da 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressCriteriaType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressCriteriaType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for InternationalAddressCriteriaType complex type</p>.
+ * &lt;p&gt;Java class for InternationalAddressCriteriaType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="InternationalAddressCriteriaType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressType.java
index dc37592..71eb1ac 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/InternationalAddressType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for InternationalAddressType complex type</p>.
+ * &lt;p&gt;Java class for InternationalAddressType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="InternationalAddressType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/ObjectFactory.java
index 3e509bc..7546898 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.address._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -35,24 +35,30 @@ public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link AustralianAddressCriteriaType }
+     * Create an instance of {@link AustralianAddressType }
      * 
+     * @return
+     *     the new instance of {@link AustralianAddressType }
      */
-    public AustralianAddressCriteriaType createAustralianAddressCriteriaType() {
-        return new AustralianAddressCriteriaType();
+    public AustralianAddressType createAustralianAddressType() {
+        return new AustralianAddressType();
     }
 
     /**
-     * Create an instance of {@link InternationalAddressCriteriaType }
+     * Create an instance of {@link InternationalAddressType }
      * 
+     * @return
+     *     the new instance of {@link InternationalAddressType }
      */
-    public InternationalAddressCriteriaType createInternationalAddressCriteriaType() {
-        return new InternationalAddressCriteriaType();
+    public InternationalAddressType createInternationalAddressType() {
+        return new InternationalAddressType();
     }
 
     /**
      * Create an instance of {@link Address }
      * 
+     * @return
+     *     the new instance of {@link Address }
      */
     public Address createAddress() {
         return new Address();
@@ -61,30 +67,38 @@ public Address createAddress() {
     /**
      * Create an instance of {@link AddressRecord }
      * 
+     * @return
+     *     the new instance of {@link AddressRecord }
      */
     public AddressRecord createAddressRecord() {
         return new AddressRecord();
     }
 
     /**
-     * Create an instance of {@link AustralianAddressType }
+     * Create an instance of {@link AustralianAddressCriteriaType }
      * 
+     * @return
+     *     the new instance of {@link AustralianAddressCriteriaType }
      */
-    public AustralianAddressType createAustralianAddressType() {
-        return new AustralianAddressType();
+    public AustralianAddressCriteriaType createAustralianAddressCriteriaType() {
+        return new AustralianAddressCriteriaType();
     }
 
     /**
-     * Create an instance of {@link InternationalAddressType }
+     * Create an instance of {@link InternationalAddressCriteriaType }
      * 
+     * @return
+     *     the new instance of {@link InternationalAddressCriteriaType }
      */
-    public InternationalAddressType createInternationalAddressType() {
-        return new InternationalAddressType();
+    public InternationalAddressCriteriaType createInternationalAddressCriteriaType() {
+        return new InternationalAddressCriteriaType();
     }
 
     /**
      * Create an instance of {@link AddressPurposeAndDateType }
      * 
+     * @return
+     *     the new instance of {@link AddressPurposeAndDateType }
      */
     public AddressPurposeAndDateType createAddressPurposeAndDateType() {
         return new AddressPurposeAndDateType();
@@ -100,7 +114,7 @@ public AddressPurposeAndDateType createAddressPurposeAndDateType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0", name = "address")
     public JAXBElement<Address> createAddress(Address value) {
-        return new JAXBElement<Address>(_Address_QNAME, Address.class, null, value);
+        return new JAXBElement<>(_Address_QNAME, Address.class, null, value);
     }
 
     /**
@@ -113,7 +127,7 @@ public JAXBElement<Address> createAddress(Address value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0", name = "addressRecord")
     public JAXBElement<AddressRecord> createAddressRecord(AddressRecord value) {
-        return new JAXBElement<AddressRecord>(_AddressRecord_QNAME, AddressRecord.class, null, value);
+        return new JAXBElement<>(_AddressRecord_QNAME, AddressRecord.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/package-info.java
index a5ab144..ccd2df7 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.address._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/AddressRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/AddressRecord.java
new file mode 100644
index 0000000..c709a25
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/AddressRecord.java
@@ -0,0 +1,118 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.address._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.Address;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for AddressRecord complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="AddressRecord"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType"/&gt;
+ *         &lt;element name="address" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0}Address"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AddressRecord", propOrder = {
+    "clientRef",
+    "tdsReference",
+    "address"
+})
+public class AddressRecord {
+
+    protected String clientRef;
+    @XmlElement(required = true)
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected Address address;
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Address }
+     *     
+     */
+    public Address getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the value of the address property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Address }
+     *     
+     */
+    public void setAddress(Address value) {
+        this.address = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/AddressRecordResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/AddressRecordResponse.java
new file mode 100644
index 0000000..b6e6547
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/AddressRecordResponse.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.address._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.Address;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for AddressRecordResponse complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="AddressRecordResponse"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType" minOccurs="0"/&gt;
+ *         &lt;element name="address" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Address/3.2.0}Address"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AddressRecordResponse", propOrder = {
+    "tdsReference",
+    "address"
+})
+public class AddressRecordResponse {
+
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected Address address;
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the address property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Address }
+     *     
+     */
+    public Address getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the value of the address property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Address }
+     *     
+     */
+    public void setAddress(Address value) {
+        this.address = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/ObjectFactory.java
new file mode 100644
index 0000000..dbb411c
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/ObjectFactory.java
@@ -0,0 +1,69 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.address._5_1;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.providercore.address._5_1 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _AddressRecord_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/Address/5.1.0", "addressRecord");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providercore.address._5_1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link AddressRecord }
+     * 
+     * @return
+     *     the new instance of {@link AddressRecord }
+     */
+    public AddressRecord createAddressRecord() {
+        return new AddressRecord();
+    }
+
+    /**
+     * Create an instance of {@link AddressRecordResponse }
+     * 
+     * @return
+     *     the new instance of {@link AddressRecordResponse }
+     */
+    public AddressRecordResponse createAddressRecordResponse() {
+        return new AddressRecordResponse();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AddressRecord }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link AddressRecord }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/5.1.0", name = "addressRecord")
+    public JAXBElement<AddressRecord> createAddressRecord(AddressRecord value) {
+        return new JAXBElement<>(_AddressRecord_QNAME, AddressRecord.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/package-info.java
new file mode 100644
index 0000000..24cb951
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/address/_5_1/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.providercore.address._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateResponseType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateResponseType.java
index bd7baaa..c86bc97 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateResponseType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateResponseType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CertificateResponseType complex type</p>.
+ * &lt;p&gt;Java class for CertificateResponseType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="CertificateResponseType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateType.java
index 218e9f5..dea2162 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/CertificateType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CertificateType complex type</p>.
+ * &lt;p&gt;Java class for CertificateType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="CertificateType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/LinkCertificateRequestType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/LinkCertificateRequestType.java
index b392166..c22e1d1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/LinkCertificateRequestType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/LinkCertificateRequestType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for LinkCertificateRequestType complex type</p>.
+ * &lt;p&gt;Java class for LinkCertificateRequestType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="LinkCertificateRequestType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/NewCertificateRequestType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/NewCertificateRequestType.java
index 6a7f2f7..9d81123 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/NewCertificateRequestType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/NewCertificateRequestType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for NewCertificateRequestType complex type</p>.
+ * &lt;p&gt;Java class for NewCertificateRequestType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="NewCertificateRequestType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/ObjectFactory.java
index 7bf22d8..64c95c9 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -45,6 +45,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link CertificateType }
      * 
+     * @return
+     *     the new instance of {@link CertificateType }
      */
     public CertificateType createCertificateType() {
         return new CertificateType();
@@ -53,6 +55,8 @@ public CertificateType createCertificateType() {
     /**
      * Create an instance of {@link CertificateResponseType }
      * 
+     * @return
+     *     the new instance of {@link CertificateResponseType }
      */
     public CertificateResponseType createCertificateResponseType() {
         return new CertificateResponseType();
@@ -61,6 +65,8 @@ public CertificateResponseType createCertificateResponseType() {
     /**
      * Create an instance of {@link NewCertificateRequestType }
      * 
+     * @return
+     *     the new instance of {@link NewCertificateRequestType }
      */
     public NewCertificateRequestType createNewCertificateRequestType() {
         return new NewCertificateRequestType();
@@ -69,6 +75,8 @@ public NewCertificateRequestType createNewCertificateRequestType() {
     /**
      * Create an instance of {@link LinkCertificateRequestType }
      * 
+     * @return
+     *     the new instance of {@link LinkCertificateRequestType }
      */
     public LinkCertificateRequestType createLinkCertificateRequestType() {
         return new LinkCertificateRequestType();
@@ -84,7 +92,7 @@ public LinkCertificateRequestType createLinkCertificateRequestType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "certificate")
     public JAXBElement<CertificateType> createCertificate(CertificateType value) {
-        return new JAXBElement<CertificateType>(_Certificate_QNAME, CertificateType.class, null, value);
+        return new JAXBElement<>(_Certificate_QNAME, CertificateType.class, null, value);
     }
 
     /**
@@ -97,7 +105,7 @@ public JAXBElement<CertificateType> createCertificate(CertificateType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "certificateResponse")
     public JAXBElement<CertificateResponseType> createCertificateResponse(CertificateResponseType value) {
-        return new JAXBElement<CertificateResponseType>(_CertificateResponse_QNAME, CertificateResponseType.class, null, value);
+        return new JAXBElement<>(_CertificateResponse_QNAME, CertificateResponseType.class, null, value);
     }
 
     /**
@@ -110,7 +118,7 @@ public JAXBElement<CertificateResponseType> createCertificateResponse(Certificat
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "requestCertificate")
     public JAXBElement<Boolean> createRequestCertificate(Boolean value) {
-        return new JAXBElement<Boolean>(_RequestCertificate_QNAME, Boolean.class, null, value);
+        return new JAXBElement<>(_RequestCertificate_QNAME, Boolean.class, null, value);
     }
 
     /**
@@ -123,7 +131,7 @@ public JAXBElement<Boolean> createRequestCertificate(Boolean value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "raNumber")
     public JAXBElement<String> createRaNumber(String value) {
-        return new JAXBElement<String>(_RaNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_RaNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -136,7 +144,7 @@ public JAXBElement<String> createRaNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "token")
     public JAXBElement<String> createToken(String value) {
-        return new JAXBElement<String>(_Token_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Token_QNAME, String.class, null, value);
     }
 
     /**
@@ -149,7 +157,7 @@ public JAXBElement<String> createToken(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "operatingSystem")
     public JAXBElement<String> createOperatingSystem(String value) {
-        return new JAXBElement<String>(_OperatingSystem_QNAME, String.class, null, value);
+        return new JAXBElement<>(_OperatingSystem_QNAME, String.class, null, value);
     }
 
     /**
@@ -162,7 +170,7 @@ public JAXBElement<String> createOperatingSystem(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "otherOperatingSystem")
     public JAXBElement<String> createOtherOperatingSystem(String value) {
-        return new JAXBElement<String>(_OtherOperatingSystem_QNAME, String.class, null, value);
+        return new JAXBElement<>(_OtherOperatingSystem_QNAME, String.class, null, value);
     }
 
     /**
@@ -175,7 +183,7 @@ public JAXBElement<String> createOtherOperatingSystem(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "distinguishedName")
     public JAXBElement<String> createDistinguishedName(String value) {
-        return new JAXBElement<String>(_DistinguishedName_QNAME, String.class, null, value);
+        return new JAXBElement<>(_DistinguishedName_QNAME, String.class, null, value);
     }
 
     /**
@@ -188,7 +196,7 @@ public JAXBElement<String> createDistinguishedName(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "newCertificateRequest")
     public JAXBElement<NewCertificateRequestType> createNewCertificateRequest(NewCertificateRequestType value) {
-        return new JAXBElement<NewCertificateRequestType>(_NewCertificateRequest_QNAME, NewCertificateRequestType.class, null, value);
+        return new JAXBElement<>(_NewCertificateRequest_QNAME, NewCertificateRequestType.class, null, value);
     }
 
     /**
@@ -201,7 +209,7 @@ public JAXBElement<NewCertificateRequestType> createNewCertificateRequest(NewCer
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", name = "linkCertificateRequest")
     public JAXBElement<LinkCertificateRequestType> createLinkCertificateRequest(LinkCertificateRequestType value) {
-        return new JAXBElement<LinkCertificateRequestType>(_LinkCertificateRequest_QNAME, LinkCertificateRequestType.class, null, value);
+        return new JAXBElement<>(_LinkCertificateRequest_QNAME, LinkCertificateRequestType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/package-info.java
index 98e9989..30492b8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/certificate/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunication.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunication.java
index 7fec1d1..fcf64bb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunication.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunication.java
@@ -1,22 +1,22 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.MediumType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.UsageType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ElectronicCommunication complex type</p>.
+ * &lt;p&gt;Java class for ElectronicCommunication complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ElectronicCommunication"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunicationRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunicationRecord.java
index 40b3bf1..226e09b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunicationRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ElectronicCommunicationRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ElectronicCommunicationRecord complex type</p>.
+ * &lt;p&gt;Java class for ElectronicCommunicationRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ElectronicCommunicationRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0}ElectronicCommunication"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ObjectFactory.java
index f472ca6..264800e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -24,8 +24,8 @@
 @XmlRegistry
 public class ObjectFactory {
 
-    private static final QName _ElectronicCommunication_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", "electronicCommunication");
     private static final QName _ElectronicCommunicationRecord_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", "electronicCommunicationRecord");
+    private static final QName _ElectronicCommunication_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", "electronicCommunication");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2
@@ -34,33 +34,24 @@ public class ObjectFactory {
     public ObjectFactory() {
     }
 
-    /**
-     * Create an instance of {@link ElectronicCommunication }
-     * 
-     */
-    public ElectronicCommunication createElectronicCommunication() {
-        return new ElectronicCommunication();
-    }
-
     /**
      * Create an instance of {@link ElectronicCommunicationRecord }
      * 
+     * @return
+     *     the new instance of {@link ElectronicCommunicationRecord }
      */
     public ElectronicCommunicationRecord createElectronicCommunicationRecord() {
         return new ElectronicCommunicationRecord();
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ElectronicCommunication }{@code >}
+     * Create an instance of {@link ElectronicCommunication }
      * 
-     * @param value
-     *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ElectronicCommunication }{@code >}
+     *     the new instance of {@link ElectronicCommunication }
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", name = "electronicCommunication")
-    public JAXBElement<ElectronicCommunication> createElectronicCommunication(ElectronicCommunication value) {
-        return new JAXBElement<ElectronicCommunication>(_ElectronicCommunication_QNAME, ElectronicCommunication.class, null, value);
+    public ElectronicCommunication createElectronicCommunication() {
+        return new ElectronicCommunication();
     }
 
     /**
@@ -73,7 +64,20 @@ public JAXBElement<ElectronicCommunication> createElectronicCommunication(Electr
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", name = "electronicCommunicationRecord")
     public JAXBElement<ElectronicCommunicationRecord> createElectronicCommunicationRecord(ElectronicCommunicationRecord value) {
-        return new JAXBElement<ElectronicCommunicationRecord>(_ElectronicCommunicationRecord_QNAME, ElectronicCommunicationRecord.class, null, value);
+        return new JAXBElement<>(_ElectronicCommunicationRecord_QNAME, ElectronicCommunicationRecord.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ElectronicCommunication }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ElectronicCommunication }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", name = "electronicCommunication")
+    public JAXBElement<ElectronicCommunication> createElectronicCommunication(ElectronicCommunication value) {
+        return new JAXBElement<>(_ElectronicCommunication_QNAME, ElectronicCommunication.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/package-info.java
index c32cbab..c2259df 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ElectronicCommunicationRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ElectronicCommunicationRecord.java
new file mode 100644
index 0000000..08d827c
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ElectronicCommunicationRecord.java
@@ -0,0 +1,118 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunication;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for ElectronicCommunicationRecord complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ElectronicCommunicationRecord"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType"/&gt;
+ *         &lt;element name="electronicCommunication" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0}ElectronicCommunication"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ElectronicCommunicationRecord", propOrder = {
+    "clientRef",
+    "tdsReference",
+    "electronicCommunication"
+})
+public class ElectronicCommunicationRecord {
+
+    protected String clientRef;
+    @XmlElement(required = true)
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected ElectronicCommunication electronicCommunication;
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ElectronicCommunication }
+     *     
+     */
+    public ElectronicCommunication getElectronicCommunication() {
+        return electronicCommunication;
+    }
+
+    /**
+     * Sets the value of the electronicCommunication property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ElectronicCommunication }
+     *     
+     */
+    public void setElectronicCommunication(ElectronicCommunication value) {
+        this.electronicCommunication = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ElectronicCommunicationRecordResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ElectronicCommunicationRecordResponse.java
new file mode 100644
index 0000000..abb00f3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ElectronicCommunicationRecordResponse.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunication;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for ElectronicCommunicationRecordResponse complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ElectronicCommunicationRecordResponse"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType" minOccurs="0"/&gt;
+ *         &lt;element name="electronicCommunication" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/3.2.0}ElectronicCommunication"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ElectronicCommunicationRecordResponse", propOrder = {
+    "tdsReference",
+    "electronicCommunication"
+})
+public class ElectronicCommunicationRecordResponse {
+
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected ElectronicCommunication electronicCommunication;
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the electronicCommunication property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ElectronicCommunication }
+     *     
+     */
+    public ElectronicCommunication getElectronicCommunication() {
+        return electronicCommunication;
+    }
+
+    /**
+     * Sets the value of the electronicCommunication property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ElectronicCommunication }
+     *     
+     */
+    public void setElectronicCommunication(ElectronicCommunication value) {
+        this.electronicCommunication = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ObjectFactory.java
new file mode 100644
index 0000000..9d8147c
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/ObjectFactory.java
@@ -0,0 +1,69 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _ElectronicCommunicationRecord_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/5.1.0", "electronicCommunicationRecord");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ElectronicCommunicationRecord }
+     * 
+     * @return
+     *     the new instance of {@link ElectronicCommunicationRecord }
+     */
+    public ElectronicCommunicationRecord createElectronicCommunicationRecord() {
+        return new ElectronicCommunicationRecord();
+    }
+
+    /**
+     * Create an instance of {@link ElectronicCommunicationRecordResponse }
+     * 
+     * @return
+     *     the new instance of {@link ElectronicCommunicationRecordResponse }
+     */
+    public ElectronicCommunicationRecordResponse createElectronicCommunicationRecordResponse() {
+        return new ElectronicCommunicationRecordResponse();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ElectronicCommunicationRecord }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ElectronicCommunicationRecord }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/5.1.0", name = "electronicCommunicationRecord")
+    public JAXBElement<ElectronicCommunicationRecord> createElectronicCommunicationRecord(ElectronicCommunicationRecord value) {
+        return new JAXBElement<>(_ElectronicCommunicationRecord_QNAME, ElectronicCommunicationRecord.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/package-info.java
new file mode 100644
index 0000000..3e66aeb
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/electroniccommunication/_5_1/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DateAndAccuracyType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DateAndAccuracyType.java
index 699d816..296eef6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DateAndAccuracyType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DateAndAccuracyType.java
@@ -1,21 +1,21 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.DateAccuracyIndicatorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DateAndAccuracyType complex type</p>.
+ * &lt;p&gt;Java class for DateAndAccuracyType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="DateAndAccuracyType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DetailsResponseType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DetailsResponseType.java
index ffb1667..fa779be 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DetailsResponseType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/DetailsResponseType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DetailsResponseType complex type</p>.
+ * &lt;p&gt;Java class for DetailsResponseType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="DetailsResponseType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ObjectFactory.java
index 125cb39..d44d847 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link DateAndAccuracyType }
      * 
+     * @return
+     *     the new instance of {@link DateAndAccuracyType }
      */
     public DateAndAccuracyType createDateAndAccuracyType() {
         return new DateAndAccuracyType();
@@ -40,6 +42,8 @@ public DateAndAccuracyType createDateAndAccuracyType() {
     /**
      * Create an instance of {@link ReferenceSetType }
      * 
+     * @return
+     *     the new instance of {@link ReferenceSetType }
      */
     public ReferenceSetType createReferenceSetType() {
         return new ReferenceSetType();
@@ -48,6 +52,8 @@ public ReferenceSetType createReferenceSetType() {
     /**
      * Create an instance of {@link DetailsResponseType }
      * 
+     * @return
+     *     the new instance of {@link DetailsResponseType }
      */
     public DetailsResponseType createDetailsResponseType() {
         return new DetailsResponseType();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ReferenceSetType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ReferenceSetType.java
index edcb473..66dbaef 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ReferenceSetType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/ReferenceSetType.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ReferenceSetType complex type</p>.
+ * &lt;p&gt;Java class for ReferenceSetType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ReferenceSetType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/RequestType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/RequestType.java
index d8a9db4..e60cbbb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/RequestType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/RequestType.java
@@ -1,24 +1,24 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for RequestType</p>.
+ * &lt;p&gt;Java class for RequestType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="RequestType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="A"/&gt;
  *     &lt;enumeration value="R"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "RequestType")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/package-info.java
index 5dec99e..56059ee 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/elements/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorService.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorService.java
index a3c4f7e..8f86c29 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorService.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.endpoint._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for EndpointLocatorService complex type</p>.
+ * &lt;p&gt;Java class for EndpointLocatorService complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="EndpointLocatorService"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorServiceRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorServiceRecord.java
index c08d518..85b353b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorServiceRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/EndpointLocatorServiceRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.endpoint._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for EndpointLocatorServiceRecord complex type</p>.
+ * &lt;p&gt;Java class for EndpointLocatorServiceRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="EndpointLocatorServiceRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/EndPoint/3.2.0}EndpointLocatorService"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/ObjectFactory.java
index 74decff..2670d4f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.endpoint._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.endpoint._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link EndpointLocatorServiceRecord }
      * 
+     * @return
+     *     the new instance of {@link EndpointLocatorServiceRecord }
      */
     public EndpointLocatorServiceRecord createEndpointLocatorServiceRecord() {
         return new EndpointLocatorServiceRecord();
@@ -45,6 +47,8 @@ public EndpointLocatorServiceRecord createEndpointLocatorServiceRecord() {
     /**
      * Create an instance of {@link EndpointLocatorService }
      * 
+     * @return
+     *     the new instance of {@link EndpointLocatorService }
      */
     public EndpointLocatorService createEndpointLocatorService() {
         return new EndpointLocatorService();
@@ -60,7 +64,7 @@ public EndpointLocatorService createEndpointLocatorService() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/EndPoint/3.2.0", name = "endpointLocatorServiceRecord")
     public JAXBElement<EndpointLocatorServiceRecord> createEndpointLocatorServiceRecord(EndpointLocatorServiceRecord value) {
-        return new JAXBElement<EndpointLocatorServiceRecord>(_EndpointLocatorServiceRecord_QNAME, EndpointLocatorServiceRecord.class, null, value);
+        return new JAXBElement<>(_EndpointLocatorServiceRecord_QNAME, EndpointLocatorServiceRecord.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<EndpointLocatorServiceRecord> createEndpointLocatorServiceRec
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/EndPoint/3.2.0", name = "endpointLocatorService")
     public JAXBElement<EndpointLocatorService> createEndpointLocatorService(EndpointLocatorService value) {
-        return new JAXBElement<EndpointLocatorService>(_EndpointLocatorService_QNAME, EndpointLocatorService.class, null, value);
+        return new JAXBElement<>(_EndpointLocatorService_QNAME, EndpointLocatorService.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/package-info.java
index 8de99b3..8ccae38 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/endpoint/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/EndPoint/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/EndPoint/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.endpoint._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualName.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualName.java
index cec77f1..e0bbb44 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualName.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualName.java
@@ -3,21 +3,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.NameSuffixType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for IndividualName complex type</p>.
+ * &lt;p&gt;Java class for IndividualName complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="IndividualName"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -32,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -68,8 +68,8 @@ public class IndividualName {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the nameTitle property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the nameTitle property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -90,7 +90,7 @@ public class IndividualName {
      */
     public List<String> getNameTitle() {
         if (nameTitle == null) {
-            nameTitle = new ArrayList<String>();
+            nameTitle = new ArrayList<>();
         }
         return this.nameTitle;
     }
@@ -100,8 +100,8 @@ public List<String> getNameTitle() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the givenName property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -122,7 +122,7 @@ public List<String> getNameTitle() {
      */
     public List<String> getGivenName() {
         if (givenName == null) {
-            givenName = new ArrayList<String>();
+            givenName = new ArrayList<>();
         }
         return this.givenName;
     }
@@ -156,8 +156,8 @@ public void setFamilyName(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the nameSuffix property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the nameSuffix property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -178,7 +178,7 @@ public void setFamilyName(String value) {
      */
     public List<NameSuffixType> getNameSuffix() {
         if (nameSuffix == null) {
-            nameSuffix = new ArrayList<NameSuffixType>();
+            nameSuffix = new ArrayList<>();
         }
         return this.nameSuffix;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualNameRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualNameRecord.java
index 1ba431d..b80be54 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualNameRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/IndividualNameRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for IndividualNameRecord complex type</p>.
+ * &lt;p&gt;Java class for IndividualNameRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="IndividualNameRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0}IndividualName"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/NameUsageType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/NameUsageType.java
index 955faed..4cf17a6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/NameUsageType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/NameUsageType.java
@@ -3,21 +3,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.IndividualNameUsageType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for NameUsageType complex type</p>.
+ * &lt;p&gt;Java class for NameUsageType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="NameUsageType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -53,8 +53,8 @@ public class NameUsageType {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the usage property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the usage property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -75,7 +75,7 @@ public class NameUsageType {
      */
     public List<IndividualNameUsageType> getUsage() {
         if (usage == null) {
-            usage = new ArrayList<IndividualNameUsageType>();
+            usage = new ArrayList<>();
         }
         return this.usage;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/ObjectFactory.java
index 31b8739..4ce596e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link IndividualName }
      * 
+     * @return
+     *     the new instance of {@link IndividualName }
      */
     public IndividualName createIndividualName() {
         return new IndividualName();
@@ -45,6 +47,8 @@ public IndividualName createIndividualName() {
     /**
      * Create an instance of {@link IndividualNameRecord }
      * 
+     * @return
+     *     the new instance of {@link IndividualNameRecord }
      */
     public IndividualNameRecord createIndividualNameRecord() {
         return new IndividualNameRecord();
@@ -53,6 +57,8 @@ public IndividualNameRecord createIndividualNameRecord() {
     /**
      * Create an instance of {@link NameUsageType }
      * 
+     * @return
+     *     the new instance of {@link NameUsageType }
      */
     public NameUsageType createNameUsageType() {
         return new NameUsageType();
@@ -68,7 +74,7 @@ public NameUsageType createNameUsageType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0", name = "individualName")
     public JAXBElement<IndividualName> createIndividualName(IndividualName value) {
-        return new JAXBElement<IndividualName>(_IndividualName_QNAME, IndividualName.class, null, value);
+        return new JAXBElement<>(_IndividualName_QNAME, IndividualName.class, null, value);
     }
 
     /**
@@ -81,7 +87,7 @@ public JAXBElement<IndividualName> createIndividualName(IndividualName value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0", name = "individualNameRecord")
     public JAXBElement<IndividualNameRecord> createIndividualNameRecord(IndividualNameRecord value) {
-        return new JAXBElement<IndividualNameRecord>(_IndividualNameRecord_QNAME, IndividualNameRecord.class, null, value);
+        return new JAXBElement<>(_IndividualNameRecord_QNAME, IndividualNameRecord.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/package-info.java
index 2090b81..de61ffa 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_0/ObjectFactory.java
index 01140f4..3a7c309 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_0/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_0;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -43,7 +43,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.0.0", name = "onlyNameIndicator")
     public JAXBElement<Boolean> createOnlyNameIndicator(Boolean value) {
-        return new JAXBElement<Boolean>(_OnlyNameIndicator_QNAME, Boolean.class, null, value);
+        return new JAXBElement<>(_OnlyNameIndicator_QNAME, Boolean.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/IndividualNameRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/IndividualNameRecord.java
new file mode 100644
index 0000000..3e1113c
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/IndividualNameRecord.java
@@ -0,0 +1,118 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.IndividualName;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for IndividualNameRecord complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="IndividualNameRecord"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType"/&gt;
+ *         &lt;element name="individualName" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0}IndividualName"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IndividualNameRecord", propOrder = {
+    "clientRef",
+    "tdsReference",
+    "individualName"
+})
+public class IndividualNameRecord {
+
+    protected String clientRef;
+    @XmlElement(required = true)
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected IndividualName individualName;
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the individualName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualName }
+     *     
+     */
+    public IndividualName getIndividualName() {
+        return individualName;
+    }
+
+    /**
+     * Sets the value of the individualName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualName }
+     *     
+     */
+    public void setIndividualName(IndividualName value) {
+        this.individualName = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/IndividualNameRecordResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/IndividualNameRecordResponse.java
new file mode 100644
index 0000000..2d5abc3
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/IndividualNameRecordResponse.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.IndividualName;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for IndividualNameRecordResponse complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="IndividualNameRecordResponse"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType" minOccurs="0"/&gt;
+ *         &lt;element name="individualName" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/3.2.0}IndividualName"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IndividualNameRecordResponse", propOrder = {
+    "tdsReference",
+    "individualName"
+})
+public class IndividualNameRecordResponse {
+
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected IndividualName individualName;
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the individualName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IndividualName }
+     *     
+     */
+    public IndividualName getIndividualName() {
+        return individualName;
+    }
+
+    /**
+     * Sets the value of the individualName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IndividualName }
+     *     
+     */
+    public void setIndividualName(IndividualName value) {
+        this.individualName = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/ObjectFactory.java
new file mode 100644
index 0000000..566f746
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/ObjectFactory.java
@@ -0,0 +1,69 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _IndividualNameRecord_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.1.0", "individualNameRecord");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link IndividualNameRecord }
+     * 
+     * @return
+     *     the new instance of {@link IndividualNameRecord }
+     */
+    public IndividualNameRecord createIndividualNameRecord() {
+        return new IndividualNameRecord();
+    }
+
+    /**
+     * Create an instance of {@link IndividualNameRecordResponse }
+     * 
+     * @return
+     *     the new instance of {@link IndividualNameRecordResponse }
+     */
+    public IndividualNameRecordResponse createIndividualNameRecordResponse() {
+        return new IndividualNameRecordResponse();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IndividualNameRecord }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link IndividualNameRecord }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.1.0", name = "individualNameRecord")
+    public JAXBElement<IndividualNameRecord> createIndividualNameRecord(IndividualNameRecord value) {
+        return new JAXBElement<>(_IndividualNameRecord_QNAME, IndividualNameRecord.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/package-info.java
new file mode 100644
index 0000000..ab121af
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/individualname/_5_1/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/LinkDetailsType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/LinkDetailsType.java
index 8365f90..e16175c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/LinkDetailsType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/LinkDetailsType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.link._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for LinkDetailsType complex type</p>.
+ * &lt;p&gt;Java class for LinkDetailsType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="LinkDetailsType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/ObjectFactory.java
index 076c14e..44f7765 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.link._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.link._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link LinkDetailsType }
      * 
+     * @return
+     *     the new instance of {@link LinkDetailsType }
      */
     public LinkDetailsType createLinkDetailsType() {
         return new LinkDetailsType();
@@ -51,7 +53,7 @@ public LinkDetailsType createLinkDetailsType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Link/3.2.0", name = "linkDetails")
     public JAXBElement<LinkDetailsType> createLinkDetails(LinkDetailsType value) {
-        return new JAXBElement<LinkDetailsType>(_LinkDetails_QNAME, LinkDetailsType.class, null, value);
+        return new JAXBElement<>(_LinkDetails_QNAME, LinkDetailsType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/RequestType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/RequestType.java
index 4a0fc60..01be32e 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/RequestType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/RequestType.java
@@ -1,25 +1,25 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.link._3_2;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for RequestType</p>.
+ * &lt;p&gt;Java class for RequestType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="RequestType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="Link"/&gt;
  *     &lt;enumeration value="Unlink"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "RequestType")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/package-info.java
index 211b3b9..721d6fd 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/link/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Link/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Link/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.link._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedIndividualType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedIndividualType.java
index d66ea7a..7407539 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedIndividualType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedIndividualType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for LinkedIndividualType complex type</p>.
+ * &lt;p&gt;Java class for LinkedIndividualType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="LinkedIndividualType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedOrganisationType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedOrganisationType.java
index e84c217..ea39405 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedOrganisationType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedOrganisationType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.Address;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for LinkedOrganisationType complex type</p>.
+ * &lt;p&gt;Java class for LinkedOrganisationType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="LinkedOrganisationType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedProviderType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedProviderType.java
index 0d2173f..ea2ab4b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedProviderType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/LinkedProviderType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for LinkedProviderType complex type</p>.
+ * &lt;p&gt;Java class for LinkedProviderType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="LinkedProviderType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/ObjectFactory.java
index 4d7eb41..7209c69 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link LinkedOrganisationType }
      * 
+     * @return
+     *     the new instance of {@link LinkedOrganisationType }
      */
     public LinkedOrganisationType createLinkedOrganisationType() {
         return new LinkedOrganisationType();
@@ -40,6 +42,8 @@ public LinkedOrganisationType createLinkedOrganisationType() {
     /**
      * Create an instance of {@link LinkedProviderType }
      * 
+     * @return
+     *     the new instance of {@link LinkedProviderType }
      */
     public LinkedProviderType createLinkedProviderType() {
         return new LinkedProviderType();
@@ -48,6 +52,8 @@ public LinkedProviderType createLinkedProviderType() {
     /**
      * Create an instance of {@link LinkedIndividualType }
      * 
+     * @return
+     *     the new instance of {@link LinkedIndividualType }
      */
     public LinkedIndividualType createLinkedIndividualType() {
         return new LinkedIndividualType();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/package-info.java
index 4dafbc1..f4eedc1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/linkedtype/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/LinkedType/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/LinkedType/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/ObjectFactory.java
index 971db89..68c8382 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link OrganisationDetails }
      * 
+     * @return
+     *     the new instance of {@link OrganisationDetails }
      */
     public OrganisationDetails createOrganisationDetails() {
         return new OrganisationDetails();
@@ -51,7 +53,7 @@ public OrganisationDetails createOrganisationDetails() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/3.2.0", name = "organisationDetails")
     public JAXBElement<OrganisationDetails> createOrganisationDetails(OrganisationDetails value) {
-        return new JAXBElement<OrganisationDetails>(_OrganisationDetails_QNAME, OrganisationDetails.class, null, value);
+        return new JAXBElement<>(_OrganisationDetails_QNAME, OrganisationDetails.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/OrganisationDetails.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/OrganisationDetails.java
index fc8f83d..68e2db3 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/OrganisationDetails.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/OrganisationDetails.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for OrganisationDetails complex type</p>.
+ * &lt;p&gt;Java class for OrganisationDetails complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="OrganisationDetails"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/package-info.java
index 8d77549..845b8d7 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationCriteriaType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationCriteriaType.java
index 6e1909d..1b1e710 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationCriteriaType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationCriteriaType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0.SearchForProviderOrganisation;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for BatchSearchForProviderOrganisationCriteriaType complex type</p>.
+ * &lt;p&gt;Java class for BatchSearchForProviderOrganisationCriteriaType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="BatchSearchForProviderOrganisationCriteriaType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationResultType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationResultType.java
index 522e284..080f548 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationResultType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/BatchSearchForProviderOrganisationResultType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0.SearchForProviderOrganisationResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for BatchSearchForProviderOrganisationResultType complex type</p>.
+ * &lt;p&gt;Java class for BatchSearchForProviderOrganisationResultType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="BatchSearchForProviderOrganisationResultType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/ObjectFactory.java
index 60f77f1..18447c6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link BatchSearchForProviderOrganisationCriteriaType }
      * 
+     * @return
+     *     the new instance of {@link BatchSearchForProviderOrganisationCriteriaType }
      */
     public BatchSearchForProviderOrganisationCriteriaType createBatchSearchForProviderOrganisationCriteriaType() {
         return new BatchSearchForProviderOrganisationCriteriaType();
@@ -45,6 +47,8 @@ public BatchSearchForProviderOrganisationCriteriaType createBatchSearchForProvid
     /**
      * Create an instance of {@link BatchSearchForProviderOrganisationResultType }
      * 
+     * @return
+     *     the new instance of {@link BatchSearchForProviderOrganisationResultType }
      */
     public BatchSearchForProviderOrganisationResultType createBatchSearchForProviderOrganisationResultType() {
         return new BatchSearchForProviderOrganisationResultType();
@@ -60,7 +64,7 @@ public BatchSearchForProviderOrganisationResultType createBatchSearchForProvider
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/5.1.0", name = "batchSearchForProviderOrganisationCriteria")
     public JAXBElement<BatchSearchForProviderOrganisationCriteriaType> createBatchSearchForProviderOrganisationCriteria(BatchSearchForProviderOrganisationCriteriaType value) {
-        return new JAXBElement<BatchSearchForProviderOrganisationCriteriaType>(_BatchSearchForProviderOrganisationCriteria_QNAME, BatchSearchForProviderOrganisationCriteriaType.class, null, value);
+        return new JAXBElement<>(_BatchSearchForProviderOrganisationCriteria_QNAME, BatchSearchForProviderOrganisationCriteriaType.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<BatchSearchForProviderOrganisationCriteriaType> createBatchSe
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/5.1.0", name = "batchSearchForProviderOrganisationResult")
     public JAXBElement<BatchSearchForProviderOrganisationResultType> createBatchSearchForProviderOrganisationResult(BatchSearchForProviderOrganisationResultType value) {
-        return new JAXBElement<BatchSearchForProviderOrganisationResultType>(_BatchSearchForProviderOrganisationResult_QNAME, BatchSearchForProviderOrganisationResultType.class, null, value);
+        return new JAXBElement<>(_BatchSearchForProviderOrganisationResult_QNAME, BatchSearchForProviderOrganisationResultType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/package-info.java
index 7bc4275..dede711 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationdetails/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationDetails/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/NameUsageType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/NameUsageType.java
index 4f27f0f..6a88438 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/NameUsageType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/NameUsageType.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for NameUsageType complex type</p>.
+ * &lt;p&gt;Java class for NameUsageType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="NameUsageType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -28,7 +28,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -52,8 +52,8 @@ public class NameUsageType {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the usage property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the usage property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -74,7 +74,7 @@ public class NameUsageType {
      */
     public List<UsageType> getUsage() {
         if (usage == null) {
-            usage = new ArrayList<UsageType>();
+            usage = new ArrayList<>();
         }
         return this.usage;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/ObjectFactory.java
index c3d7eee..6e81696 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -24,8 +24,8 @@
 @XmlRegistry
 public class ObjectFactory {
 
-    private static final QName _OrganisationName_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", "organisationName");
     private static final QName _OrganisationNameRecord_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", "organisationNameRecord");
+    private static final QName _OrganisationName_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", "organisationName");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2
@@ -35,53 +35,59 @@ public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link OrganisationName }
+     * Create an instance of {@link OrganisationNameRecord }
      * 
+     * @return
+     *     the new instance of {@link OrganisationNameRecord }
      */
-    public OrganisationName createOrganisationName() {
-        return new OrganisationName();
+    public OrganisationNameRecord createOrganisationNameRecord() {
+        return new OrganisationNameRecord();
     }
 
     /**
-     * Create an instance of {@link OrganisationNameRecord }
+     * Create an instance of {@link OrganisationName }
      * 
+     * @return
+     *     the new instance of {@link OrganisationName }
      */
-    public OrganisationNameRecord createOrganisationNameRecord() {
-        return new OrganisationNameRecord();
+    public OrganisationName createOrganisationName() {
+        return new OrganisationName();
     }
 
     /**
      * Create an instance of {@link NameUsageType }
      * 
+     * @return
+     *     the new instance of {@link NameUsageType }
      */
     public NameUsageType createNameUsageType() {
         return new NameUsageType();
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OrganisationName }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link OrganisationNameRecord }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link OrganisationName }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link OrganisationNameRecord }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", name = "organisationName")
-    public JAXBElement<OrganisationName> createOrganisationName(OrganisationName value) {
-        return new JAXBElement<OrganisationName>(_OrganisationName_QNAME, OrganisationName.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", name = "organisationNameRecord")
+    public JAXBElement<OrganisationNameRecord> createOrganisationNameRecord(OrganisationNameRecord value) {
+        return new JAXBElement<>(_OrganisationNameRecord_QNAME, OrganisationNameRecord.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OrganisationNameRecord }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link OrganisationName }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link OrganisationNameRecord }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link OrganisationName }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", name = "organisationNameRecord")
-    public JAXBElement<OrganisationNameRecord> createOrganisationNameRecord(OrganisationNameRecord value) {
-        return new JAXBElement<OrganisationNameRecord>(_OrganisationNameRecord_QNAME, OrganisationNameRecord.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", name = "organisationName")
+    public JAXBElement<OrganisationName> createOrganisationName(OrganisationName value) {
+        return new JAXBElement<>(_OrganisationName_QNAME, OrganisationName.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationName.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationName.java
index fd69cdf..421eb85 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationName.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationName.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for OrganisationName complex type</p>.
+ * &lt;p&gt;Java class for OrganisationName complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="OrganisationName"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationNameRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationNameRecord.java
index 31cf456..a19b8ae 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationNameRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/OrganisationNameRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for OrganisationNameRecord complex type</p>.
+ * &lt;p&gt;Java class for OrganisationNameRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="OrganisationNameRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0}OrganisationName"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/UsageType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/UsageType.java
index 854c151..a51b2ae 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/UsageType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/UsageType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for UsageType</p>.
+ * &lt;p&gt;Java class for UsageType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="UsageType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="U"/&gt;
@@ -24,7 +24,7 @@
  *     &lt;enumeration value="Y"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "UsageType")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/package-info.java
index 5a96649..2e2d961 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationname/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationName/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/ObjectFactory.java
index 12b26ee..b53b29d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link OrganisationServiceRecord }
      * 
+     * @return
+     *     the new instance of {@link OrganisationServiceRecord }
      */
     public OrganisationServiceRecord createOrganisationServiceRecord() {
         return new OrganisationServiceRecord();
@@ -45,6 +47,8 @@ public OrganisationServiceRecord createOrganisationServiceRecord() {
     /**
      * Create an instance of {@link OrganisationService }
      * 
+     * @return
+     *     the new instance of {@link OrganisationService }
      */
     public OrganisationService createOrganisationService() {
         return new OrganisationService();
@@ -60,7 +64,7 @@ public OrganisationService createOrganisationService() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationService/3.2.0", name = "organisationServiceRecord")
     public JAXBElement<OrganisationServiceRecord> createOrganisationServiceRecord(OrganisationServiceRecord value) {
-        return new JAXBElement<OrganisationServiceRecord>(_OrganisationServiceRecord_QNAME, OrganisationServiceRecord.class, null, value);
+        return new JAXBElement<>(_OrganisationServiceRecord_QNAME, OrganisationServiceRecord.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<OrganisationServiceRecord> createOrganisationServiceRecord(Or
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationService/3.2.0", name = "organisationService")
     public JAXBElement<OrganisationService> createOrganisationService(OrganisationService value) {
-        return new JAXBElement<OrganisationService>(_OrganisationService_QNAME, OrganisationService.class, null, value);
+        return new JAXBElement<>(_OrganisationService_QNAME, OrganisationService.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationService.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationService.java
index 06f9ecd..27e079c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationService.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationService.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for OrganisationService complex type</p>.
+ * &lt;p&gt;Java class for OrganisationService complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="OrganisationService"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationServiceRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationServiceRecord.java
index 1703c12..14dd1ef 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationServiceRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/OrganisationServiceRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for OrganisationServiceRecord complex type</p>.
+ * &lt;p&gt;Java class for OrganisationServiceRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="OrganisationServiceRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationService/3.2.0}OrganisationService"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/package-info.java
index a6f4c0f..9171cc5 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/organisationservice/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationService/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/OrganisationService/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/DeathNotificationType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/DeathNotificationType.java
index 62e2fd8..ea240cc 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/DeathNotificationType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/DeathNotificationType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DeathNotificationType complex type</p>.
+ * &lt;p&gt;Java class for DeathNotificationType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="DeathNotificationType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/ObjectFactory.java
index 55f0da1..b8c0785 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link PersonalDetails }
      * 
+     * @return
+     *     the new instance of {@link PersonalDetails }
      */
     public PersonalDetails createPersonalDetails() {
         return new PersonalDetails();
@@ -45,6 +47,8 @@ public PersonalDetails createPersonalDetails() {
     /**
      * Create an instance of {@link DeathNotificationType }
      * 
+     * @return
+     *     the new instance of {@link DeathNotificationType }
      */
     public DeathNotificationType createDeathNotificationType() {
         return new DeathNotificationType();
@@ -60,7 +64,7 @@ public DeathNotificationType createDeathNotificationType() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0", name = "personalDetails")
     public JAXBElement<PersonalDetails> createPersonalDetails(PersonalDetails value) {
-        return new JAXBElement<PersonalDetails>(_PersonalDetails_QNAME, PersonalDetails.class, null, value);
+        return new JAXBElement<>(_PersonalDetails_QNAME, PersonalDetails.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<PersonalDetails> createPersonalDetails(PersonalDetails value)
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0", name = "deathNotification")
     public JAXBElement<DeathNotificationType> createDeathNotification(DeathNotificationType value) {
-        return new JAXBElement<DeathNotificationType>(_DeathNotification_QNAME, DeathNotificationType.class, null, value);
+        return new JAXBElement<>(_DeathNotification_QNAME, DeathNotificationType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/PersonalDetails.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/PersonalDetails.java
index d457240..5324b65 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/PersonalDetails.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/PersonalDetails.java
@@ -1,21 +1,21 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PersonalDetails complex type</p>.
+ * &lt;p&gt;Java class for PersonalDetails complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="PersonalDetails"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/SourceOfDeathNotificationType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/SourceOfDeathNotificationType.java
index be8fe51..d1e6d8c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/SourceOfDeathNotificationType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/SourceOfDeathNotificationType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for SourceOfDeathNotificationType</p>.
+ * &lt;p&gt;Java class for SourceOfDeathNotificationType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="SourceOfDeathNotificationType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="D"/&gt;
@@ -22,7 +22,7 @@
  *     &lt;enumeration value="U"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "SourceOfDeathNotificationType")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/package-info.java
index 37d7322..039ef1d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_5_0/ObjectFactory.java
index 863c5dc..65a530a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/personaldetails/_5_0/ObjectFactory.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._5_0;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -44,7 +44,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/5.0.0", name = "dateOfBirth")
     public JAXBElement<XMLGregorianCalendar> createDateOfBirth(XMLGregorianCalendar value) {
-        return new JAXBElement<XMLGregorianCalendar>(_DateOfBirth_QNAME, XMLGregorianCalendar.class, null, value);
+        return new JAXBElement<>(_DateOfBirth_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_0/ObjectFactory.java
index 53fec14..5c2edab 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_0/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_0;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -24,9 +24,9 @@
 @XmlRegistry
 public class ObjectFactory {
 
-    private static final QName _HpioNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", "hpioNumber");
-    private static final QName _Status_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", "status");
     private static final QName _HpiiNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", "hpiiNumber");
+    private static final QName _Status_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", "status");
+    private static final QName _HpioNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", "hpioNumber");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_0
@@ -43,9 +43,9 @@ public ObjectFactory() {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", name = "hpioNumber")
-    public JAXBElement<String> createHpioNumber(String value) {
-        return new JAXBElement<String>(_HpioNumber_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", name = "hpiiNumber")
+    public JAXBElement<String> createHpiiNumber(String value) {
+        return new JAXBElement<>(_HpiiNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -58,7 +58,7 @@ public JAXBElement<String> createHpioNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", name = "status")
     public JAXBElement<String> createStatus(String value) {
-        return new JAXBElement<String>(_Status_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Status_QNAME, String.class, null, value);
     }
 
     /**
@@ -69,9 +69,9 @@ public JAXBElement<String> createStatus(String value) {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", name = "hpiiNumber")
-    public JAXBElement<String> createHpiiNumber(String value) {
-        return new JAXBElement<String>(_HpiiNumber_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.0.0", name = "hpioNumber")
+    public JAXBElement<String> createHpioNumber(String value) {
+        return new JAXBElement<>(_HpioNumber_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/BatchStatusType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/BatchStatusType.java
index 8904e7a..cb75791 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/BatchStatusType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/BatchStatusType.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_1;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
  * 
  * 
- * <p>Java class for BatchStatusType</p>.
+ * &lt;p&gt;Java class for BatchStatusType&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
- * <pre>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * &lt;pre&gt;{&#064;code
  * &lt;simpleType name="BatchStatusType"&gt;
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
  *     &lt;enumeration value="RECEIVED"/&gt;
@@ -21,7 +21,7 @@
  *     &lt;enumeration value="ERROR"/&gt;
  *   &lt;/restriction&gt;
  * &lt;/simpleType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  */
 @XmlType(name = "BatchStatusType", namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.1.0")
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/ObjectFactory.java
index 080febf..e7e1dfb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providercoreelements/_5_1/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_1;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.providercoreelements._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -45,7 +45,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.1.0", name = "batchIdentifier")
     public JAXBElement<String> createBatchIdentifier(String value) {
-        return new JAXBElement<String>(_BatchIdentifier_QNAME, String.class, null, value);
+        return new JAXBElement<>(_BatchIdentifier_QNAME, String.class, null, value);
     }
 
     /**
@@ -58,7 +58,7 @@ public JAXBElement<String> createBatchIdentifier(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.1.0", name = "requestIdentifier")
     public JAXBElement<String> createRequestIdentifier(String value) {
-        return new JAXBElement<String>(_RequestIdentifier_QNAME, String.class, null, value);
+        return new JAXBElement<>(_RequestIdentifier_QNAME, String.class, null, value);
     }
 
     /**
@@ -71,7 +71,7 @@ public JAXBElement<String> createRequestIdentifier(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderCoreElements/5.1.0", name = "batchStatus")
     public JAXBElement<BatchStatusType> createBatchStatus(BatchStatusType value) {
-        return new JAXBElement<BatchStatusType>(_BatchStatus_QNAME, BatchStatusType.class, null, value);
+        return new JAXBElement<>(_BatchStatus_QNAME, BatchStatusType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ObjectFactory.java
index 4978b5e..89a0d91 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -29,9 +29,21 @@ public class ObjectFactory {
     public ObjectFactory() {
     }
 
+    /**
+     * Create an instance of {@link ProviderDirectoryOrganisationEntryRecord }
+     * 
+     * @return
+     *     the new instance of {@link ProviderDirectoryOrganisationEntryRecord }
+     */
+    public ProviderDirectoryOrganisationEntryRecord createProviderDirectoryOrganisationEntryRecord() {
+        return new ProviderDirectoryOrganisationEntryRecord();
+    }
+
     /**
      * Create an instance of {@link ProviderDirectoryIndividualEntryRecord }
      * 
+     * @return
+     *     the new instance of {@link ProviderDirectoryIndividualEntryRecord }
      */
     public ProviderDirectoryIndividualEntryRecord createProviderDirectoryIndividualEntryRecord() {
         return new ProviderDirectoryIndividualEntryRecord();
@@ -40,6 +52,8 @@ public ProviderDirectoryIndividualEntryRecord createProviderDirectoryIndividualE
     /**
      * Create an instance of {@link ProviderDirectoryIndividualEntry }
      * 
+     * @return
+     *     the new instance of {@link ProviderDirectoryIndividualEntry }
      */
     public ProviderDirectoryIndividualEntry createProviderDirectoryIndividualEntry() {
         return new ProviderDirectoryIndividualEntry();
@@ -48,17 +62,11 @@ public ProviderDirectoryIndividualEntry createProviderDirectoryIndividualEntry()
     /**
      * Create an instance of {@link ProviderDirectoryOrganisationEntry }
      * 
+     * @return
+     *     the new instance of {@link ProviderDirectoryOrganisationEntry }
      */
     public ProviderDirectoryOrganisationEntry createProviderDirectoryOrganisationEntry() {
         return new ProviderDirectoryOrganisationEntry();
     }
 
-    /**
-     * Create an instance of {@link ProviderDirectoryOrganisationEntryRecord }
-     * 
-     */
-    public ProviderDirectoryOrganisationEntryRecord createProviderDirectoryOrganisationEntryRecord() {
-        return new ProviderDirectoryOrganisationEntryRecord();
-    }
-
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntry.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntry.java
index f7b7ccb..c971f14 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntry.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntry.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProviderDirectoryIndividualEntry complex type</p>.
+ * &lt;p&gt;Java class for ProviderDirectoryIndividualEntry complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProviderDirectoryIndividualEntry"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -32,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -100,8 +100,8 @@ public void setAddressExternalId(int value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationExternalId property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationExternalId property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -122,7 +122,7 @@ public void setAddressExternalId(int value) {
      */
     public List<Integer> getElectronicCommunicationExternalId() {
         if (electronicCommunicationExternalId == null) {
-            electronicCommunicationExternalId = new ArrayList<Integer>();
+            electronicCommunicationExternalId = new ArrayList<>();
         }
         return this.electronicCommunicationExternalId;
     }
@@ -132,8 +132,8 @@ public List<Integer> getElectronicCommunicationExternalId() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the providerTypeExternalId property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerTypeExternalId property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -154,7 +154,7 @@ public List<Integer> getElectronicCommunicationExternalId() {
      */
     public List<Integer> getProviderTypeExternalId() {
         if (providerTypeExternalId == null) {
-            providerTypeExternalId = new ArrayList<Integer>();
+            providerTypeExternalId = new ArrayList<>();
         }
         return this.providerTypeExternalId;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntryRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntryRecord.java
index 378df2b..985d79b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntryRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryIndividualEntryRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProviderDirectoryIndividualEntryRecord complex type</p>.
+ * &lt;p&gt;Java class for ProviderDirectoryIndividualEntryRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProviderDirectoryIndividualEntryRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderdirectoryService/3.2.0}ProviderDirectoryIndividualEntry"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntry.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntry.java
index 1e5e7ba..a8101d2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntry.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntry.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProviderDirectoryOrganisationEntry complex type</p>.
+ * &lt;p&gt;Java class for ProviderDirectoryOrganisationEntry complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProviderDirectoryOrganisationEntry"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -33,7 +33,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -104,8 +104,8 @@ public void setAddressExternalId(int value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationExternalId property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationExternalId property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -126,7 +126,7 @@ public void setAddressExternalId(int value) {
      */
     public List<Integer> getElectronicCommunicationExternalId() {
         if (electronicCommunicationExternalId == null) {
-            electronicCommunicationExternalId = new ArrayList<Integer>();
+            electronicCommunicationExternalId = new ArrayList<>();
         }
         return this.electronicCommunicationExternalId;
     }
@@ -136,8 +136,8 @@ public List<Integer> getElectronicCommunicationExternalId() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationServiceExternalId property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationServiceExternalId property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -158,7 +158,7 @@ public List<Integer> getElectronicCommunicationExternalId() {
      */
     public List<Integer> getOrganisationServiceExternalId() {
         if (organisationServiceExternalId == null) {
-            organisationServiceExternalId = new ArrayList<Integer>();
+            organisationServiceExternalId = new ArrayList<>();
         }
         return this.organisationServiceExternalId;
     }
@@ -168,8 +168,8 @@ public List<Integer> getOrganisationServiceExternalId() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the endpointLocatorServiceExternalId property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the endpointLocatorServiceExternalId property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -190,7 +190,7 @@ public List<Integer> getOrganisationServiceExternalId() {
      */
     public List<Integer> getEndpointLocatorServiceExternalId() {
         if (endpointLocatorServiceExternalId == null) {
-            endpointLocatorServiceExternalId = new ArrayList<Integer>();
+            endpointLocatorServiceExternalId = new ArrayList<>();
         }
         return this.endpointLocatorServiceExternalId;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntryRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntryRecord.java
index e709fb2..e544385 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntryRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/ProviderDirectoryOrganisationEntryRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProviderDirectoryOrganisationEntryRecord complex type</p>.
+ * &lt;p&gt;Java class for ProviderDirectoryOrganisationEntryRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProviderDirectoryOrganisationEntryRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderdirectoryService/3.2.0}ProviderDirectoryOrganisationEntry"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/package-info.java
index ca60871..6e0f6a5 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providerdirectoryservice/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderdirectoryService/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderdirectoryService/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ObjectFactory.java
index a460c96..690c738 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ProviderType }
      * 
+     * @return
+     *     the new instance of {@link ProviderType }
      */
     public ProviderType createProviderType() {
         return new ProviderType();
@@ -45,6 +47,8 @@ public ProviderType createProviderType() {
     /**
      * Create an instance of {@link ProviderTypeRecord }
      * 
+     * @return
+     *     the new instance of {@link ProviderTypeRecord }
      */
     public ProviderTypeRecord createProviderTypeRecord() {
         return new ProviderTypeRecord();
@@ -60,7 +64,7 @@ public ProviderTypeRecord createProviderTypeRecord() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0", name = "providerType")
     public JAXBElement<ProviderType> createProviderType(ProviderType value) {
-        return new JAXBElement<ProviderType>(_ProviderType_QNAME, ProviderType.class, null, value);
+        return new JAXBElement<>(_ProviderType_QNAME, ProviderType.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<ProviderType> createProviderType(ProviderType value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0", name = "providerTypeRecord")
     public JAXBElement<ProviderTypeRecord> createProviderTypeRecord(ProviderTypeRecord value) {
-        return new JAXBElement<ProviderTypeRecord>(_ProviderTypeRecord_QNAME, ProviderTypeRecord.class, null, value);
+        return new JAXBElement<>(_ProviderTypeRecord_QNAME, ProviderTypeRecord.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderType.java
index 350c881..a58e70b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderType.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DateAndAccuracyType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProviderType complex type</p>.
+ * &lt;p&gt;Java class for ProviderType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProviderType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -31,7 +31,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderTypeRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderTypeRecord.java
index e59fe2f..da53027 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderTypeRecord.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/ProviderTypeRecord.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ProviderTypeRecord complex type</p>.
+ * &lt;p&gt;Java class for ProviderTypeRecord complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ProviderTypeRecord"&gt;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0}ProviderType"&gt;
@@ -22,7 +22,7 @@
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/package-info.java
index d5e35b0..89822b7 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_0/ObjectFactory.java
index d913ec8..d13206a 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_0/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_0;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -43,7 +43,7 @@ public ObjectFactory() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.0.0", name = "registrationId")
     public JAXBElement<String> createRegistrationId(String value) {
-        return new JAXBElement<String>(_RegistrationId_QNAME, String.class, null, value);
+        return new JAXBElement<>(_RegistrationId_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualCriteriaType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualCriteriaType.java
index e2dd353..84ad9ed 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualCriteriaType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualCriteriaType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0.SearchForProviderIndividual;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for BatchSearchForProviderIndividualCriteriaType complex type</p>.
+ * &lt;p&gt;Java class for BatchSearchForProviderIndividualCriteriaType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="BatchSearchForProviderIndividualCriteriaType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualResultType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualResultType.java
index 78a588a..5d21bcb 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualResultType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/BatchSearchForProviderIndividualResultType.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0.SearchForProviderIndividualResult;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for BatchSearchForProviderIndividualResultType complex type</p>.
+ * &lt;p&gt;Java class for BatchSearchForProviderIndividualResultType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="BatchSearchForProviderIndividualResultType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ObjectFactory.java
index 270f168..54923d8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link BatchSearchForProviderIndividualCriteriaType }
      * 
+     * @return
+     *     the new instance of {@link BatchSearchForProviderIndividualCriteriaType }
      */
     public BatchSearchForProviderIndividualCriteriaType createBatchSearchForProviderIndividualCriteriaType() {
         return new BatchSearchForProviderIndividualCriteriaType();
@@ -45,6 +47,8 @@ public BatchSearchForProviderIndividualCriteriaType createBatchSearchForProvider
     /**
      * Create an instance of {@link BatchSearchForProviderIndividualResultType }
      * 
+     * @return
+     *     the new instance of {@link BatchSearchForProviderIndividualResultType }
      */
     public BatchSearchForProviderIndividualResultType createBatchSearchForProviderIndividualResultType() {
         return new BatchSearchForProviderIndividualResultType();
@@ -60,7 +64,7 @@ public BatchSearchForProviderIndividualResultType createBatchSearchForProviderIn
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.0", name = "batchSearchForProviderIndividualCriteria")
     public JAXBElement<BatchSearchForProviderIndividualCriteriaType> createBatchSearchForProviderIndividualCriteria(BatchSearchForProviderIndividualCriteriaType value) {
-        return new JAXBElement<BatchSearchForProviderIndividualCriteriaType>(_BatchSearchForProviderIndividualCriteria_QNAME, BatchSearchForProviderIndividualCriteriaType.class, null, value);
+        return new JAXBElement<>(_BatchSearchForProviderIndividualCriteria_QNAME, BatchSearchForProviderIndividualCriteriaType.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<BatchSearchForProviderIndividualCriteriaType> createBatchSear
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.0", name = "batchSearchForProviderIndividualResult")
     public JAXBElement<BatchSearchForProviderIndividualResultType> createBatchSearchForProviderIndividualResult(BatchSearchForProviderIndividualResultType value) {
-        return new JAXBElement<BatchSearchForProviderIndividualResultType>(_BatchSearchForProviderIndividualResult_QNAME, BatchSearchForProviderIndividualResultType.class, null, value);
+        return new JAXBElement<>(_BatchSearchForProviderIndividualResult_QNAME, BatchSearchForProviderIndividualResultType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ProviderTypeRecord.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ProviderTypeRecord.java
new file mode 100644
index 0000000..cd21693
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ProviderTypeRecord.java
@@ -0,0 +1,118 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ProviderType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for ProviderTypeRecord complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ProviderTypeRecord"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType"/&gt;
+ *         &lt;element name="providerType" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0}ProviderType"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProviderTypeRecord", propOrder = {
+    "clientRef",
+    "tdsReference",
+    "providerType"
+})
+public class ProviderTypeRecord {
+
+    protected String clientRef;
+    @XmlElement(required = true)
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected ProviderType providerType;
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the providerType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ProviderType }
+     *     
+     */
+    public ProviderType getProviderType() {
+        return providerType;
+    }
+
+    /**
+     * Sets the value of the providerType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ProviderType }
+     *     
+     */
+    public void setProviderType(ProviderType value) {
+        this.providerType = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ProviderTypeRecordResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ProviderTypeRecordResponse.java
new file mode 100644
index 0000000..7dc1517
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/ProviderTypeRecordResponse.java
@@ -0,0 +1,90 @@
+
+package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1;
+
+import au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ProviderType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for ProviderTypeRecordResponse complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ProviderTypeRecordResponse"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="tdsReference" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}TdsReferenceIdentifierType" minOccurs="0"/&gt;
+ *         &lt;element name="providerType" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/3.2.0}ProviderType"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProviderTypeRecordResponse", propOrder = {
+    "tdsReference",
+    "providerType"
+})
+public class ProviderTypeRecordResponse {
+
+    protected String tdsReference;
+    @XmlElement(required = true)
+    protected ProviderType providerType;
+
+    /**
+     * Gets the value of the tdsReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTdsReference() {
+        return tdsReference;
+    }
+
+    /**
+     * Sets the value of the tdsReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTdsReference(String value) {
+        this.tdsReference = value;
+    }
+
+    /**
+     * Gets the value of the providerType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ProviderType }
+     *     
+     */
+    public ProviderType getProviderType() {
+        return providerType;
+    }
+
+    /**
+     * Sets the value of the providerType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ProviderType }
+     *     
+     */
+    public void setProviderType(ProviderType value) {
+        this.providerType = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/package-info.java
index f2a1460..87de36b 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/providertype/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/ObjectFactory.java
index e5c19ed..2dfb79f 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.status._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providercore.status._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link Status }
      * 
+     * @return
+     *     the new instance of {@link Status }
      */
     public Status createStatus() {
         return new Status();
@@ -51,7 +53,7 @@ public Status createStatus() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Status/3.2.0", name = "status")
     public JAXBElement<Status> createStatus(Status value) {
-        return new JAXBElement<Status>(_Status_QNAME, Status.class, null, value);
+        return new JAXBElement<>(_Status_QNAME, Status.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/Status.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/Status.java
index 4839fa3..68c6868 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/Status.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/Status.java
@@ -1,18 +1,18 @@
 
 package au.net.electronichealth.ns.hi.xsd.providercore.status._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for Status complex type</p>.
+ * &lt;p&gt;Java class for Status complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="Status"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/package-info.java
index 783bdac..e9f1866 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providercore/status/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Status/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Status/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providercore.status._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java
index b8d142b..625c856 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividual.java
@@ -3,26 +3,26 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AddressRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateType;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunicationRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.IndividualNameRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.DeathNotificationType;
 import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.PersonalDetails;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -38,7 +38,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -123,8 +123,8 @@ public void setPersonalDetails(PersonalDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualNameRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -145,7 +145,7 @@ public void setPersonalDetails(PersonalDetails value) {
      */
     public List<IndividualNameRecord> getIndividualNameRecord() {
         if (individualNameRecord == null) {
-            individualNameRecord = new ArrayList<IndividualNameRecord>();
+            individualNameRecord = new ArrayList<>();
         }
         return this.individualNameRecord;
     }
@@ -155,8 +155,8 @@ public List<IndividualNameRecord> getIndividualNameRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -177,7 +177,7 @@ public List<IndividualNameRecord> getIndividualNameRecord() {
      */
     public List<AddressRecord> getAddressRecord() {
         if (addressRecord == null) {
-            addressRecord = new ArrayList<AddressRecord>();
+            addressRecord = new ArrayList<>();
         }
         return this.addressRecord;
     }
@@ -187,8 +187,8 @@ public List<AddressRecord> getAddressRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -209,7 +209,7 @@ public List<AddressRecord> getAddressRecord() {
      */
     public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
         if (electronicCommunicationRecord == null) {
-            electronicCommunicationRecord = new ArrayList<ElectronicCommunicationRecord>();
+            electronicCommunicationRecord = new ArrayList<>();
         }
         return this.electronicCommunicationRecord;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResult.java
index 73def5b..663d3fd 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ManageProviderAdministrativeIndividualResult.java
@@ -3,23 +3,23 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateResponseType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DetailsResponseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +35,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -118,8 +118,8 @@ public void setStatus(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualNameResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -140,7 +140,7 @@ public void setStatus(String value) {
      */
     public List<DetailsResponseType> getIndividualNameResponses() {
         if (individualNameResponses == null) {
-            individualNameResponses = new ArrayList<DetailsResponseType>();
+            individualNameResponses = new ArrayList<>();
         }
         return this.individualNameResponses;
     }
@@ -150,8 +150,8 @@ public List<DetailsResponseType> getIndividualNameResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -172,7 +172,7 @@ public List<DetailsResponseType> getIndividualNameResponses() {
      */
     public List<DetailsResponseType> getAddressResponses() {
         if (addressResponses == null) {
-            addressResponses = new ArrayList<DetailsResponseType>();
+            addressResponses = new ArrayList<>();
         }
         return this.addressResponses;
     }
@@ -182,8 +182,8 @@ public List<DetailsResponseType> getAddressResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -204,7 +204,7 @@ public List<DetailsResponseType> getAddressResponses() {
      */
     public List<DetailsResponseType> getElectronicCommunicationResponses() {
         if (electronicCommunicationResponses == null) {
-            electronicCommunicationResponses = new ArrayList<DetailsResponseType>();
+            electronicCommunicationResponses = new ArrayList<>();
         }
         return this.electronicCommunicationResponses;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ObjectFactory.java
index fcdab45..a2e82b8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.manageprovideradministrativeindividual._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.manageprovideradministrativeindividual._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ManageProviderAdministrativeIndividualResult }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderAdministrativeIndividualResult }
      */
     public ManageProviderAdministrativeIndividualResult createManageProviderAdministrativeIndividualResult() {
         return new ManageProviderAdministrativeIndividualResult();
@@ -44,6 +46,8 @@ public ManageProviderAdministrativeIndividualResult createManageProviderAdminist
     /**
      * Create an instance of {@link ManageProviderAdministrativeIndividual }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderAdministrativeIndividual }
      */
     public ManageProviderAdministrativeIndividual createManageProviderAdministrativeIndividual() {
         return new ManageProviderAdministrativeIndividual();
@@ -59,7 +63,7 @@ public ManageProviderAdministrativeIndividual createManageProviderAdministrative
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderAdministrativeIndividual/3.2.0", name = "qualifiedIdentifier")
     public JAXBElement<String> createQualifiedIdentifier(String value) {
-        return new JAXBElement<String>(_QualifiedIdentifier_QNAME, String.class, null, value);
+        return new JAXBElement<>(_QualifiedIdentifier_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/package-info.java
index fa64db9..2614482 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageprovideradministrativeindividual/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderAdministrativeIndividual/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderAdministrativeIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.manageprovideradministrativeindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java
index 1ea5313..629f44d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntry.java
@@ -3,22 +3,22 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryIndividualEntryRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryOrganisationEntryRecord;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -32,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -86,8 +86,8 @@ public void setQualifiedIdentifier(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -108,7 +108,7 @@ public void setQualifiedIdentifier(String value) {
      */
     public List<ProviderDirectoryOrganisationEntryRecord> getOrganisationEntry() {
         if (organisationEntry == null) {
-            organisationEntry = new ArrayList<ProviderDirectoryOrganisationEntryRecord>();
+            organisationEntry = new ArrayList<>();
         }
         return this.organisationEntry;
     }
@@ -118,8 +118,8 @@ public List<ProviderDirectoryOrganisationEntryRecord> getOrganisationEntry() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -140,7 +140,7 @@ public List<ProviderDirectoryOrganisationEntryRecord> getOrganisationEntry() {
      */
     public List<ProviderDirectoryIndividualEntryRecord> getIndividualEntry() {
         if (individualEntry == null) {
-            individualEntry = new ArrayList<ProviderDirectoryIndividualEntryRecord>();
+            individualEntry = new ArrayList<>();
         }
         return this.individualEntry;
     }
@@ -150,8 +150,8 @@ public List<ProviderDirectoryIndividualEntryRecord> getIndividualEntry() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationDeleteEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationDeleteEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -172,7 +172,7 @@ public List<ProviderDirectoryIndividualEntryRecord> getIndividualEntry() {
      */
     public List<Integer> getOrganisationDeleteEntry() {
         if (organisationDeleteEntry == null) {
-            organisationDeleteEntry = new ArrayList<Integer>();
+            organisationDeleteEntry = new ArrayList<>();
         }
         return this.organisationDeleteEntry;
     }
@@ -182,8 +182,8 @@ public List<Integer> getOrganisationDeleteEntry() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualDeleteEntry property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualDeleteEntry property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -204,7 +204,7 @@ public List<Integer> getOrganisationDeleteEntry() {
      */
     public List<Integer> getIndividualDeleteEntry() {
         if (individualDeleteEntry == null) {
-            individualDeleteEntry = new ArrayList<Integer>();
+            individualDeleteEntry = new ArrayList<>();
         }
         return this.individualDeleteEntry;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResult.java
index 28f6ddc..b7c0877 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ManageProviderDirectoryEntryResult.java
@@ -3,21 +3,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DetailsResponseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -31,7 +31,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -58,8 +58,8 @@ public class ManageProviderDirectoryEntryResult {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualEntryResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualEntryResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -80,7 +80,7 @@ public class ManageProviderDirectoryEntryResult {
      */
     public List<DetailsResponseType> getIndividualEntryResponses() {
         if (individualEntryResponses == null) {
-            individualEntryResponses = new ArrayList<DetailsResponseType>();
+            individualEntryResponses = new ArrayList<>();
         }
         return this.individualEntryResponses;
     }
@@ -90,8 +90,8 @@ public List<DetailsResponseType> getIndividualEntryResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationEntryResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationEntryResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -112,7 +112,7 @@ public List<DetailsResponseType> getIndividualEntryResponses() {
      */
     public List<DetailsResponseType> getOrganisationEntryResponses() {
         if (organisationEntryResponses == null) {
-            organisationEntryResponses = new ArrayList<DetailsResponseType>();
+            organisationEntryResponses = new ArrayList<>();
         }
         return this.organisationEntryResponses;
     }
@@ -122,8 +122,8 @@ public List<DetailsResponseType> getOrganisationEntryResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the deleteIndividualEntryResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the deleteIndividualEntryResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -144,7 +144,7 @@ public List<DetailsResponseType> getOrganisationEntryResponses() {
      */
     public List<DetailsResponseType> getDeleteIndividualEntryResponses() {
         if (deleteIndividualEntryResponses == null) {
-            deleteIndividualEntryResponses = new ArrayList<DetailsResponseType>();
+            deleteIndividualEntryResponses = new ArrayList<>();
         }
         return this.deleteIndividualEntryResponses;
     }
@@ -154,8 +154,8 @@ public List<DetailsResponseType> getDeleteIndividualEntryResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the deleteOrganisationEntryResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the deleteOrganisationEntryResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -176,7 +176,7 @@ public List<DetailsResponseType> getDeleteIndividualEntryResponses() {
      */
     public List<DetailsResponseType> getDeleteOrganisationEntryResponses() {
         if (deleteOrganisationEntryResponses == null) {
-            deleteOrganisationEntryResponses = new ArrayList<DetailsResponseType>();
+            deleteOrganisationEntryResponses = new ArrayList<>();
         }
         return this.deleteOrganisationEntryResponses;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ObjectFactory.java
index 84f58b3..9cfa25c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/ObjectFactory.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderdirectoryentry._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryIndividualEntryRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryOrganisationEntryRecord;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderdirectoryentry._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -42,6 +42,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ManageProviderDirectoryEntryResult }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderDirectoryEntryResult }
      */
     public ManageProviderDirectoryEntryResult createManageProviderDirectoryEntryResult() {
         return new ManageProviderDirectoryEntryResult();
@@ -50,6 +52,8 @@ public ManageProviderDirectoryEntryResult createManageProviderDirectoryEntryResu
     /**
      * Create an instance of {@link ManageProviderDirectoryEntry }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderDirectoryEntry }
      */
     public ManageProviderDirectoryEntry createManageProviderDirectoryEntry() {
         return new ManageProviderDirectoryEntry();
@@ -65,7 +69,7 @@ public ManageProviderDirectoryEntry createManageProviderDirectoryEntry() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", name = "qualifiedIdentifier")
     public JAXBElement<String> createQualifiedIdentifier(String value) {
-        return new JAXBElement<String>(_QualifiedIdentifier_QNAME, String.class, null, value);
+        return new JAXBElement<>(_QualifiedIdentifier_QNAME, String.class, null, value);
     }
 
     /**
@@ -78,7 +82,7 @@ public JAXBElement<String> createQualifiedIdentifier(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", name = "organisationEntry")
     public JAXBElement<ProviderDirectoryOrganisationEntryRecord> createOrganisationEntry(ProviderDirectoryOrganisationEntryRecord value) {
-        return new JAXBElement<ProviderDirectoryOrganisationEntryRecord>(_OrganisationEntry_QNAME, ProviderDirectoryOrganisationEntryRecord.class, null, value);
+        return new JAXBElement<>(_OrganisationEntry_QNAME, ProviderDirectoryOrganisationEntryRecord.class, null, value);
     }
 
     /**
@@ -91,7 +95,7 @@ public JAXBElement<ProviderDirectoryOrganisationEntryRecord> createOrganisationE
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", name = "individualEntry")
     public JAXBElement<ProviderDirectoryIndividualEntryRecord> createIndividualEntry(ProviderDirectoryIndividualEntryRecord value) {
-        return new JAXBElement<ProviderDirectoryIndividualEntryRecord>(_IndividualEntry_QNAME, ProviderDirectoryIndividualEntryRecord.class, null, value);
+        return new JAXBElement<>(_IndividualEntry_QNAME, ProviderDirectoryIndividualEntryRecord.class, null, value);
     }
 
     /**
@@ -104,7 +108,7 @@ public JAXBElement<ProviderDirectoryIndividualEntryRecord> createIndividualEntry
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", name = "organisationDeleteEntry")
     public JAXBElement<Integer> createOrganisationDeleteEntry(Integer value) {
-        return new JAXBElement<Integer>(_OrganisationDeleteEntry_QNAME, Integer.class, null, value);
+        return new JAXBElement<>(_OrganisationDeleteEntry_QNAME, Integer.class, null, value);
     }
 
     /**
@@ -117,7 +121,7 @@ public JAXBElement<Integer> createOrganisationDeleteEntry(Integer value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", name = "individualDeleteEntry")
     public JAXBElement<Integer> createIndividualDeleteEntry(Integer value) {
-        return new JAXBElement<Integer>(_IndividualDeleteEntry_QNAME, Integer.class, null, value);
+        return new JAXBElement<>(_IndividualDeleteEntry_QNAME, Integer.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/package-info.java
index 060f283..de3d7ee 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderdirectoryentry/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderDirectoryEntry/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderdirectoryentry._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisation.java
index 9e8698f..3229484 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisation.java
@@ -3,12 +3,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AddressRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateType;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunicationRecord;
@@ -18,14 +12,20 @@
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2.OrganisationNameRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.OrganisationServiceRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.status._3_2.Status;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -44,7 +44,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -162,8 +162,8 @@ public void setOrganisationDetails(OrganisationDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationNameRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationNameRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -184,7 +184,7 @@ public void setOrganisationDetails(OrganisationDetails value) {
      */
     public List<OrganisationNameRecord> getOrganisationNameRecord() {
         if (organisationNameRecord == null) {
-            organisationNameRecord = new ArrayList<OrganisationNameRecord>();
+            organisationNameRecord = new ArrayList<>();
         }
         return this.organisationNameRecord;
     }
@@ -194,8 +194,8 @@ public List<OrganisationNameRecord> getOrganisationNameRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationServiceRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationServiceRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -216,7 +216,7 @@ public List<OrganisationNameRecord> getOrganisationNameRecord() {
      */
     public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
         if (organisationServiceRecord == null) {
-            organisationServiceRecord = new ArrayList<OrganisationServiceRecord>();
+            organisationServiceRecord = new ArrayList<>();
         }
         return this.organisationServiceRecord;
     }
@@ -226,8 +226,8 @@ public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -248,7 +248,7 @@ public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
      */
     public List<AddressRecord> getAddressRecord() {
         if (addressRecord == null) {
-            addressRecord = new ArrayList<AddressRecord>();
+            addressRecord = new ArrayList<>();
         }
         return this.addressRecord;
     }
@@ -258,8 +258,8 @@ public List<AddressRecord> getAddressRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -280,7 +280,7 @@ public List<AddressRecord> getAddressRecord() {
      */
     public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
         if (electronicCommunicationRecord == null) {
-            electronicCommunicationRecord = new ArrayList<ElectronicCommunicationRecord>();
+            electronicCommunicationRecord = new ArrayList<>();
         }
         return this.electronicCommunicationRecord;
     }
@@ -290,8 +290,8 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the endpointLocatorServiceRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the endpointLocatorServiceRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -312,7 +312,7 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      */
     public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
         if (endpointLocatorServiceRecord == null) {
-            endpointLocatorServiceRecord = new ArrayList<EndpointLocatorServiceRecord>();
+            endpointLocatorServiceRecord = new ArrayList<>();
         }
         return this.endpointLocatorServiceRecord;
     }
@@ -322,8 +322,8 @@ public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkDetails property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkDetails property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -344,7 +344,7 @@ public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
      */
     public List<LinkDetailsType> getLinkDetails() {
         if (linkDetails == null) {
-            linkDetails = new ArrayList<LinkDetailsType>();
+            linkDetails = new ArrayList<>();
         }
         return this.linkDetails;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisationResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisationResult.java
index b311799..5ceff87 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisationResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ManageProviderOrganisationResult.java
@@ -3,23 +3,23 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateResponseType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.DetailsResponseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -37,7 +37,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -124,8 +124,8 @@ public void setStatus(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationNameResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationNameResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -146,7 +146,7 @@ public void setStatus(String value) {
      */
     public List<DetailsResponseType> getOrganisationNameResponses() {
         if (organisationNameResponses == null) {
-            organisationNameResponses = new ArrayList<DetailsResponseType>();
+            organisationNameResponses = new ArrayList<>();
         }
         return this.organisationNameResponses;
     }
@@ -156,8 +156,8 @@ public List<DetailsResponseType> getOrganisationNameResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationServiceResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationServiceResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -178,7 +178,7 @@ public List<DetailsResponseType> getOrganisationNameResponses() {
      */
     public List<DetailsResponseType> getOrganisationServiceResponses() {
         if (organisationServiceResponses == null) {
-            organisationServiceResponses = new ArrayList<DetailsResponseType>();
+            organisationServiceResponses = new ArrayList<>();
         }
         return this.organisationServiceResponses;
     }
@@ -188,8 +188,8 @@ public List<DetailsResponseType> getOrganisationServiceResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -210,7 +210,7 @@ public List<DetailsResponseType> getOrganisationServiceResponses() {
      */
     public List<DetailsResponseType> getAddressResponses() {
         if (addressResponses == null) {
-            addressResponses = new ArrayList<DetailsResponseType>();
+            addressResponses = new ArrayList<>();
         }
         return this.addressResponses;
     }
@@ -220,8 +220,8 @@ public List<DetailsResponseType> getAddressResponses() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -242,7 +242,7 @@ public List<DetailsResponseType> getAddressResponses() {
      */
     public List<DetailsResponseType> getElectronicCommunicationResponses() {
         if (electronicCommunicationResponses == null) {
-            electronicCommunicationResponses = new ArrayList<DetailsResponseType>();
+            electronicCommunicationResponses = new ArrayList<>();
         }
         return this.electronicCommunicationResponses;
     }
@@ -276,8 +276,8 @@ public void setCertificateResponse(CertificateResponseType value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the endpointLocatorServiceResponses property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the endpointLocatorServiceResponses property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -298,7 +298,7 @@ public void setCertificateResponse(CertificateResponseType value) {
      */
     public List<DetailsResponseType> getEndpointLocatorServiceResponses() {
         if (endpointLocatorServiceResponses == null) {
-            endpointLocatorServiceResponses = new ArrayList<DetailsResponseType>();
+            endpointLocatorServiceResponses = new ArrayList<>();
         }
         return this.endpointLocatorServiceResponses;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ObjectFactory.java
index 1f9828e..0518b39 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderorganisation._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderorganisation._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ManageProviderOrganisationResult }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderOrganisationResult }
      */
     public ManageProviderOrganisationResult createManageProviderOrganisationResult() {
         return new ManageProviderOrganisationResult();
@@ -44,6 +46,8 @@ public ManageProviderOrganisationResult createManageProviderOrganisationResult()
     /**
      * Create an instance of {@link ManageProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link ManageProviderOrganisation }
      */
     public ManageProviderOrganisation createManageProviderOrganisation() {
         return new ManageProviderOrganisation();
@@ -59,7 +63,7 @@ public ManageProviderOrganisation createManageProviderOrganisation() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderOrganisation/3.2.0", name = "hpioNumber")
     public JAXBElement<String> createHpioNumber(String value) {
-        return new JAXBElement<String>(_HpioNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_HpioNumber_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/package-info.java
index c5861e2..ed70e30 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/manageproviderorganisation/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderOrganisation/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageProviderOrganisation/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.manageproviderorganisation._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ManageTdsProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ManageTdsProviderIndividual.java
new file mode 100644
index 0000000..f9d7720
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ManageTdsProviderIndividual.java
@@ -0,0 +1,74 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0}providerIndividuals" maxOccurs="100"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "providerIndividuals"
+})
+@XmlRootElement(name = "manageTdsProviderIndividual")
+public class ManageTdsProviderIndividual {
+
+    @XmlElement(required = true)
+    protected List<ProviderIndividual> providerIndividuals;
+
+    /**
+     * Gets the value of the providerIndividuals property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerIndividuals property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getProviderIndividuals().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ProviderIndividual }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the providerIndividuals property.
+     */
+    public List<ProviderIndividual> getProviderIndividuals() {
+        if (providerIndividuals == null) {
+            providerIndividuals = new ArrayList<>();
+        }
+        return this.providerIndividuals;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ManageTdsProviderIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ManageTdsProviderIndividualResult.java
new file mode 100644
index 0000000..a93f7b6
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ManageTdsProviderIndividualResult.java
@@ -0,0 +1,72 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="providerIndividualResponses" type="{http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0}providerIndividualResponse" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "providerIndividualResponses"
+})
+@XmlRootElement(name = "manageTdsProviderIndividualResult")
+public class ManageTdsProviderIndividualResult {
+
+    protected List<ProviderIndividualResponse> providerIndividualResponses;
+
+    /**
+     * Gets the value of the providerIndividualResponses property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerIndividualResponses property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getProviderIndividualResponses().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ProviderIndividualResponse }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the providerIndividualResponses property.
+     */
+    public List<ProviderIndividualResponse> getProviderIndividualResponses() {
+        if (providerIndividualResponses == null) {
+            providerIndividualResponses = new ArrayList<>();
+        }
+        return this.providerIndividualResponses;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ObjectFactory.java
new file mode 100644
index 0000000..47eee08
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ObjectFactory.java
@@ -0,0 +1,89 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2;
+
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _ProviderIndividuals_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0", "providerIndividuals");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ProviderIndividual }
+     * 
+     * @return
+     *     the new instance of {@link ProviderIndividual }
+     */
+    public ProviderIndividual createProviderIndividual() {
+        return new ProviderIndividual();
+    }
+
+    /**
+     * Create an instance of {@link ManageTdsProviderIndividualResult }
+     * 
+     * @return
+     *     the new instance of {@link ManageTdsProviderIndividualResult }
+     */
+    public ManageTdsProviderIndividualResult createManageTdsProviderIndividualResult() {
+        return new ManageTdsProviderIndividualResult();
+    }
+
+    /**
+     * Create an instance of {@link ProviderIndividualResponse }
+     * 
+     * @return
+     *     the new instance of {@link ProviderIndividualResponse }
+     */
+    public ProviderIndividualResponse createProviderIndividualResponse() {
+        return new ProviderIndividualResponse();
+    }
+
+    /**
+     * Create an instance of {@link ManageTdsProviderIndividual }
+     * 
+     * @return
+     *     the new instance of {@link ManageTdsProviderIndividual }
+     */
+    public ManageTdsProviderIndividual createManageTdsProviderIndividual() {
+        return new ManageTdsProviderIndividual();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ProviderIndividual }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ProviderIndividual }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0", name = "providerIndividuals")
+    public JAXBElement<ProviderIndividual> createProviderIndividuals(ProviderIndividual value) {
+        return new JAXBElement<>(_ProviderIndividuals_QNAME, ProviderIndividual.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ProviderIndividual.java
new file mode 100644
index 0000000..0d58a3b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ProviderIndividual.java
@@ -0,0 +1,356 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.providercore.address._5_1.AddressRecord;
+import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateType;
+import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1.ElectronicCommunicationRecord;
+import au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1.IndividualNameRecord;
+import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.DeathNotificationType;
+import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.PersonalDetails;
+import au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.ProviderTypeRecord;
+import au.net.electronichealth.ns.hi.xsd.providercore.status._3_2.Status;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for providerIndividual complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="providerIndividual"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="hpiiNumber" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}HpiiNumberType" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/Status/3.2.0}status" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0}personalDetails" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.1.0}individualNameRecord" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/Address/5.1.0}addressRecord" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.1}providerTypeRecord" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/5.1.0}electronicCommunicationRecord" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0}deathNotification" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0}certificate" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "providerIndividual", propOrder = {
+    "clientRef",
+    "hpiiNumber",
+    "status",
+    "personalDetails",
+    "individualNameRecord",
+    "addressRecord",
+    "providerTypeRecord",
+    "electronicCommunicationRecord",
+    "deathNotification",
+    "certificate"
+})
+public class ProviderIndividual {
+
+    protected String clientRef;
+    @XmlSchemaType(name = "anyURI")
+    protected String hpiiNumber;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Status/3.2.0")
+    protected Status status;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0")
+    protected PersonalDetails personalDetails;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.1.0")
+    protected List<IndividualNameRecord> individualNameRecord;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Address/5.1.0")
+    protected List<AddressRecord> addressRecord;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.1")
+    protected List<ProviderTypeRecord> providerTypeRecord;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/5.1.0")
+    protected List<ElectronicCommunicationRecord> electronicCommunicationRecord;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0")
+    protected DeathNotificationType deathNotification;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0")
+    protected CertificateType certificate;
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the hpiiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHpiiNumber() {
+        return hpiiNumber;
+    }
+
+    /**
+     * Sets the value of the hpiiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHpiiNumber(String value) {
+        this.hpiiNumber = value;
+    }
+
+    /**
+     * Gets the value of the status property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Status }
+     *     
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * Sets the value of the status property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Status }
+     *     
+     */
+    public void setStatus(Status value) {
+        this.status = value;
+    }
+
+    /**
+     * Gets the value of the personalDetails property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PersonalDetails }
+     *     
+     */
+    public PersonalDetails getPersonalDetails() {
+        return personalDetails;
+    }
+
+    /**
+     * Sets the value of the personalDetails property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PersonalDetails }
+     *     
+     */
+    public void setPersonalDetails(PersonalDetails value) {
+        this.personalDetails = value;
+    }
+
+    /**
+     * Gets the value of the individualNameRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIndividualNameRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link IndividualNameRecord }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the individualNameRecord property.
+     */
+    public List<IndividualNameRecord> getIndividualNameRecord() {
+        if (individualNameRecord == null) {
+            individualNameRecord = new ArrayList<>();
+        }
+        return this.individualNameRecord;
+    }
+
+    /**
+     * Gets the value of the addressRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddressRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AddressRecord }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the addressRecord property.
+     */
+    public List<AddressRecord> getAddressRecord() {
+        if (addressRecord == null) {
+            addressRecord = new ArrayList<>();
+        }
+        return this.addressRecord;
+    }
+
+    /**
+     * Gets the value of the providerTypeRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerTypeRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getProviderTypeRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ProviderTypeRecord }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the providerTypeRecord property.
+     */
+    public List<ProviderTypeRecord> getProviderTypeRecord() {
+        if (providerTypeRecord == null) {
+            providerTypeRecord = new ArrayList<>();
+        }
+        return this.providerTypeRecord;
+    }
+
+    /**
+     * Gets the value of the electronicCommunicationRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunicationRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationRecord }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunicationRecord property.
+     */
+    public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
+        if (electronicCommunicationRecord == null) {
+            electronicCommunicationRecord = new ArrayList<>();
+        }
+        return this.electronicCommunicationRecord;
+    }
+
+    /**
+     * Gets the value of the deathNotification property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DeathNotificationType }
+     *     
+     */
+    public DeathNotificationType getDeathNotification() {
+        return deathNotification;
+    }
+
+    /**
+     * Sets the value of the deathNotification property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DeathNotificationType }
+     *     
+     */
+    public void setDeathNotification(DeathNotificationType value) {
+        this.deathNotification = value;
+    }
+
+    /**
+     * Gets the value of the certificate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CertificateType }
+     *     
+     */
+    public CertificateType getCertificate() {
+        return certificate;
+    }
+
+    /**
+     * Sets the value of the certificate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CertificateType }
+     *     
+     */
+    public void setCertificate(CertificateType value) {
+        this.certificate = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ProviderIndividualResponse.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ProviderIndividualResponse.java
new file mode 100644
index 0000000..489ff3b
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/ProviderIndividualResponse.java
@@ -0,0 +1,318 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.gov.medicareaustralia.ns.provider.schema._2013._06._22.elements.DetailsResponseType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import au.net.electronichealth.ns.hi.xsd.providercore.certificate._3_2.CertificateResponseType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for providerIndividualResponse complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="providerIndividualResponse"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="hpiiNumber" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}HpiiNumberType" minOccurs="0"/&gt;
+ *         &lt;element name="status" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}StatusType" minOccurs="0"/&gt;
+ *         &lt;element name="clientRef" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}ClientRefType" minOccurs="0"/&gt;
+ *         &lt;element name="individualNameResponses" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}DetailsResponseType" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element name="addressResponses" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}DetailsResponseType" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element name="providerTypeResponses" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}DetailsResponseType" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element name="electronicCommunicationResponses" type="{http://ns.medicareaustralia.gov.au/provider/schema/2013/06/22/elements}DetailsResponseType" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0}certificateResponse" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "providerIndividualResponse", propOrder = {
+    "hpiiNumber",
+    "status",
+    "clientRef",
+    "individualNameResponses",
+    "addressResponses",
+    "providerTypeResponses",
+    "electronicCommunicationResponses",
+    "certificateResponse",
+    "serviceMessages"
+})
+public class ProviderIndividualResponse {
+
+    @XmlSchemaType(name = "anyURI")
+    protected String hpiiNumber;
+    protected String status;
+    protected String clientRef;
+    protected List<DetailsResponseType> individualNameResponses;
+    protected List<DetailsResponseType> addressResponses;
+    protected List<DetailsResponseType> providerTypeResponses;
+    protected List<DetailsResponseType> electronicCommunicationResponses;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/providercore/Certificate/3.2.0")
+    protected CertificateResponseType certificateResponse;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected ServiceMessagesType serviceMessages;
+
+    /**
+     * Gets the value of the hpiiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHpiiNumber() {
+        return hpiiNumber;
+    }
+
+    /**
+     * Sets the value of the hpiiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHpiiNumber(String value) {
+        this.hpiiNumber = value;
+    }
+
+    /**
+     * Gets the value of the status property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * Sets the value of the status property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStatus(String value) {
+        this.status = value;
+    }
+
+    /**
+     * Gets the value of the clientRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClientRef() {
+        return clientRef;
+    }
+
+    /**
+     * Sets the value of the clientRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClientRef(String value) {
+        this.clientRef = value;
+    }
+
+    /**
+     * Gets the value of the individualNameResponses property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameResponses property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIndividualNameResponses().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DetailsResponseType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the individualNameResponses property.
+     */
+    public List<DetailsResponseType> getIndividualNameResponses() {
+        if (individualNameResponses == null) {
+            individualNameResponses = new ArrayList<>();
+        }
+        return this.individualNameResponses;
+    }
+
+    /**
+     * Gets the value of the addressResponses property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressResponses property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddressResponses().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DetailsResponseType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the addressResponses property.
+     */
+    public List<DetailsResponseType> getAddressResponses() {
+        if (addressResponses == null) {
+            addressResponses = new ArrayList<>();
+        }
+        return this.addressResponses;
+    }
+
+    /**
+     * Gets the value of the providerTypeResponses property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerTypeResponses property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getProviderTypeResponses().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DetailsResponseType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the providerTypeResponses property.
+     */
+    public List<DetailsResponseType> getProviderTypeResponses() {
+        if (providerTypeResponses == null) {
+            providerTypeResponses = new ArrayList<>();
+        }
+        return this.providerTypeResponses;
+    }
+
+    /**
+     * Gets the value of the electronicCommunicationResponses property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationResponses property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunicationResponses().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DetailsResponseType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunicationResponses property.
+     */
+    public List<DetailsResponseType> getElectronicCommunicationResponses() {
+        if (electronicCommunicationResponses == null) {
+            electronicCommunicationResponses = new ArrayList<>();
+        }
+        return this.electronicCommunicationResponses;
+    }
+
+    /**
+     * Gets the value of the certificateResponse property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CertificateResponseType }
+     *     
+     */
+    public CertificateResponseType getCertificateResponse() {
+        return certificateResponse;
+    }
+
+    /**
+     * Sets the value of the certificateResponse property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CertificateResponseType }
+     *     
+     */
+    public void setCertificateResponse(CertificateResponseType value) {
+        this.certificateResponse = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public ServiceMessagesType getServiceMessages() {
+        return serviceMessages;
+    }
+
+    /**
+     * Sets the value of the serviceMessages property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceMessagesType }
+     *     
+     */
+    public void setServiceMessages(ServiceMessagesType value) {
+        this.serviceMessages = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/package-info.java
new file mode 100644
index 0000000..35db618
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/managetdsproviderindividual/_3_2/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ManageTdsProviderIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.providermessages.managetdsproviderindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ObjectFactory.java
index 98ff9a7..162b2bd 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.readindividual._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.readindividual._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ReadProviderAdministrativeIndividualResult }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderAdministrativeIndividualResult }
      */
     public ReadProviderAdministrativeIndividualResult createReadProviderAdministrativeIndividualResult() {
         return new ReadProviderAdministrativeIndividualResult();
@@ -44,6 +46,8 @@ public ReadProviderAdministrativeIndividualResult createReadProviderAdministrati
     /**
      * Create an instance of {@link ReadProviderAdministrativeIndividual }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderAdministrativeIndividual }
      */
     public ReadProviderAdministrativeIndividual createReadProviderAdministrativeIndividual() {
         return new ReadProviderAdministrativeIndividual();
@@ -59,7 +63,7 @@ public ReadProviderAdministrativeIndividual createReadProviderAdministrativeIndi
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadIndividual/3.2.0", name = "qualifiedIdentifier")
     public JAXBElement<String> createQualifiedIdentifier(String value) {
-        return new JAXBElement<String>(_QualifiedIdentifier_QNAME, String.class, null, value);
+        return new JAXBElement<>(_QualifiedIdentifier_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividual.java
index a0d8fb2..da90a65 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividual.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.readindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividualResult.java
index cc2f41e..c705041 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividualResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/ReadProviderAdministrativeIndividualResult.java
@@ -3,12 +3,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AddressRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunicationRecord;
@@ -17,14 +11,20 @@
 import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.PersonalDetails;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryIndividualEntryRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ProviderTypeRecord;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -43,7 +43,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -160,8 +160,8 @@ public void setPersonalDetails(PersonalDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualNameRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -182,7 +182,7 @@ public void setPersonalDetails(PersonalDetails value) {
      */
     public List<IndividualNameRecord> getIndividualNameRecord() {
         if (individualNameRecord == null) {
-            individualNameRecord = new ArrayList<IndividualNameRecord>();
+            individualNameRecord = new ArrayList<>();
         }
         return this.individualNameRecord;
     }
@@ -192,8 +192,8 @@ public List<IndividualNameRecord> getIndividualNameRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -214,7 +214,7 @@ public List<IndividualNameRecord> getIndividualNameRecord() {
      */
     public List<AddressRecord> getAddressRecord() {
         if (addressRecord == null) {
-            addressRecord = new ArrayList<AddressRecord>();
+            addressRecord = new ArrayList<>();
         }
         return this.addressRecord;
     }
@@ -224,8 +224,8 @@ public List<AddressRecord> getAddressRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -246,7 +246,7 @@ public List<AddressRecord> getAddressRecord() {
      */
     public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
         if (electronicCommunicationRecord == null) {
-            electronicCommunicationRecord = new ArrayList<ElectronicCommunicationRecord>();
+            electronicCommunicationRecord = new ArrayList<>();
         }
         return this.electronicCommunicationRecord;
     }
@@ -256,8 +256,8 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the providerTypeRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerTypeRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -278,7 +278,7 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      */
     public List<ProviderTypeRecord> getProviderTypeRecord() {
         if (providerTypeRecord == null) {
-            providerTypeRecord = new ArrayList<ProviderTypeRecord>();
+            providerTypeRecord = new ArrayList<>();
         }
         return this.providerTypeRecord;
     }
@@ -288,8 +288,8 @@ public List<ProviderTypeRecord> getProviderTypeRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkedOrganisations property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkedOrganisations property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -310,7 +310,7 @@ public List<ProviderTypeRecord> getProviderTypeRecord() {
      */
     public List<LinkedOrganisationType> getLinkedOrganisations() {
         if (linkedOrganisations == null) {
-            linkedOrganisations = new ArrayList<LinkedOrganisationType>();
+            linkedOrganisations = new ArrayList<>();
         }
         return this.linkedOrganisations;
     }
@@ -320,8 +320,8 @@ public List<LinkedOrganisationType> getLinkedOrganisations() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the directoryServiceEntries property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the directoryServiceEntries property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -342,7 +342,7 @@ public List<LinkedOrganisationType> getLinkedOrganisations() {
      */
     public List<ProviderDirectoryIndividualEntryRecord> getDirectoryServiceEntries() {
         if (directoryServiceEntries == null) {
-            directoryServiceEntries = new ArrayList<ProviderDirectoryIndividualEntryRecord>();
+            directoryServiceEntries = new ArrayList<>();
         }
         return this.directoryServiceEntries;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/package-info.java
index 73363c8..f287aad 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readindividual/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadIndividual/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.readindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ObjectFactory.java
index e1013d4..3d22ad6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.readorganisation._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.readorganisation._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -37,6 +37,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ReadProviderOrganisationResult }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderOrganisationResult }
      */
     public ReadProviderOrganisationResult createReadProviderOrganisationResult() {
         return new ReadProviderOrganisationResult();
@@ -45,6 +47,8 @@ public ReadProviderOrganisationResult createReadProviderOrganisationResult() {
     /**
      * Create an instance of {@link ReadProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link ReadProviderOrganisation }
      */
     public ReadProviderOrganisation createReadProviderOrganisation() {
         return new ReadProviderOrganisation();
@@ -60,7 +64,7 @@ public ReadProviderOrganisation createReadProviderOrganisation() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadOrganisation/3.2.0", name = "hpioNumber")
     public JAXBElement<String> createHpioNumber(String value) {
-        return new JAXBElement<String>(_HpioNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_HpioNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -73,7 +77,7 @@ public JAXBElement<String> createHpioNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadOrganisation/3.2.0", name = "linkSearchType")
     public JAXBElement<String> createLinkSearchType(String value) {
-        return new JAXBElement<String>(_LinkSearchType_QNAME, String.class, null, value);
+        return new JAXBElement<>(_LinkSearchType_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisation.java
index 010852a..1c7fb24 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisation.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.readorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisationResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisationResult.java
index be334a4..1b85bcf 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisationResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/ReadProviderOrganisationResult.java
@@ -3,12 +3,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AddressRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunicationRecord;
@@ -19,14 +13,20 @@
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2.OrganisationNameRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.OrganisationServiceRecord;
 import au.net.electronichealth.ns.hi.xsd.providercore.providerdirectoryservice._3_2.ProviderDirectoryOrganisationEntryRecord;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -47,7 +47,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -169,8 +169,8 @@ public void setOrganisationDetails(OrganisationDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationNameRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationNameRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -191,7 +191,7 @@ public void setOrganisationDetails(OrganisationDetails value) {
      */
     public List<OrganisationNameRecord> getOrganisationNameRecord() {
         if (organisationNameRecord == null) {
-            organisationNameRecord = new ArrayList<OrganisationNameRecord>();
+            organisationNameRecord = new ArrayList<>();
         }
         return this.organisationNameRecord;
     }
@@ -201,8 +201,8 @@ public List<OrganisationNameRecord> getOrganisationNameRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationServiceRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationServiceRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -223,7 +223,7 @@ public List<OrganisationNameRecord> getOrganisationNameRecord() {
      */
     public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
         if (organisationServiceRecord == null) {
-            organisationServiceRecord = new ArrayList<OrganisationServiceRecord>();
+            organisationServiceRecord = new ArrayList<>();
         }
         return this.organisationServiceRecord;
     }
@@ -233,8 +233,8 @@ public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the addressRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -255,7 +255,7 @@ public List<OrganisationServiceRecord> getOrganisationServiceRecord() {
      */
     public List<AddressRecord> getAddressRecord() {
         if (addressRecord == null) {
-            addressRecord = new ArrayList<AddressRecord>();
+            addressRecord = new ArrayList<>();
         }
         return this.addressRecord;
     }
@@ -265,8 +265,8 @@ public List<AddressRecord> getAddressRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunicationRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -287,7 +287,7 @@ public List<AddressRecord> getAddressRecord() {
      */
     public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
         if (electronicCommunicationRecord == null) {
-            electronicCommunicationRecord = new ArrayList<ElectronicCommunicationRecord>();
+            electronicCommunicationRecord = new ArrayList<>();
         }
         return this.electronicCommunicationRecord;
     }
@@ -297,8 +297,8 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the endpointLocatorServiceRecord property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the endpointLocatorServiceRecord property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -319,7 +319,7 @@ public List<ElectronicCommunicationRecord> getElectronicCommunicationRecord() {
      */
     public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
         if (endpointLocatorServiceRecord == null) {
-            endpointLocatorServiceRecord = new ArrayList<EndpointLocatorServiceRecord>();
+            endpointLocatorServiceRecord = new ArrayList<>();
         }
         return this.endpointLocatorServiceRecord;
     }
@@ -329,8 +329,8 @@ public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkedIndividuals property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkedIndividuals property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -351,7 +351,7 @@ public List<EndpointLocatorServiceRecord> getEndpointLocatorServiceRecord() {
      */
     public List<LinkedIndividualType> getLinkedIndividuals() {
         if (linkedIndividuals == null) {
-            linkedIndividuals = new ArrayList<LinkedIndividualType>();
+            linkedIndividuals = new ArrayList<>();
         }
         return this.linkedIndividuals;
     }
@@ -361,8 +361,8 @@ public List<LinkedIndividualType> getLinkedIndividuals() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkedOrganisations property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkedOrganisations property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -383,7 +383,7 @@ public List<LinkedIndividualType> getLinkedIndividuals() {
      */
     public List<LinkedOrganisationType> getLinkedOrganisations() {
         if (linkedOrganisations == null) {
-            linkedOrganisations = new ArrayList<LinkedOrganisationType>();
+            linkedOrganisations = new ArrayList<>();
         }
         return this.linkedOrganisations;
     }
@@ -393,8 +393,8 @@ public List<LinkedOrganisationType> getLinkedOrganisations() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the directoryServiceEntries property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the directoryServiceEntries property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -415,7 +415,7 @@ public List<LinkedOrganisationType> getLinkedOrganisations() {
      */
     public List<ProviderDirectoryOrganisationEntryRecord> getDirectoryServiceEntries() {
         if (directoryServiceEntries == null) {
-            directoryServiceEntries = new ArrayList<ProviderDirectoryOrganisationEntryRecord>();
+            directoryServiceEntries = new ArrayList<>();
         }
         return this.directoryServiceEntries;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/package-info.java
index c71b171..010e1db 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readorganisation/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadOrganisation/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadOrganisation/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.readorganisation._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ElementReferenceValuesType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ElementReferenceValuesType.java
index 6cc5c40..982e9a8 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ElementReferenceValuesType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ElementReferenceValuesType.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.elements._3_2.ReferenceSetType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ElementReferenceValuesType complex type</p>.
+ * &lt;p&gt;Java class for ElementReferenceValuesType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ElementReferenceValuesType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -70,8 +70,8 @@ public void setElementName(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the referenceSet property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the referenceSet property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -92,7 +92,7 @@ public void setElementName(String value) {
      */
     public List<ReferenceSetType> getReferenceSet() {
         if (referenceSet == null) {
-            referenceSet = new ArrayList<ReferenceSetType>();
+            referenceSet = new ArrayList<>();
         }
         return this.referenceSet;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ObjectFactory.java
index f761cb5..9676510 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ObjectFactory.java
@@ -1,17 +1,17 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.readreferencedata._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.readreferencedata._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -36,6 +36,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link ReadReferenceDataResult }
      * 
+     * @return
+     *     the new instance of {@link ReadReferenceDataResult }
      */
     public ReadReferenceDataResult createReadReferenceDataResult() {
         return new ReadReferenceDataResult();
@@ -44,6 +46,8 @@ public ReadReferenceDataResult createReadReferenceDataResult() {
     /**
      * Create an instance of {@link ElementReferenceValuesType }
      * 
+     * @return
+     *     the new instance of {@link ElementReferenceValuesType }
      */
     public ElementReferenceValuesType createElementReferenceValuesType() {
         return new ElementReferenceValuesType();
@@ -52,6 +56,8 @@ public ElementReferenceValuesType createElementReferenceValuesType() {
     /**
      * Create an instance of {@link ReadReferenceData }
      * 
+     * @return
+     *     the new instance of {@link ReadReferenceData }
      */
     public ReadReferenceData createReadReferenceData() {
         return new ReadReferenceData();
@@ -67,7 +73,7 @@ public ReadReferenceData createReadReferenceData() {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadReferenceData/3.2.0", name = "elementNames")
     public JAXBElement<String> createElementNames(String value) {
-        return new JAXBElement<String>(_ElementNames_QNAME, String.class, null, value);
+        return new JAXBElement<>(_ElementNames_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceData.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceData.java
index a7a4fbe..6af4077 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceData.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceData.java
@@ -3,19 +3,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -44,8 +44,8 @@ public class ReadReferenceData {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the elementNames property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the elementNames property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -66,7 +66,7 @@ public class ReadReferenceData {
      */
     public List<String> getElementNames() {
         if (elementNames == null) {
-            elementNames = new ArrayList<String>();
+            elementNames = new ArrayList<>();
         }
         return this.elementNames;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceDataResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceDataResult.java
index 6882e57..3631fff 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceDataResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/ReadReferenceDataResult.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -49,8 +49,8 @@ public class ReadReferenceDataResult {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the elementReferenceValues property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the elementReferenceValues property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -71,7 +71,7 @@ public class ReadReferenceDataResult {
      */
     public List<ElementReferenceValuesType> getElementReferenceValues() {
         if (elementReferenceValues == null) {
-            elementReferenceValues = new ArrayList<ElementReferenceValuesType>();
+            elementReferenceValues = new ArrayList<>();
         }
         return this.elementReferenceValues;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/package-info.java
index b231c3f..335d1fe 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/readreferencedata/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadReferenceData/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/ReadReferenceData/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.readreferencedata._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/ObjectFactory.java
index b0b5679..596f242 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderindividual._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link RetrieveSearchForProviderIndividualResult }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderIndividualResult }
      */
     public RetrieveSearchForProviderIndividualResult createRetrieveSearchForProviderIndividualResult() {
         return new RetrieveSearchForProviderIndividualResult();
@@ -40,6 +42,8 @@ public RetrieveSearchForProviderIndividualResult createRetrieveSearchForProvider
     /**
      * Create an instance of {@link RetrieveSearchForProviderIndividual }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderIndividual }
      */
     public RetrieveSearchForProviderIndividual createRetrieveSearchForProviderIndividual() {
         return new RetrieveSearchForProviderIndividual();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java
index e2ebe0a..d2cdcca 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividual.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividualResult.java
index 666b06d..4264941 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividualResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/RetrieveSearchForProviderIndividualResult.java
@@ -3,21 +3,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.BatchSearchForProviderIndividualResultType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -78,8 +78,8 @@ public void setBatchIdentifier(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the batchSearchForProviderIndividualResult property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the batchSearchForProviderIndividualResult property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -100,7 +100,7 @@ public void setBatchIdentifier(String value) {
      */
     public List<BatchSearchForProviderIndividualResultType> getBatchSearchForProviderIndividualResult() {
         if (batchSearchForProviderIndividualResult == null) {
-            batchSearchForProviderIndividualResult = new ArrayList<BatchSearchForProviderIndividualResultType>();
+            batchSearchForProviderIndividualResult = new ArrayList<>();
         }
         return this.batchSearchForProviderIndividualResult;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/package-info.java
index 0ebe289..0096787 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderindividual/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/RetrieveSearchProviderIndividual/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/RetrieveSearchProviderIndividual/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderindividual._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/ObjectFactory.java
index 85eea1d..c876d14 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderorganisation._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link RetrieveSearchForProviderOrganisationResult }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderOrganisationResult }
      */
     public RetrieveSearchForProviderOrganisationResult createRetrieveSearchForProviderOrganisationResult() {
         return new RetrieveSearchForProviderOrganisationResult();
@@ -40,6 +42,8 @@ public RetrieveSearchForProviderOrganisationResult createRetrieveSearchForProvid
     /**
      * Create an instance of {@link RetrieveSearchForProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link RetrieveSearchForProviderOrganisation }
      */
     public RetrieveSearchForProviderOrganisation createRetrieveSearchForProviderOrganisation() {
         return new RetrieveSearchForProviderOrganisation();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java
index 12f195a..944a1f1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisation.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -23,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResult.java
index 6cf5c8d..c3cd1df 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/RetrieveSearchForProviderOrganisationResult.java
@@ -3,21 +3,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1.BatchSearchForProviderOrganisationResultType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -29,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -78,8 +78,8 @@ public void setBatchIdentifier(String value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the batchSearchForProviderOrganisationResult property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the batchSearchForProviderOrganisationResult property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -100,7 +100,7 @@ public void setBatchIdentifier(String value) {
      */
     public List<BatchSearchForProviderOrganisationResultType> getBatchSearchForProviderOrganisationResult() {
         if (batchSearchForProviderOrganisationResult == null) {
-            batchSearchForProviderOrganisationResult = new ArrayList<BatchSearchForProviderOrganisationResultType>();
+            batchSearchForProviderOrganisationResult = new ArrayList<>();
         }
         return this.batchSearchForProviderOrganisationResult;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/package-info.java
index eb10bff..ff40798 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/retrievesearchproviderorganisation/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/RetrieveSearchProviderOrganisation/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/RetrieveSearchProviderOrganisation/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.retrievesearchproviderorganisation._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/IndividualProviderDirectoryEntryType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/IndividualProviderDirectoryEntryType.java
index 02dc8f4..59a2dfd 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/IndividualProviderDirectoryEntryType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/IndividualProviderDirectoryEntryType.java
@@ -3,25 +3,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.Address;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunication;
 import au.net.electronichealth.ns.hi.xsd.providercore.individualname._3_2.IndividualName;
 import au.net.electronichealth.ns.hi.xsd.providercore.linkedtype._3_2.LinkedOrganisationType;
 import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.PersonalDetails;
 import au.net.electronichealth.ns.hi.xsd.providercore.providertype._3_2.ProviderType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for IndividualProviderDirectoryEntryType complex type</p>.
+ * &lt;p&gt;Java class for IndividualProviderDirectoryEntryType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="IndividualProviderDirectoryEntryType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -39,7 +39,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -175,8 +175,8 @@ public void setAddress(Address value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunication property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -197,7 +197,7 @@ public void setAddress(Address value) {
      */
     public List<ElectronicCommunication> getElectronicCommunication() {
         if (electronicCommunication == null) {
-            electronicCommunication = new ArrayList<ElectronicCommunication>();
+            electronicCommunication = new ArrayList<>();
         }
         return this.electronicCommunication;
     }
@@ -207,8 +207,8 @@ public List<ElectronicCommunication> getElectronicCommunication() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the providerType property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerType property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -229,7 +229,7 @@ public List<ElectronicCommunication> getElectronicCommunication() {
      */
     public List<ProviderType> getProviderType() {
         if (providerType == null) {
-            providerType = new ArrayList<ProviderType>();
+            providerType = new ArrayList<>();
         }
         return this.providerType;
     }
@@ -239,8 +239,8 @@ public List<ProviderType> getProviderType() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkedOrganisations property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkedOrganisations property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -261,7 +261,7 @@ public List<ProviderType> getProviderType() {
      */
     public List<LinkedOrganisationType> getLinkedOrganisations() {
         if (linkedOrganisations == null) {
-            linkedOrganisations = new ArrayList<LinkedOrganisationType>();
+            linkedOrganisations = new ArrayList<>();
         }
         return this.linkedOrganisations;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/ObjectFactory.java
index 8e66aac..455b90c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/ObjectFactory.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -43,6 +43,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForIndividualResult }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForIndividualResult }
      */
     public SearchHIProviderDirectoryForIndividualResult createSearchHIProviderDirectoryForIndividualResult() {
         return new SearchHIProviderDirectoryForIndividualResult();
@@ -51,6 +53,8 @@ public SearchHIProviderDirectoryForIndividualResult createSearchHIProviderDirect
     /**
      * Create an instance of {@link IndividualProviderDirectoryEntryType }
      * 
+     * @return
+     *     the new instance of {@link IndividualProviderDirectoryEntryType }
      */
     public IndividualProviderDirectoryEntryType createIndividualProviderDirectoryEntryType() {
         return new IndividualProviderDirectoryEntryType();
@@ -59,6 +63,8 @@ public IndividualProviderDirectoryEntryType createIndividualProviderDirectoryEnt
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForIndividual }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForIndividual }
      */
     public SearchHIProviderDirectoryForIndividual createSearchHIProviderDirectoryForIndividual() {
         return new SearchHIProviderDirectoryForIndividual();
@@ -74,7 +80,7 @@ public SearchHIProviderDirectoryForIndividual createSearchHIProviderDirectoryFor
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", name = "hpiiNumber")
     public JAXBElement<String> createHpiiNumber(String value) {
-        return new JAXBElement<String>(_HpiiNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_HpiiNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -87,7 +93,7 @@ public JAXBElement<String> createHpiiNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", name = "providerTypeCode")
     public JAXBElement<String> createProviderTypeCode(String value) {
-        return new JAXBElement<String>(_ProviderTypeCode_QNAME, String.class, null, value);
+        return new JAXBElement<>(_ProviderTypeCode_QNAME, String.class, null, value);
     }
 
     /**
@@ -100,7 +106,7 @@ public JAXBElement<String> createProviderTypeCode(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", name = "providerSpecialty")
     public JAXBElement<String> createProviderSpecialty(String value) {
-        return new JAXBElement<String>(_ProviderSpecialty_QNAME, String.class, null, value);
+        return new JAXBElement<>(_ProviderSpecialty_QNAME, String.class, null, value);
     }
 
     /**
@@ -113,7 +119,7 @@ public JAXBElement<String> createProviderSpecialty(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", name = "providerSpecialisation")
     public JAXBElement<String> createProviderSpecialisation(String value) {
-        return new JAXBElement<String>(_ProviderSpecialisation_QNAME, String.class, null, value);
+        return new JAXBElement<>(_ProviderSpecialisation_QNAME, String.class, null, value);
     }
 
     /**
@@ -126,7 +132,7 @@ public JAXBElement<String> createProviderSpecialisation(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", name = "australianAddressCriteria")
     public JAXBElement<AustralianAddressCriteriaType> createAustralianAddressCriteria(AustralianAddressCriteriaType value) {
-        return new JAXBElement<AustralianAddressCriteriaType>(_AustralianAddressCriteria_QNAME, AustralianAddressCriteriaType.class, null, value);
+        return new JAXBElement<>(_AustralianAddressCriteria_QNAME, AustralianAddressCriteriaType.class, null, value);
     }
 
     /**
@@ -139,7 +145,7 @@ public JAXBElement<AustralianAddressCriteriaType> createAustralianAddressCriteri
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", name = "internationalAddressCriteria")
     public JAXBElement<InternationalAddressCriteriaType> createInternationalAddressCriteria(InternationalAddressCriteriaType value) {
-        return new JAXBElement<InternationalAddressCriteriaType>(_InternationalAddressCriteria_QNAME, InternationalAddressCriteriaType.class, null, value);
+        return new JAXBElement<>(_InternationalAddressCriteria_QNAME, InternationalAddressCriteriaType.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividual.java
index f7ccf33..133ee68 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividual.java
@@ -1,23 +1,23 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +35,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividualResult.java
index 2b704cc..3c993a0 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividualResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/SearchHIProviderDirectoryForIndividualResult.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -48,8 +48,8 @@ public class SearchHIProviderDirectoryForIndividualResult {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the individualProviderDirectoryEntries property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualProviderDirectoryEntries property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -70,7 +70,7 @@ public class SearchHIProviderDirectoryForIndividualResult {
      */
     public List<IndividualProviderDirectoryEntryType> getIndividualProviderDirectoryEntries() {
         if (individualProviderDirectoryEntries == null) {
-            individualProviderDirectoryEntries = new ArrayList<IndividualProviderDirectoryEntryType>();
+            individualProviderDirectoryEntries = new ArrayList<>();
         }
         return this.individualProviderDirectoryEntries;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/package-info.java
index e0f3e1d..84abcd4 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/ObjectFactory.java
index 814cf53..27cc642 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -30,19 +30,23 @@ public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link SearchForProviderIndividualResult }
+     * Create an instance of {@link SearchForProviderIndividual }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderIndividual }
      */
-    public SearchForProviderIndividualResult createSearchForProviderIndividualResult() {
-        return new SearchForProviderIndividualResult();
+    public SearchForProviderIndividual createSearchForProviderIndividual() {
+        return new SearchForProviderIndividual();
     }
 
     /**
-     * Create an instance of {@link SearchForProviderIndividual }
+     * Create an instance of {@link SearchForProviderIndividualResult }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderIndividualResult }
      */
-    public SearchForProviderIndividual createSearchForProviderIndividual() {
-        return new SearchForProviderIndividual();
+    public SearchForProviderIndividualResult createSearchForProviderIndividualResult() {
+        return new SearchForProviderIndividualResult();
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividual.java
index 9b1f994..45ba548 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividual.java
@@ -3,25 +3,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0.SearchAustralianAddressType;
 import au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0.SearchInternationalAddressType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -41,7 +41,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -190,8 +190,8 @@ public void setOnlyNameIndicator(Boolean value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the givenName property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -212,7 +212,7 @@ public void setOnlyNameIndicator(Boolean value) {
      */
     public List<String> getGivenName() {
         if (givenName == null) {
-            givenName = new ArrayList<String>();
+            givenName = new ArrayList<>();
         }
         return this.givenName;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividualResult.java
index 68c32b2..0662e05 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividualResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/SearchForProviderIndividualResult.java
@@ -3,26 +3,26 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -44,7 +44,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -223,8 +223,8 @@ public void setOnlyNameIndicator(Boolean value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the givenName property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -245,7 +245,7 @@ public void setOnlyNameIndicator(Boolean value) {
      */
     public List<String> getGivenName() {
         if (givenName == null) {
-            givenName = new ArrayList<String>();
+            givenName = new ArrayList<>();
         }
         return this.givenName;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/package-info.java
index 52aca28..879b46c 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchindividual/_5_0/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/5.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchIndividual/5.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/ObjectFactory.java
index f2bfd95..5cffb45 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/ObjectFactory.java
@@ -1,19 +1,19 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._3_2;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._3_2 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -45,6 +45,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForOrganisationResult }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForOrganisationResult }
      */
     public SearchHIProviderDirectoryForOrganisationResult createSearchHIProviderDirectoryForOrganisationResult() {
         return new SearchHIProviderDirectoryForOrganisationResult();
@@ -53,6 +55,8 @@ public SearchHIProviderDirectoryForOrganisationResult createSearchHIProviderDire
     /**
      * Create an instance of {@link OrganisationProviderDirectoryEntryType }
      * 
+     * @return
+     *     the new instance of {@link OrganisationProviderDirectoryEntryType }
      */
     public OrganisationProviderDirectoryEntryType createOrganisationProviderDirectoryEntryType() {
         return new OrganisationProviderDirectoryEntryType();
@@ -61,6 +65,8 @@ public OrganisationProviderDirectoryEntryType createOrganisationProviderDirector
     /**
      * Create an instance of {@link SearchHIProviderDirectoryForOrganisation }
      * 
+     * @return
+     *     the new instance of {@link SearchHIProviderDirectoryForOrganisation }
      */
     public SearchHIProviderDirectoryForOrganisation createSearchHIProviderDirectoryForOrganisation() {
         return new SearchHIProviderDirectoryForOrganisation();
@@ -76,7 +82,7 @@ public SearchHIProviderDirectoryForOrganisation createSearchHIProviderDirectoryF
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "hpioNumber")
     public JAXBElement<String> createHpioNumber(String value) {
-        return new JAXBElement<String>(_HpioNumber_QNAME, String.class, null, value);
+        return new JAXBElement<>(_HpioNumber_QNAME, String.class, null, value);
     }
 
     /**
@@ -89,7 +95,7 @@ public JAXBElement<String> createHpioNumber(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "name")
     public JAXBElement<String> createName(String value) {
-        return new JAXBElement<String>(_Name_QNAME, String.class, null, value);
+        return new JAXBElement<>(_Name_QNAME, String.class, null, value);
     }
 
     /**
@@ -102,7 +108,7 @@ public JAXBElement<String> createName(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "organisationType")
     public JAXBElement<String> createOrganisationType(String value) {
-        return new JAXBElement<String>(_OrganisationType_QNAME, String.class, null, value);
+        return new JAXBElement<>(_OrganisationType_QNAME, String.class, null, value);
     }
 
     /**
@@ -115,7 +121,7 @@ public JAXBElement<String> createOrganisationType(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "serviceType")
     public JAXBElement<String> createServiceType(String value) {
-        return new JAXBElement<String>(_ServiceType_QNAME, String.class, null, value);
+        return new JAXBElement<>(_ServiceType_QNAME, String.class, null, value);
     }
 
     /**
@@ -128,7 +134,7 @@ public JAXBElement<String> createServiceType(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "unitType")
     public JAXBElement<String> createUnitType(String value) {
-        return new JAXBElement<String>(_UnitType_QNAME, String.class, null, value);
+        return new JAXBElement<>(_UnitType_QNAME, String.class, null, value);
     }
 
     /**
@@ -141,7 +147,7 @@ public JAXBElement<String> createUnitType(String value) {
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "australianAddressCriteria")
     public JAXBElement<AustralianAddressCriteriaType> createAustralianAddressCriteria(AustralianAddressCriteriaType value) {
-        return new JAXBElement<AustralianAddressCriteriaType>(_AustralianAddressCriteria_QNAME, AustralianAddressCriteriaType.class, null, value);
+        return new JAXBElement<>(_AustralianAddressCriteria_QNAME, AustralianAddressCriteriaType.class, null, value);
     }
 
     /**
@@ -154,7 +160,7 @@ public JAXBElement<AustralianAddressCriteriaType> createAustralianAddressCriteri
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "internationalAddressCriteria")
     public JAXBElement<InternationalAddressCriteriaType> createInternationalAddressCriteria(InternationalAddressCriteriaType value) {
-        return new JAXBElement<InternationalAddressCriteriaType>(_InternationalAddressCriteria_QNAME, InternationalAddressCriteriaType.class, null, value);
+        return new JAXBElement<>(_InternationalAddressCriteria_QNAME, InternationalAddressCriteriaType.class, null, value);
     }
 
     /**
@@ -167,7 +173,7 @@ public JAXBElement<InternationalAddressCriteriaType> createInternationalAddressC
      */
     @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", name = "linkSearchType")
     public JAXBElement<String> createLinkSearchType(String value) {
-        return new JAXBElement<String>(_LinkSearchType_QNAME, String.class, null, value);
+        return new JAXBElement<>(_LinkSearchType_QNAME, String.class, null, value);
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/OrganisationProviderDirectoryEntryType.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/OrganisationProviderDirectoryEntryType.java
index 5a5eaff..d257dc6 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/OrganisationProviderDirectoryEntryType.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/OrganisationProviderDirectoryEntryType.java
@@ -3,11 +3,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.Address;
 import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._3_2.ElectronicCommunication;
 import au.net.electronichealth.ns.hi.xsd.providercore.endpoint._3_2.EndpointLocatorService;
@@ -16,14 +11,19 @@
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2.OrganisationDetails;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationname._3_2.OrganisationName;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationservice._3_2.OrganisationService;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for OrganisationProviderDirectoryEntryType complex type</p>.
+ * &lt;p&gt;Java class for OrganisationProviderDirectoryEntryType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="OrganisationProviderDirectoryEntryType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -43,7 +43,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -160,8 +160,8 @@ public void setOrganisationDetails(OrganisationDetails value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationService property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationService property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -182,7 +182,7 @@ public void setOrganisationDetails(OrganisationDetails value) {
      */
     public List<OrganisationService> getOrganisationService() {
         if (organisationService == null) {
-            organisationService = new ArrayList<OrganisationService>();
+            organisationService = new ArrayList<>();
         }
         return this.organisationService;
     }
@@ -216,8 +216,8 @@ public void setAddress(Address value) {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the electronicCommunication property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunication property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -238,7 +238,7 @@ public void setAddress(Address value) {
      */
     public List<ElectronicCommunication> getElectronicCommunication() {
         if (electronicCommunication == null) {
-            electronicCommunication = new ArrayList<ElectronicCommunication>();
+            electronicCommunication = new ArrayList<>();
         }
         return this.electronicCommunication;
     }
@@ -248,8 +248,8 @@ public List<ElectronicCommunication> getElectronicCommunication() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the endpointLocatorService property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the endpointLocatorService property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -270,7 +270,7 @@ public List<ElectronicCommunication> getElectronicCommunication() {
      */
     public List<EndpointLocatorService> getEndpointLocatorService() {
         if (endpointLocatorService == null) {
-            endpointLocatorService = new ArrayList<EndpointLocatorService>();
+            endpointLocatorService = new ArrayList<>();
         }
         return this.endpointLocatorService;
     }
@@ -280,8 +280,8 @@ public List<EndpointLocatorService> getEndpointLocatorService() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkedProviders property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkedProviders property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -302,7 +302,7 @@ public List<EndpointLocatorService> getEndpointLocatorService() {
      */
     public List<LinkedProviderType> getLinkedProviders() {
         if (linkedProviders == null) {
-            linkedProviders = new ArrayList<LinkedProviderType>();
+            linkedProviders = new ArrayList<>();
         }
         return this.linkedProviders;
     }
@@ -312,8 +312,8 @@ public List<LinkedProviderType> getLinkedProviders() {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the linkedOrganisations property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the linkedOrganisations property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -334,7 +334,7 @@ public List<LinkedProviderType> getLinkedProviders() {
      */
     public List<LinkedOrganisationType> getLinkedOrganisations() {
         if (linkedOrganisations == null) {
-            linkedOrganisations = new ArrayList<LinkedOrganisationType>();
+            linkedOrganisations = new ArrayList<>();
         }
         return this.linkedOrganisations;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java
index 0fd15c3..f260fea 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisation.java
@@ -1,23 +1,23 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._3_2;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.AustralianAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._3_2.OrganisationDetails;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +35,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisationResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisationResult.java
index 12a7404..c3e0674 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisationResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/SearchHIProviderDirectoryForOrganisationResult.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -48,8 +48,8 @@ public class SearchHIProviderDirectoryForOrganisationResult {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the organisationProviderDirectoryEntries property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the organisationProviderDirectoryEntries property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -70,7 +70,7 @@ public class SearchHIProviderDirectoryForOrganisationResult {
      */
     public List<OrganisationProviderDirectoryEntryType> getOrganisationProviderDirectoryEntries() {
         if (organisationProviderDirectoryEntries == null) {
-            organisationProviderDirectoryEntries = new ArrayList<OrganisationProviderDirectoryEntryType>();
+            organisationProviderDirectoryEntries = new ArrayList<>();
         }
         return this.organisationProviderDirectoryEntries;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/package-info.java
index b3dd18f..dd64fdc 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_3_2/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/3.2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._3_2;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/ObjectFactory.java
index 7b74421..f92cc21 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -30,19 +30,23 @@ public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link SearchForProviderOrganisationResult }
+     * Create an instance of {@link SearchForProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderOrganisation }
      */
-    public SearchForProviderOrganisationResult createSearchForProviderOrganisationResult() {
-        return new SearchForProviderOrganisationResult();
+    public SearchForProviderOrganisation createSearchForProviderOrganisation() {
+        return new SearchForProviderOrganisation();
     }
 
     /**
-     * Create an instance of {@link SearchForProviderOrganisation }
+     * Create an instance of {@link SearchForProviderOrganisationResult }
      * 
+     * @return
+     *     the new instance of {@link SearchForProviderOrganisationResult }
      */
-    public SearchForProviderOrganisation createSearchForProviderOrganisation() {
-        return new SearchForProviderOrganisation();
+    public SearchForProviderOrganisationResult createSearchForProviderOrganisationResult() {
+        return new SearchForProviderOrganisationResult();
     }
 
 }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisation.java
index e472b0c..54789cf 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisation.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -24,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisationResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisationResult.java
index d3dba69..3be2e32 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisationResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/SearchForProviderOrganisationResult.java
@@ -1,21 +1,21 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -27,7 +27,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/package-info.java
index 8217dfd..77e4ca2 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchorganisation/_5_0/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/5.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchOrganisation/5.0.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.searchorganisation._5_0;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/ObjectFactory.java
new file mode 100644
index 0000000..aa94925
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/ObjectFactory.java
@@ -0,0 +1,194 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1 package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _HpiiNumber_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "hpiiNumber");
+    private static final QName _RegistrationId_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "registrationId");
+    private static final QName _FamilyName_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "familyName");
+    private static final QName _GivenName_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "givenName");
+    private static final QName _ProviderTypeCode_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "providerTypeCode");
+    private static final QName _DateOfBirth_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "dateOfBirth");
+    private static final QName _Sex_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "sex");
+    private static final QName _Postcode_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "postcode");
+    private static final QName _State_QNAME = new QName("http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", "state");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link SearchTdsProviderIndividualResult }
+     * 
+     * @return
+     *     the new instance of {@link SearchTdsProviderIndividualResult }
+     */
+    public SearchTdsProviderIndividualResult createSearchTdsProviderIndividualResult() {
+        return new SearchTdsProviderIndividualResult();
+    }
+
+    /**
+     * Create an instance of {@link ProviderIndividual }
+     * 
+     * @return
+     *     the new instance of {@link ProviderIndividual }
+     */
+    public ProviderIndividual createProviderIndividual() {
+        return new ProviderIndividual();
+    }
+
+    /**
+     * Create an instance of {@link SearchTdsProviderIndividual }
+     * 
+     * @return
+     *     the new instance of {@link SearchTdsProviderIndividual }
+     */
+    public SearchTdsProviderIndividual createSearchTdsProviderIndividual() {
+        return new SearchTdsProviderIndividual();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "hpiiNumber")
+    public JAXBElement<String> createHpiiNumber(String value) {
+        return new JAXBElement<>(_HpiiNumber_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "registrationId")
+    public JAXBElement<String> createRegistrationId(String value) {
+        return new JAXBElement<>(_RegistrationId_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "familyName")
+    public JAXBElement<String> createFamilyName(String value) {
+        return new JAXBElement<>(_FamilyName_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "givenName")
+    public JAXBElement<String> createGivenName(String value) {
+        return new JAXBElement<>(_GivenName_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "providerTypeCode")
+    public JAXBElement<String> createProviderTypeCode(String value) {
+        return new JAXBElement<>(_ProviderTypeCode_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "dateOfBirth")
+    public JAXBElement<XMLGregorianCalendar> createDateOfBirth(XMLGregorianCalendar value) {
+        return new JAXBElement<>(_DateOfBirth_QNAME, XMLGregorianCalendar.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SexType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SexType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "sex")
+    public JAXBElement<SexType> createSex(SexType value) {
+        return new JAXBElement<>(_Sex_QNAME, SexType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "postcode")
+    public JAXBElement<String> createPostcode(String value) {
+        return new JAXBElement<>(_Postcode_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link StateType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link StateType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", name = "state")
+    public JAXBElement<StateType> createState(StateType value) {
+        return new JAXBElement<>(_State_QNAME, StateType.class, null, value);
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/ProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/ProviderIndividual.java
new file mode 100644
index 0000000..b5cf57e
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/ProviderIndividual.java
@@ -0,0 +1,273 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.providercore.address._5_1.AddressRecordResponse;
+import au.net.electronichealth.ns.hi.xsd.providercore.electroniccommunication._5_1.ElectronicCommunicationRecordResponse;
+import au.net.electronichealth.ns.hi.xsd.providercore.individualname._5_1.IndividualNameRecordResponse;
+import au.net.electronichealth.ns.hi.xsd.providercore.personaldetails._3_2.PersonalDetails;
+import au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.ProviderTypeRecordResponse;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="hpiiNumber" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}HpiiNumberType"/&gt;
+ *         &lt;element name="status" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Elements/3.2.0}StatusType"/&gt;
+ *         &lt;element name="personalDetails" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/PersonalDetails/3.2.0}PersonalDetails"/&gt;
+ *         &lt;element name="individualNameRecord" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/IndividualName/5.1.0}IndividualNameRecordResponse" maxOccurs="unbounded"/&gt;
+ *         &lt;element name="addressRecord" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/Address/5.1.0}AddressRecordResponse" maxOccurs="unbounded"/&gt;
+ *         &lt;element name="electronicCommunicationRecord" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/ElectronicCommunication/5.1.0}ElectronicCommunicationRecordResponse" maxOccurs="unbounded"/&gt;
+ *         &lt;element name="providerTypeRecord" type="{http://ns.electronichealth.net.au/hi/xsd/providercore/ProviderType/5.1.1}ProviderTypeRecordResponse" maxOccurs="unbounded"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "hpiiNumber",
+    "status",
+    "personalDetails",
+    "individualNameRecord",
+    "addressRecord",
+    "electronicCommunicationRecord",
+    "providerTypeRecord"
+})
+@XmlRootElement(name = "providerIndividual")
+public class ProviderIndividual {
+
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String hpiiNumber;
+    @XmlElement(required = true)
+    protected String status;
+    @XmlElement(required = true)
+    protected PersonalDetails personalDetails;
+    @XmlElement(required = true)
+    protected List<IndividualNameRecordResponse> individualNameRecord;
+    @XmlElement(required = true)
+    protected List<AddressRecordResponse> addressRecord;
+    @XmlElement(required = true)
+    protected List<ElectronicCommunicationRecordResponse> electronicCommunicationRecord;
+    @XmlElement(required = true)
+    protected List<ProviderTypeRecordResponse> providerTypeRecord;
+
+    /**
+     * Gets the value of the hpiiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHpiiNumber() {
+        return hpiiNumber;
+    }
+
+    /**
+     * Sets the value of the hpiiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHpiiNumber(String value) {
+        this.hpiiNumber = value;
+    }
+
+    /**
+     * Gets the value of the status property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * Sets the value of the status property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStatus(String value) {
+        this.status = value;
+    }
+
+    /**
+     * Gets the value of the personalDetails property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PersonalDetails }
+     *     
+     */
+    public PersonalDetails getPersonalDetails() {
+        return personalDetails;
+    }
+
+    /**
+     * Sets the value of the personalDetails property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PersonalDetails }
+     *     
+     */
+    public void setPersonalDetails(PersonalDetails value) {
+        this.personalDetails = value;
+    }
+
+    /**
+     * Gets the value of the individualNameRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the individualNameRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getIndividualNameRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link IndividualNameRecordResponse }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the individualNameRecord property.
+     */
+    public List<IndividualNameRecordResponse> getIndividualNameRecord() {
+        if (individualNameRecord == null) {
+            individualNameRecord = new ArrayList<>();
+        }
+        return this.individualNameRecord;
+    }
+
+    /**
+     * Gets the value of the addressRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the addressRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getAddressRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AddressRecordResponse }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the addressRecord property.
+     */
+    public List<AddressRecordResponse> getAddressRecord() {
+        if (addressRecord == null) {
+            addressRecord = new ArrayList<>();
+        }
+        return this.addressRecord;
+    }
+
+    /**
+     * Gets the value of the electronicCommunicationRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the electronicCommunicationRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getElectronicCommunicationRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElectronicCommunicationRecordResponse }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the electronicCommunicationRecord property.
+     */
+    public List<ElectronicCommunicationRecordResponse> getElectronicCommunicationRecord() {
+        if (electronicCommunicationRecord == null) {
+            electronicCommunicationRecord = new ArrayList<>();
+        }
+        return this.electronicCommunicationRecord;
+    }
+
+    /**
+     * Gets the value of the providerTypeRecord property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the providerTypeRecord property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getProviderTypeRecord().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ProviderTypeRecordResponse }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the providerTypeRecord property.
+     */
+    public List<ProviderTypeRecordResponse> getProviderTypeRecord() {
+        if (providerTypeRecord == null) {
+            providerTypeRecord = new ArrayList<>();
+        }
+        return this.providerTypeRecord;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/SearchTdsProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/SearchTdsProviderIndividual.java
new file mode 100644
index 0000000..dc171e7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/SearchTdsProviderIndividual.java
@@ -0,0 +1,299 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.SexType;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoredatatypes._3.StateType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}hpiiNumber" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}registrationId" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}familyName"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}givenName" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}providerTypeCode" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}dateOfBirth"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}sex" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}postcode" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}state" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "hpiiNumber",
+    "registrationId",
+    "familyName",
+    "givenName",
+    "providerTypeCode",
+    "dateOfBirth",
+    "sex",
+    "postcode",
+    "state"
+})
+@XmlRootElement(name = "searchTdsProviderIndividual")
+public class SearchTdsProviderIndividual {
+
+    @XmlSchemaType(name = "anyURI")
+    protected String hpiiNumber;
+    protected String registrationId;
+    @XmlElement(required = true)
+    protected String familyName;
+    protected List<String> givenName;
+    protected String providerTypeCode;
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "date")
+    protected XMLGregorianCalendar dateOfBirth;
+    @XmlSchemaType(name = "string")
+    protected SexType sex;
+    protected String postcode;
+    @XmlSchemaType(name = "string")
+    protected StateType state;
+
+    /**
+     * Gets the value of the hpiiNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHpiiNumber() {
+        return hpiiNumber;
+    }
+
+    /**
+     * Sets the value of the hpiiNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHpiiNumber(String value) {
+        this.hpiiNumber = value;
+    }
+
+    /**
+     * Gets the value of the registrationId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRegistrationId() {
+        return registrationId;
+    }
+
+    /**
+     * Sets the value of the registrationId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRegistrationId(String value) {
+        this.registrationId = value;
+    }
+
+    /**
+     * Gets the value of the familyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    /**
+     * Sets the value of the familyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyName(String value) {
+        this.familyName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the givenName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getGivenName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the givenName property.
+     */
+    public List<String> getGivenName() {
+        if (givenName == null) {
+            givenName = new ArrayList<>();
+        }
+        return this.givenName;
+    }
+
+    /**
+     * Gets the value of the providerTypeCode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getProviderTypeCode() {
+        return providerTypeCode;
+    }
+
+    /**
+     * Sets the value of the providerTypeCode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProviderTypeCode(String value) {
+        this.providerTypeCode = value;
+    }
+
+    /**
+     * Gets the value of the dateOfBirth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    /**
+     * Sets the value of the dateOfBirth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setDateOfBirth(XMLGregorianCalendar value) {
+        this.dateOfBirth = value;
+    }
+
+    /**
+     * Gets the value of the sex property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SexType }
+     *     
+     */
+    public SexType getSex() {
+        return sex;
+    }
+
+    /**
+     * Sets the value of the sex property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SexType }
+     *     
+     */
+    public void setSex(SexType value) {
+        this.sex = value;
+    }
+
+    /**
+     * Gets the value of the postcode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPostcode() {
+        return postcode;
+    }
+
+    /**
+     * Sets the value of the postcode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPostcode(String value) {
+        this.postcode = value;
+    }
+
+    /**
+     * Gets the value of the state property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link StateType }
+     *     
+     */
+    public StateType getState() {
+        return state;
+    }
+
+    /**
+     * Sets the value of the state property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link StateType }
+     *     
+     */
+    public void setState(StateType value) {
+        this.state = value;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/SearchTdsProviderIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/SearchTdsProviderIndividualResult.java
new file mode 100644
index 0000000..84758d7
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/SearchTdsProviderIndividualResult.java
@@ -0,0 +1,102 @@
+
+package au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1;
+
+import java.util.ArrayList;
+import java.util.List;
+import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0}providerIndividual" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0}serviceMessages" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "providerIndividual",
+    "serviceMessages"
+})
+@XmlRootElement(name = "searchTdsProviderIndividualResult")
+public class SearchTdsProviderIndividualResult {
+
+    protected ProviderIndividual providerIndividual;
+    @XmlElement(namespace = "http://ns.electronichealth.net.au/hi/xsd/common/CommonCoreElements/3.0")
+    protected List<ServiceMessagesType> serviceMessages;
+
+    /**
+     * Gets the value of the providerIndividual property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ProviderIndividual }
+     *     
+     */
+    public ProviderIndividual getProviderIndividual() {
+        return providerIndividual;
+    }
+
+    /**
+     * Sets the value of the providerIndividual property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ProviderIndividual }
+     *     
+     */
+    public void setProviderIndividual(ProviderIndividual value) {
+        this.providerIndividual = value;
+    }
+
+    /**
+     * Gets the value of the serviceMessages property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the serviceMessages property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getServiceMessages().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceMessagesType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the serviceMessages property.
+     */
+    public List<ServiceMessagesType> getServiceMessages() {
+        if (serviceMessages == null) {
+            serviceMessages = new ArrayList<>();
+        }
+        return this.serviceMessages;
+    }
+
+}
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/package-info.java
new file mode 100644
index 0000000..6d02ea5
--- /dev/null
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/searchtdsproviderindividual/_5_1/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SearchTdsProviderIndividual/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package au.net.electronichealth.ns.hi.xsd.providermessages.searchtdsproviderindividual._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/ObjectFactory.java
index 3358d68..d2e6cfa 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderindividual._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SubmitSearchForProviderIndividualResult }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderIndividualResult }
      */
     public SubmitSearchForProviderIndividualResult createSubmitSearchForProviderIndividualResult() {
         return new SubmitSearchForProviderIndividualResult();
@@ -40,6 +42,8 @@ public SubmitSearchForProviderIndividualResult createSubmitSearchForProviderIndi
     /**
      * Create an instance of {@link SubmitSearchForProviderIndividual }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderIndividual }
      */
     public SubmitSearchForProviderIndividual createSubmitSearchForProviderIndividual() {
         return new SubmitSearchForProviderIndividual();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividual.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividual.java
index 323fc5d..419e343 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividual.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividual.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.providertype._5_1.BatchSearchForProviderIndividualCriteriaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -45,8 +45,8 @@ public class SubmitSearchForProviderIndividual {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the batchSearchForProviderIndividualCriteria property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the batchSearchForProviderIndividualCriteria property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -67,7 +67,7 @@ public class SubmitSearchForProviderIndividual {
      */
     public List<BatchSearchForProviderIndividualCriteriaType> getBatchSearchForProviderIndividualCriteria() {
         if (batchSearchForProviderIndividualCriteria == null) {
-            batchSearchForProviderIndividualCriteria = new ArrayList<BatchSearchForProviderIndividualCriteriaType>();
+            batchSearchForProviderIndividualCriteria = new ArrayList<>();
         }
         return this.batchSearchForProviderIndividualCriteria;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividualResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividualResult.java
index e236416..6b6303d 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividualResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/SubmitSearchForProviderIndividualResult.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderindividual._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/package-info.java
index be7b7f4..3a036ea 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderindividual/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SubmitSearchProviderIndividual/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SubmitSearchProviderIndividual/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderindividual._5_1;
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/ObjectFactory.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/ObjectFactory.java
index 5967ef0..1d12984 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/ObjectFactory.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/ObjectFactory.java
@@ -1,14 +1,14 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderorganisation._5_1 package. 
- * <p>An ObjectFactory allows you to programatically 
+ * <p>An ObjectFactory allows you to programmatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,6 +32,8 @@ public ObjectFactory() {
     /**
      * Create an instance of {@link SubmitSearchForProviderOrganisationResult }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderOrganisationResult }
      */
     public SubmitSearchForProviderOrganisationResult createSubmitSearchForProviderOrganisationResult() {
         return new SubmitSearchForProviderOrganisationResult();
@@ -40,6 +42,8 @@ public SubmitSearchForProviderOrganisationResult createSubmitSearchForProviderOr
     /**
      * Create an instance of {@link SubmitSearchForProviderOrganisation }
      * 
+     * @return
+     *     the new instance of {@link SubmitSearchForProviderOrganisation }
      */
     public SubmitSearchForProviderOrganisation createSubmitSearchForProviderOrganisation() {
         return new SubmitSearchForProviderOrganisation();
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java
index 56b6e6c..753b4e1 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisation.java
@@ -3,20 +3,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.providercore.organisationdetails._5_1.BatchSearchForProviderOrganisationCriteriaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -26,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -45,8 +45,8 @@ public class SubmitSearchForProviderOrganisation {
      * 
      * <p>This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the batchSearchForProviderOrganisationCriteria property.</p>
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the batchSearchForProviderOrganisationCriteria property.</p>
      * 
      * <p>
      * For example, to add a new item, do as follows:
@@ -67,7 +67,7 @@ public class SubmitSearchForProviderOrganisation {
      */
     public List<BatchSearchForProviderOrganisationCriteriaType> getBatchSearchForProviderOrganisationCriteria() {
         if (batchSearchForProviderOrganisationCriteria == null) {
-            batchSearchForProviderOrganisationCriteria = new ArrayList<BatchSearchForProviderOrganisationCriteriaType>();
+            batchSearchForProviderOrganisationCriteria = new ArrayList<>();
         }
         return this.batchSearchForProviderOrganisationCriteria;
     }
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResult.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResult.java
index 2c039ac..75c6d21 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResult.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/SubmitSearchForProviderOrganisationResult.java
@@ -1,20 +1,20 @@
 
 package au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderorganisation._5_1;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import au.net.electronichealth.ns.hi.xsd.common.commoncoreelements._3.ServiceMessagesType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type</p>.
+ * &lt;p&gt;Java class for anonymous complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -25,7 +25,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/package-info.java b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/package-info.java
index dbcf7e5..fe86c16 100644
--- a/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/package-info.java
+++ b/src/main/java/au/net/electronichealth/ns/hi/xsd/providermessages/submitsearchproviderorganisation/_5_1/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SubmitSearchProviderOrganisation/5.1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ns.electronichealth.net.au/hi/xsd/providermessages/SubmitSearchProviderOrganisation/5.1.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package au.net.electronichealth.ns.hi.xsd.providermessages.submitsearchproviderorganisation._5_1;
diff --git a/src/main/java/hi_override/org/w3/xmldsig/CanonicalizationMethodType.java b/src/main/java/hi_override/org/w3/xmldsig/CanonicalizationMethodType.java
index a8c8912..5bb4c36 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/CanonicalizationMethodType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/CanonicalizationMethodType.java
@@ -1,30 +1,23 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CanonicalizationMethodType complex type</p>.
+ * &lt;p&gt;Java class for CanonicalizationMethodType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="CanonicalizationMethodType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +28,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -55,28 +48,22 @@ public class CanonicalizationMethodType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
-     * </p>
+     * {@link Object }
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/DSAKeyValueType.java b/src/main/java/hi_override/org/w3/xmldsig/DSAKeyValueType.java
index 5639120..3cd03bb 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/DSAKeyValueType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/DSAKeyValueType.java
@@ -1,25 +1,18 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DSAKeyValueType complex type</p>.
+ * &lt;p&gt;Java class for DSAKeyValueType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="DSAKeyValueType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -39,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/hi_override/org/w3/xmldsig/DigestMethodType.java b/src/main/java/hi_override/org/w3/xmldsig/DigestMethodType.java
index d81bbe4..3549ee3 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/DigestMethodType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/DigestMethodType.java
@@ -1,31 +1,24 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for DigestMethodType complex type</p>.
+ * &lt;p&gt;Java class for DigestMethodType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="DigestMethodType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -36,7 +29,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -56,29 +49,23 @@ public class DigestMethodType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
      * {@link Element }
-     * </p>
+     * {@link Object }
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/KeyInfoType.java b/src/main/java/hi_override/org/w3/xmldsig/KeyInfoType.java
index 7241454..c067b8f 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/KeyInfoType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/KeyInfoType.java
@@ -1,37 +1,30 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for KeyInfoType complex type</p>.
+ * &lt;p&gt;Java class for KeyInfoType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="KeyInfoType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -49,7 +42,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -60,13 +53,13 @@
 public class KeyInfoType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -80,36 +73,30 @@ public class KeyInfoType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link String }
      * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * {@link String }
+     * {@link Element }
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/KeyValueType.java b/src/main/java/hi_override/org/w3/xmldsig/KeyValueType.java
index 1d45ab7..bac949f 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/KeyValueType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/KeyValueType.java
@@ -1,32 +1,25 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for KeyValueType complex type</p>.
+ * &lt;p&gt;Java class for KeyValueType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="KeyValueType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -38,7 +31,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -49,8 +42,8 @@
 public class KeyValueType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -59,31 +52,25 @@ public class KeyValueType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
      * {@link Element }
-     * </p>
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/ManifestType.java b/src/main/java/hi_override/org/w3/xmldsig/ManifestType.java
index 3ad7f67..b6c616f 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/ManifestType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/ManifestType.java
@@ -1,32 +1,25 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for ManifestType complex type</p>.
+ * &lt;p&gt;Java class for ManifestType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ManifestType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -37,7 +30,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -58,27 +51,21 @@ public class ManifestType {
     /**
      * Gets the value of the reference property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the reference property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getReference().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getReference().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link ReferenceType }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the reference property.
      */
     public List<ReferenceType> getReference() {
         if (reference == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/ObjectFactory.java b/src/main/java/hi_override/org/w3/xmldsig/ObjectFactory.java
index 0dceec8..95557ad 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/ObjectFactory.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/ObjectFactory.java
@@ -1,17 +1,10 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.math.BigInteger;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 
@@ -19,7 +12,7 @@
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the hi_override.org.w3.xmldsig package. 
- * <p>An ObjectFactory allows you to programatically 
+ * &lt;p&gt;An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -32,40 +25,40 @@
 @XmlRegistry
 public class ObjectFactory {
 
-    private static final QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
-    private static final QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
-    private static final QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
-    private static final QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
-    private static final QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
-    private static final QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
-    private static final QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
-    private static final QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
-    private static final QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
-    private static final QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
-    private static final QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
-    private static final QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
-    private static final QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
-    private static final QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
-    private static final QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
-    private static final QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
-    private static final QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
-    private static final QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
-    private static final QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
-    private static final QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
-    private static final QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
-    private static final QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
-    private static final QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
-    private static final QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
-    private static final QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
-    private static final QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
-    private static final QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
-    private static final QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
-    private static final QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
-    private static final QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
-    private static final QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
-    private static final QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
-    private static final QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
-    private static final QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+    private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
+    private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
+    private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
+    private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
+    private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
+    private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
+    private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
+    private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
+    private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
+    private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
+    private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
+    private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
+    private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
+    private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
+    private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+    private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
+    private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
+    private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
+    private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+    private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
+    private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+    private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
+    private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
+    private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+    private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
+    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
+    private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
+    private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
+    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
+    private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
+    private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
+    private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
+    private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: hi_override.org.w3.xmldsig
@@ -75,35 +68,35 @@ public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link SignatureType }
+     * Create an instance of {@link KeyInfoType }
      * 
      */
-    public SignatureType createSignatureType() {
-        return new SignatureType();
+    public KeyInfoType createKeyInfoType() {
+        return new KeyInfoType();
     }
 
     /**
-     * Create an instance of {@link SignatureValueType }
+     * Create an instance of {@link SignedInfoType }
      * 
      */
-    public SignatureValueType createSignatureValueType() {
-        return new SignatureValueType();
+    public SignedInfoType createSignedInfoType() {
+        return new SignedInfoType();
     }
 
     /**
-     * Create an instance of {@link SignedInfoType }
+     * Create an instance of {@link RetrievalMethodType }
      * 
      */
-    public SignedInfoType createSignedInfoType() {
-        return new SignedInfoType();
+    public RetrievalMethodType createRetrievalMethodType() {
+        return new RetrievalMethodType();
     }
 
     /**
-     * Create an instance of {@link CanonicalizationMethodType }
+     * Create an instance of {@link DigestMethodType }
      * 
      */
-    public CanonicalizationMethodType createCanonicalizationMethodType() {
-        return new CanonicalizationMethodType();
+    public DigestMethodType createDigestMethodType() {
+        return new DigestMethodType();
     }
 
     /**
@@ -115,131 +108,131 @@ public SignatureMethodType createSignatureMethodType() {
     }
 
     /**
-     * Create an instance of {@link ReferenceType }
+     * Create an instance of {@link SPKIDataType }
      * 
      */
-    public ReferenceType createReferenceType() {
-        return new ReferenceType();
+    public SPKIDataType createSPKIDataType() {
+        return new SPKIDataType();
     }
 
     /**
-     * Create an instance of {@link TransformsType }
+     * Create an instance of {@link X509DataType }
      * 
      */
-    public TransformsType createTransformsType() {
-        return new TransformsType();
+    public X509DataType createX509DataType() {
+        return new X509DataType();
     }
 
     /**
-     * Create an instance of {@link TransformType }
+     * Create an instance of {@link PGPDataType }
      * 
      */
-    public TransformType createTransformType() {
-        return new TransformType();
+    public PGPDataType createPGPDataType() {
+        return new PGPDataType();
     }
 
     /**
-     * Create an instance of {@link DigestMethodType }
+     * Create an instance of {@link SignatureType }
      * 
      */
-    public DigestMethodType createDigestMethodType() {
-        return new DigestMethodType();
+    public SignatureType createSignatureType() {
+        return new SignatureType();
     }
 
     /**
-     * Create an instance of {@link KeyInfoType }
+     * Create an instance of {@link DSAKeyValueType }
      * 
      */
-    public KeyInfoType createKeyInfoType() {
-        return new KeyInfoType();
+    public DSAKeyValueType createDSAKeyValueType() {
+        return new DSAKeyValueType();
     }
 
     /**
-     * Create an instance of {@link KeyValueType }
+     * Create an instance of {@link ManifestType }
      * 
      */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
+    public ManifestType createManifestType() {
+        return new ManifestType();
     }
 
     /**
-     * Create an instance of {@link RetrievalMethodType }
+     * Create an instance of {@link SignatureValueType }
      * 
      */
-    public RetrievalMethodType createRetrievalMethodType() {
-        return new RetrievalMethodType();
+    public SignatureValueType createSignatureValueType() {
+        return new SignatureValueType();
     }
 
     /**
-     * Create an instance of {@link X509DataType }
+     * Create an instance of {@link TransformsType }
      * 
      */
-    public X509DataType createX509DataType() {
-        return new X509DataType();
+    public TransformsType createTransformsType() {
+        return new TransformsType();
     }
 
     /**
-     * Create an instance of {@link PGPDataType }
+     * Create an instance of {@link RSAKeyValueType }
      * 
      */
-    public PGPDataType createPGPDataType() {
-        return new PGPDataType();
+    public RSAKeyValueType createRSAKeyValueType() {
+        return new RSAKeyValueType();
     }
 
     /**
-     * Create an instance of {@link SPKIDataType }
+     * Create an instance of {@link TransformType }
      * 
      */
-    public SPKIDataType createSPKIDataType() {
-        return new SPKIDataType();
+    public TransformType createTransformType() {
+        return new TransformType();
     }
 
     /**
-     * Create an instance of {@link ObjectType }
+     * Create an instance of {@link SignaturePropertyType }
      * 
      */
-    public ObjectType createObjectType() {
-        return new ObjectType();
+    public SignaturePropertyType createSignaturePropertyType() {
+        return new SignaturePropertyType();
     }
 
     /**
-     * Create an instance of {@link ManifestType }
+     * Create an instance of {@link KeyValueType }
      * 
      */
-    public ManifestType createManifestType() {
-        return new ManifestType();
+    public KeyValueType createKeyValueType() {
+        return new KeyValueType();
     }
 
     /**
-     * Create an instance of {@link SignaturePropertiesType }
+     * Create an instance of {@link ReferenceType }
      * 
      */
-    public SignaturePropertiesType createSignaturePropertiesType() {
-        return new SignaturePropertiesType();
+    public ReferenceType createReferenceType() {
+        return new ReferenceType();
     }
 
     /**
-     * Create an instance of {@link SignaturePropertyType }
+     * Create an instance of {@link CanonicalizationMethodType }
      * 
      */
-    public SignaturePropertyType createSignaturePropertyType() {
-        return new SignaturePropertyType();
+    public CanonicalizationMethodType createCanonicalizationMethodType() {
+        return new CanonicalizationMethodType();
     }
 
     /**
-     * Create an instance of {@link DSAKeyValueType }
+     * Create an instance of {@link SignaturePropertiesType }
      * 
      */
-    public DSAKeyValueType createDSAKeyValueType() {
-        return new DSAKeyValueType();
+    public SignaturePropertiesType createSignaturePropertiesType() {
+        return new SignaturePropertiesType();
     }
 
     /**
-     * Create an instance of {@link RSAKeyValueType }
+     * Create an instance of {@link ObjectType }
      * 
      */
-    public RSAKeyValueType createRSAKeyValueType() {
-        return new RSAKeyValueType();
+    public ObjectType createObjectType() {
+        return new ObjectType();
     }
 
     /**
@@ -251,51 +244,35 @@ public X509IssuerSerialType createX509IssuerSerialType() {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
-    public JAXBElement<SignatureType> createSignature(SignatureType value) {
-        return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
+    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
+        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
-    public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
-        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
+    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
+        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
+    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
+        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
     public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
@@ -303,38 +280,26 @@ public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(Cano
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
-    public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
-        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
+    public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
+        return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
-    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-        return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
+    public JAXBElement<ManifestType> createManifest(ManifestType value) {
+        return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
     public JAXBElement<TransformsType> createTransforms(TransformsType value) {
@@ -342,25 +307,26 @@ public JAXBElement<TransformsType> createTransforms(TransformsType value) {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
-    public JAXBElement<TransformType> createTransform(TransformType value) {
-        return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
+    public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
+        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
+    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
+        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
     public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
@@ -368,155 +334,107 @@ public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value)
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
-    public JAXBElement<byte[]> createDigestValue(byte[] value) {
-        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
+    public JAXBElement<String> createMgmtData(String value) {
+        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
-    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
+    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
+        return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
+    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
+        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
-    public JAXBElement<String> createMgmtData(String value) {
-        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
+    public JAXBElement<SignatureType> createSignature(SignatureType value) {
+        return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
+    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
+        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
+    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
+        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
+    public JAXBElement<ObjectType> createObject(ObjectType value) {
+        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
-    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
+    public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
+        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
-    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
+    public JAXBElement<TransformType> createTransform(TransformType value) {
+        return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
+    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
+        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
-    public JAXBElement<ManifestType> createManifest(ManifestType value) {
-        return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
+    public JAXBElement<byte[]> createDigestValue(byte[] value) {
+        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
     public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
@@ -524,64 +442,35 @@ public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignatureP
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
-    public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
-        return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
-    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
-        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
+    public JAXBElement<String> createKeyName(String value) {
+        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
-    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
-        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
+    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
+        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
     public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
@@ -589,12 +478,8 @@ public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
     public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
@@ -602,51 +487,35 @@ public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class)
-    public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
-        return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+    public JAXBElement<String> createTransformTypeXPath(String value) {
+        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
+        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
-    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
-        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class)
+    public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
+        return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
     @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
     public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
@@ -654,42 +523,30 @@ public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
+        return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
+    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
+        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
+        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
     }
 
 }
diff --git a/src/main/java/hi_override/org/w3/xmldsig/ObjectType.java b/src/main/java/hi_override/org/w3/xmldsig/ObjectType.java
index 1ed9f16..7e60801 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/ObjectType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/ObjectType.java
@@ -1,34 +1,27 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for ObjectType complex type</p>.
+ * &lt;p&gt;Java class for ObjectType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ObjectType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -41,7 +34,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -68,29 +61,23 @@ public class ObjectType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
      * {@link Element }
-     * </p>
+     * {@link Object }
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/PGPDataType.java b/src/main/java/hi_override/org/w3/xmldsig/PGPDataType.java
index 98a1064..9cd4401 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/PGPDataType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/PGPDataType.java
@@ -1,31 +1,24 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for PGPDataType complex type</p>.
+ * &lt;p&gt;Java class for PGPDataType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="PGPDataType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -43,7 +36,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -53,20 +46,6 @@
 })
 public class PGPDataType {
 
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following reason: 
-     * The field name "PGPKeyPacket" is used by two different parts of a schema. See: 
-     * line 219 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/schema/w3c/xmldsig-core-schema.xsd
-     * line 214 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/schema/w3c/xmldsig-core-schema.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * 
-     * 
-     */
     @XmlElementRefs({
         @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
@@ -77,42 +56,32 @@ public class PGPDataType {
     /**
      * Gets the rest of the content model. 
      * 
-     * <p>
      * You are getting this "catch-all" property because of the following reason: 
      * The field name "PGPKeyPacket" is used by two different parts of a schema. See: 
-     * line 219 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/schema/w3c/xmldsig-core-schema.xsd
-     * line 214 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/schema/w3c/xmldsig-core-schema.xsd
-     * <p>
+     * line 219 of file:/C:/alex/co/HI/xml/schema/w3c/xmldsig-core-schema.xsd
+     * line 214 of file:/C:/alex/co/HI/xml/schema/w3c/xmldsig-core-schema.xsd
      * To get rid of this property, apply a property customization to one 
      * of both of the following declarations to change their names: 
-     * 
-     * 
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/RSAKeyValueType.java b/src/main/java/hi_override/org/w3/xmldsig/RSAKeyValueType.java
index d6345f9..62975fd 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/RSAKeyValueType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/RSAKeyValueType.java
@@ -1,25 +1,18 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for RSAKeyValueType complex type</p>.
+ * &lt;p&gt;Java class for RSAKeyValueType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="RSAKeyValueType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -30,7 +23,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/hi_override/org/w3/xmldsig/ReferenceType.java b/src/main/java/hi_override/org/w3/xmldsig/ReferenceType.java
index 99cb6fd..ab292da 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/ReferenceType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/ReferenceType.java
@@ -1,30 +1,23 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for ReferenceType complex type</p>.
+ * &lt;p&gt;Java class for ReferenceType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="ReferenceType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -39,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/hi_override/org/w3/xmldsig/RetrievalMethodType.java b/src/main/java/hi_override/org/w3/xmldsig/RetrievalMethodType.java
index 4023b50..6d47c6f 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/RetrievalMethodType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/RetrievalMethodType.java
@@ -1,27 +1,20 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for RetrievalMethodType complex type</p>.
+ * &lt;p&gt;Java class for RetrievalMethodType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="RetrievalMethodType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -33,7 +26,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SPKIDataType.java b/src/main/java/hi_override/org/w3/xmldsig/SPKIDataType.java
index 8a37d64..ff22caf 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SPKIDataType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SPKIDataType.java
@@ -1,30 +1,23 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for SPKIDataType complex type</p>.
+ * &lt;p&gt;Java class for SPKIDataType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SPKIDataType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -35,7 +28,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -52,29 +45,23 @@ public class SPKIDataType {
     /**
      * Gets the value of the spkiSexpAndAny property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the spkiSexpAndAny property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the spkiSexpAndAny property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getSPKISexpAndAny().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getSPKISexpAndAny().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the spkiSexpAndAny property.
      */
     public List<Object> getSPKISexpAndAny() {
         if (spkiSexpAndAny == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SignatureMethodType.java b/src/main/java/hi_override/org/w3/xmldsig/SignatureMethodType.java
index 2c23888..8ca7d43 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SignatureMethodType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SignatureMethodType.java
@@ -1,33 +1,26 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SignatureMethodType complex type</p>.
+ * &lt;p&gt;Java class for SignatureMethodType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignatureMethodType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -39,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -60,29 +53,23 @@ public class SignatureMethodType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
      * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * </p>
+     * {@link Object }
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertiesType.java b/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertiesType.java
index 98790c8..37781c5 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertiesType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertiesType.java
@@ -1,32 +1,25 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignaturePropertiesType complex type</p>.
+ * &lt;p&gt;Java class for SignaturePropertiesType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignaturePropertiesType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -37,7 +30,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -58,27 +51,21 @@ public class SignaturePropertiesType {
     /**
      * Gets the value of the signatureProperty property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signatureProperty property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the signatureProperty property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getSignatureProperty().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getSignatureProperty().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link SignaturePropertyType }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the signatureProperty property.
      */
     public List<SignaturePropertyType> getSignatureProperty() {
         if (signatureProperty == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertyType.java b/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertyType.java
index 295583c..31ab2c8 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertyType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SignaturePropertyType.java
@@ -1,34 +1,27 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for SignaturePropertyType complex type</p>.
+ * &lt;p&gt;Java class for SignaturePropertyType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignaturePropertyType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -40,7 +33,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -65,29 +58,23 @@ public class SignaturePropertyType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
      * {@link Element }
-     * </p>
+     * {@link Object }
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SignatureType.java b/src/main/java/hi_override/org/w3/xmldsig/SignatureType.java
index 237bad1..10e69cc 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SignatureType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SignatureType.java
@@ -1,32 +1,25 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignatureType complex type</p>.
+ * &lt;p&gt;Java class for SignatureType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignatureType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -40,7 +33,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -142,27 +135,21 @@ public void setKeyInfo(KeyInfoType value) {
     /**
      * Gets the value of the object property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the object property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the object property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getObject().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getObject().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link ObjectType }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the object property.
      */
     public List<ObjectType> getObject() {
         if (object == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SignatureValueType.java b/src/main/java/hi_override/org/w3/xmldsig/SignatureValueType.java
index 98ba07a..332e1fc 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SignatureValueType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SignatureValueType.java
@@ -1,30 +1,23 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignatureValueType complex type</p>.
+ * &lt;p&gt;Java class for SignatureValueType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignatureValueType"&gt;
  *   &lt;simpleContent&gt;
  *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema&gt;base64Binary"&gt;
@@ -32,7 +25,7 @@
  *     &lt;/extension&gt;
  *   &lt;/simpleContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/hi_override/org/w3/xmldsig/SignedInfoType.java b/src/main/java/hi_override/org/w3/xmldsig/SignedInfoType.java
index abe539d..6b91fb4 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/SignedInfoType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/SignedInfoType.java
@@ -1,32 +1,25 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignedInfoType complex type</p>.
+ * &lt;p&gt;Java class for SignedInfoType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="SignedInfoType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -39,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -114,27 +107,21 @@ public void setSignatureMethod(SignatureMethodType value) {
     /**
      * Gets the value of the reference property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the reference property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getReference().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getReference().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link ReferenceType }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the reference property.
      */
     public List<ReferenceType> getReference() {
         if (reference == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/TransformType.java b/src/main/java/hi_override/org/w3/xmldsig/TransformType.java
index dce2bd6..f60d29d 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/TransformType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/TransformType.java
@@ -1,33 +1,26 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlMixed;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for TransformType complex type</p>.
+ * &lt;p&gt;Java class for TransformType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="TransformType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -39,7 +32,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -60,30 +53,24 @@ public class TransformType {
     /**
      * Gets the value of the content property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the content property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getContent().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getContent().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link String }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link Element }
-     * </p>
+     * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * 
-     * @return
-     *     The value of the content property.
      */
     public List<Object> getContent() {
         if (content == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/TransformsType.java b/src/main/java/hi_override/org/w3/xmldsig/TransformsType.java
index 52c35c3..5a1b1cd 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/TransformsType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/TransformsType.java
@@ -1,27 +1,20 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for TransformsType complex type</p>.
+ * &lt;p&gt;Java class for TransformsType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="TransformsType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -31,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -47,27 +40,21 @@ public class TransformsType {
     /**
      * Gets the value of the transform property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the transform property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the transform property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getTransform().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getTransform().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link TransformType }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the transform property.
      */
     public List<TransformType> getTransform() {
         if (transform == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/X509DataType.java b/src/main/java/hi_override/org/w3/xmldsig/X509DataType.java
index f0c063e..64ea6df 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/X509DataType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/X509DataType.java
@@ -1,31 +1,24 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for X509DataType complex type</p>.
+ * &lt;p&gt;Java class for X509DataType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="X509DataType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -42,7 +35,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
@@ -53,11 +46,11 @@
 public class X509DataType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -65,33 +58,27 @@ public class X509DataType {
     /**
      * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
      * 
-     * <p>This accessor method returns a reference to the live list,
+     * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the x509IssuerSerialOrX509SKIOrX509SubjectName property.</p>
+     * This is why there is not a <CODE>set</CODE> method for the x509IssuerSerialOrX509SKIOrX509SubjectName property.
      * 
-     * <p>
      * For example, to add a new item, do as follows:
-     * </p>
-     * <pre>
-     * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-     * </pre>
+     * &lt;pre&gt;{&#064;code
+     *    getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
+     * }&lt;/pre&gt;
      * 
      * 
-     * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link Element }
+     * {@link Object }
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
      * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * </p>
      * 
      * 
-     * @return
-     *     The value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
      */
     public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
         if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
diff --git a/src/main/java/hi_override/org/w3/xmldsig/X509IssuerSerialType.java b/src/main/java/hi_override/org/w3/xmldsig/X509IssuerSerialType.java
index 500be21..ec3a771 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/X509IssuerSerialType.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/X509IssuerSerialType.java
@@ -1,26 +1,19 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
 
 package hi_override.org.w3.xmldsig;
 
 import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for X509IssuerSerialType complex type</p>.
+ * &lt;p&gt;Java class for X509IssuerSerialType complex type&lt;/p&gt;.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.</p>
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
  * 
- * <pre>
+ * &lt;pre&gt;{&#064;code
  * &lt;complexType name="X509IssuerSerialType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
@@ -31,7 +24,7 @@
  *     &lt;/restriction&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
- * </pre>
+ * }&lt;/pre&gt;
  * 
  * 
  */
diff --git a/src/main/java/hi_override/org/w3/xmldsig/package-info.java b/src/main/java/hi_override/org/w3/xmldsig/package-info.java
index 3c26c0e..d87de56 100644
--- a/src/main/java/hi_override/org/w3/xmldsig/package-info.java
+++ b/src/main/java/hi_override/org/w3/xmldsig/package-info.java
@@ -1,9 +1,2 @@
-//
-// This file was generated by the Eclipse Implementation of JAXB, v2.3.9 
-// See https://eclipse-ee4j.github.io/jaxb-ri 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2026.06.05 at 02:37:22 PM AEST 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package hi_override.org.w3.xmldsig;
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java
new file mode 100644
index 0000000..3ec3b4e
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java
@@ -0,0 +1,105 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for CanonicalizationMethodType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="CanonicalizationMethodType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;any maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CanonicalizationMethodType", propOrder = {
+    "content"
+})
+public class CanonicalizationMethodType {
+
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Algorithm", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String algorithm;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the algorithm property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    /**
+     * Sets the value of the algorithm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlgorithm(String value) {
+        this.algorithm = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java
new file mode 100644
index 0000000..0e14df3
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java
@@ -0,0 +1,220 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for DSAKeyValueType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="DSAKeyValueType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;sequence minOccurs="0"&gt;
+ *           &lt;element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *           &lt;element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *         &lt;/sequence&gt;
+ *         &lt;element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/&gt;
+ *         &lt;element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *         &lt;element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/&gt;
+ *         &lt;sequence minOccurs="0"&gt;
+ *           &lt;element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *           &lt;element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *         &lt;/sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DSAKeyValueType", propOrder = {
+    "p",
+    "q",
+    "g",
+    "y",
+    "j",
+    "seed",
+    "pgenCounter"
+})
+public class DSAKeyValueType {
+
+    @XmlElement(name = "P")
+    protected byte[] p;
+    @XmlElement(name = "Q")
+    protected byte[] q;
+    @XmlElement(name = "G")
+    protected byte[] g;
+    @XmlElement(name = "Y", required = true)
+    protected byte[] y;
+    @XmlElement(name = "J")
+    protected byte[] j;
+    @XmlElement(name = "Seed")
+    protected byte[] seed;
+    @XmlElement(name = "PgenCounter")
+    protected byte[] pgenCounter;
+
+    /**
+     * Gets the value of the p property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getP() {
+        return p;
+    }
+
+    /**
+     * Sets the value of the p property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setP(byte[] value) {
+        this.p = value;
+    }
+
+    /**
+     * Gets the value of the q property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getQ() {
+        return q;
+    }
+
+    /**
+     * Sets the value of the q property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setQ(byte[] value) {
+        this.q = value;
+    }
+
+    /**
+     * Gets the value of the g property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getG() {
+        return g;
+    }
+
+    /**
+     * Sets the value of the g property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setG(byte[] value) {
+        this.g = value;
+    }
+
+    /**
+     * Gets the value of the y property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getY() {
+        return y;
+    }
+
+    /**
+     * Sets the value of the y property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setY(byte[] value) {
+        this.y = value;
+    }
+
+    /**
+     * Gets the value of the j property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getJ() {
+        return j;
+    }
+
+    /**
+     * Sets the value of the j property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setJ(byte[] value) {
+        this.j = value;
+    }
+
+    /**
+     * Gets the value of the seed property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getSeed() {
+        return seed;
+    }
+
+    /**
+     * Sets the value of the seed property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setSeed(byte[] value) {
+        this.seed = value;
+    }
+
+    /**
+     * Gets the value of the pgenCounter property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getPgenCounter() {
+        return pgenCounter;
+    }
+
+    /**
+     * Sets the value of the pgenCounter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setPgenCounter(byte[] value) {
+        this.pgenCounter = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java
new file mode 100644
index 0000000..601a32d
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java
@@ -0,0 +1,107 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for DigestMethodType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="DigestMethodType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DigestMethodType", propOrder = {
+    "content"
+})
+public class DigestMethodType {
+
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Algorithm", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String algorithm;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * {@link String }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the algorithm property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    /**
+     * Sets the value of the algorithm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlgorithm(String value) {
+        this.algorithm = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java
new file mode 100644
index 0000000..a711713
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java
@@ -0,0 +1,138 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for KeyInfoType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="KeyInfoType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;choice maxOccurs="unbounded"&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/&gt;
+ *         &lt;any processContents='lax' namespace='##other'/&gt;
+ *       &lt;/choice&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "KeyInfoType", propOrder = {
+    "content"
+})
+public class KeyInfoType {
+
+    @XmlElementRefs({
+        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    })
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     * {@link Object }
+     * {@link String }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java
new file mode 100644
index 0000000..dd2201b
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java
@@ -0,0 +1,88 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for KeyValueType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="KeyValueType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;choice&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/&gt;
+ *         &lt;any processContents='lax' namespace='##other'/&gt;
+ *       &lt;/choice&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "KeyValueType", propOrder = {
+    "content"
+})
+public class KeyValueType {
+
+    @XmlElementRefs({
+        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    })
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     * {@link Object }
+     * {@link String }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java
new file mode 100644
index 0000000..b3e6cca
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java
@@ -0,0 +1,107 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for ManifestType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ManifestType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ManifestType", propOrder = {
+    "reference"
+})
+public class ManifestType {
+
+    @XmlElement(name = "Reference", required = true)
+    protected List<ReferenceType> reference;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the reference property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getReference().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ReferenceType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the reference property.
+     */
+    public List<ReferenceType> getReference() {
+        if (reference == null) {
+            reference = new ArrayList<>();
+        }
+        return this.reference;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java b/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
new file mode 100644
index 0000000..3f179aa
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
@@ -0,0 +1,732 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.math.BigInteger;
+import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.w3._2000._09.xmldsig_ package. 
+ * <p>An ObjectFactory allows you to programmatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private static final QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
+    private static final QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
+    private static final QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
+    private static final QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
+    private static final QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
+    private static final QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
+    private static final QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
+    private static final QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+    private static final QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
+    private static final QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+    private static final QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
+    private static final QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
+    private static final QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
+    private static final QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+    private static final QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
+    private static final QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
+    private static final QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
+    private static final QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
+    private static final QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
+    private static final QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
+    private static final QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
+    private static final QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
+    private static final QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+    private static final QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
+    private static final QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
+    private static final QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
+    private static final QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
+    private static final QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
+    private static final QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
+    private static final QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
+    private static final QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
+    private static final QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
+    private static final QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
+    private static final QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig_
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link SignatureType }
+     * 
+     * @return
+     *     the new instance of {@link SignatureType }
+     */
+    public SignatureType createSignatureType() {
+        return new SignatureType();
+    }
+
+    /**
+     * Create an instance of {@link SignatureValueType }
+     * 
+     * @return
+     *     the new instance of {@link SignatureValueType }
+     */
+    public SignatureValueType createSignatureValueType() {
+        return new SignatureValueType();
+    }
+
+    /**
+     * Create an instance of {@link SignedInfoType }
+     * 
+     * @return
+     *     the new instance of {@link SignedInfoType }
+     */
+    public SignedInfoType createSignedInfoType() {
+        return new SignedInfoType();
+    }
+
+    /**
+     * Create an instance of {@link CanonicalizationMethodType }
+     * 
+     * @return
+     *     the new instance of {@link CanonicalizationMethodType }
+     */
+    public CanonicalizationMethodType createCanonicalizationMethodType() {
+        return new CanonicalizationMethodType();
+    }
+
+    /**
+     * Create an instance of {@link SignatureMethodType }
+     * 
+     * @return
+     *     the new instance of {@link SignatureMethodType }
+     */
+    public SignatureMethodType createSignatureMethodType() {
+        return new SignatureMethodType();
+    }
+
+    /**
+     * Create an instance of {@link ReferenceType }
+     * 
+     * @return
+     *     the new instance of {@link ReferenceType }
+     */
+    public ReferenceType createReferenceType() {
+        return new ReferenceType();
+    }
+
+    /**
+     * Create an instance of {@link TransformsType }
+     * 
+     * @return
+     *     the new instance of {@link TransformsType }
+     */
+    public TransformsType createTransformsType() {
+        return new TransformsType();
+    }
+
+    /**
+     * Create an instance of {@link TransformType }
+     * 
+     * @return
+     *     the new instance of {@link TransformType }
+     */
+    public TransformType createTransformType() {
+        return new TransformType();
+    }
+
+    /**
+     * Create an instance of {@link DigestMethodType }
+     * 
+     * @return
+     *     the new instance of {@link DigestMethodType }
+     */
+    public DigestMethodType createDigestMethodType() {
+        return new DigestMethodType();
+    }
+
+    /**
+     * Create an instance of {@link KeyInfoType }
+     * 
+     * @return
+     *     the new instance of {@link KeyInfoType }
+     */
+    public KeyInfoType createKeyInfoType() {
+        return new KeyInfoType();
+    }
+
+    /**
+     * Create an instance of {@link KeyValueType }
+     * 
+     * @return
+     *     the new instance of {@link KeyValueType }
+     */
+    public KeyValueType createKeyValueType() {
+        return new KeyValueType();
+    }
+
+    /**
+     * Create an instance of {@link RetrievalMethodType }
+     * 
+     * @return
+     *     the new instance of {@link RetrievalMethodType }
+     */
+    public RetrievalMethodType createRetrievalMethodType() {
+        return new RetrievalMethodType();
+    }
+
+    /**
+     * Create an instance of {@link X509DataType }
+     * 
+     * @return
+     *     the new instance of {@link X509DataType }
+     */
+    public X509DataType createX509DataType() {
+        return new X509DataType();
+    }
+
+    /**
+     * Create an instance of {@link PGPDataType }
+     * 
+     * @return
+     *     the new instance of {@link PGPDataType }
+     */
+    public PGPDataType createPGPDataType() {
+        return new PGPDataType();
+    }
+
+    /**
+     * Create an instance of {@link SPKIDataType }
+     * 
+     * @return
+     *     the new instance of {@link SPKIDataType }
+     */
+    public SPKIDataType createSPKIDataType() {
+        return new SPKIDataType();
+    }
+
+    /**
+     * Create an instance of {@link ObjectType }
+     * 
+     * @return
+     *     the new instance of {@link ObjectType }
+     */
+    public ObjectType createObjectType() {
+        return new ObjectType();
+    }
+
+    /**
+     * Create an instance of {@link ManifestType }
+     * 
+     * @return
+     *     the new instance of {@link ManifestType }
+     */
+    public ManifestType createManifestType() {
+        return new ManifestType();
+    }
+
+    /**
+     * Create an instance of {@link SignaturePropertiesType }
+     * 
+     * @return
+     *     the new instance of {@link SignaturePropertiesType }
+     */
+    public SignaturePropertiesType createSignaturePropertiesType() {
+        return new SignaturePropertiesType();
+    }
+
+    /**
+     * Create an instance of {@link SignaturePropertyType }
+     * 
+     * @return
+     *     the new instance of {@link SignaturePropertyType }
+     */
+    public SignaturePropertyType createSignaturePropertyType() {
+        return new SignaturePropertyType();
+    }
+
+    /**
+     * Create an instance of {@link DSAKeyValueType }
+     * 
+     * @return
+     *     the new instance of {@link DSAKeyValueType }
+     */
+    public DSAKeyValueType createDSAKeyValueType() {
+        return new DSAKeyValueType();
+    }
+
+    /**
+     * Create an instance of {@link RSAKeyValueType }
+     * 
+     * @return
+     *     the new instance of {@link RSAKeyValueType }
+     */
+    public RSAKeyValueType createRSAKeyValueType() {
+        return new RSAKeyValueType();
+    }
+
+    /**
+     * Create an instance of {@link X509IssuerSerialType }
+     * 
+     * @return
+     *     the new instance of {@link X509IssuerSerialType }
+     */
+    public X509IssuerSerialType createX509IssuerSerialType() {
+        return new X509IssuerSerialType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
+    public JAXBElement<SignatureType> createSignature(SignatureType value) {
+        return new JAXBElement<>(_Signature_QNAME, SignatureType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
+    public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
+        return new JAXBElement<>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
+    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
+        return new JAXBElement<>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
+    public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
+        return new JAXBElement<>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
+    public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
+        return new JAXBElement<>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
+    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
+        return new JAXBElement<>(_Reference_QNAME, ReferenceType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
+    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
+        return new JAXBElement<>(_Transforms_QNAME, TransformsType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
+    public JAXBElement<TransformType> createTransform(TransformType value) {
+        return new JAXBElement<>(_Transform_QNAME, TransformType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
+    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
+        return new JAXBElement<>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
+    public JAXBElement<byte[]> createDigestValue(byte[] value) {
+        return new JAXBElement<>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
+    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
+        return new JAXBElement<>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
+    public JAXBElement<String> createKeyName(String value) {
+        return new JAXBElement<>(_KeyName_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
+    public JAXBElement<String> createMgmtData(String value) {
+        return new JAXBElement<>(_MgmtData_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
+    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
+        return new JAXBElement<>(_KeyValue_QNAME, KeyValueType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
+    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
+        return new JAXBElement<>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
+    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
+        return new JAXBElement<>(_X509Data_QNAME, X509DataType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
+    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
+        return new JAXBElement<>(_PGPData_QNAME, PGPDataType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
+    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
+        return new JAXBElement<>(_SPKIData_QNAME, SPKIDataType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
+    public JAXBElement<ObjectType> createObject(ObjectType value) {
+        return new JAXBElement<>(_Object_QNAME, ObjectType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
+    public JAXBElement<ManifestType> createManifest(ManifestType value) {
+        return new JAXBElement<>(_Manifest_QNAME, ManifestType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
+    public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
+        return new JAXBElement<>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
+    public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
+        return new JAXBElement<>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
+    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
+        return new JAXBElement<>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
+    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
+        return new JAXBElement<>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
+        return new JAXBElement<>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
+        return new JAXBElement<>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
+        return new JAXBElement<>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class)
+    public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
+        return new JAXBElement<>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
+        return new JAXBElement<>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
+    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
+        return new JAXBElement<>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
+        return new JAXBElement<>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
+    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
+        return new JAXBElement<>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+    public JAXBElement<String> createTransformTypeXPath(String value) {
+        return new JAXBElement<>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+        return new JAXBElement<>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java
new file mode 100644
index 0000000..9e7e40f
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java
@@ -0,0 +1,167 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for ObjectType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ObjectType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence maxOccurs="unbounded" minOccurs="0"&gt;
+ *         &lt;any processContents='lax'/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *       &lt;attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
+ *       &lt;attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ObjectType", propOrder = {
+    "content"
+})
+public class ObjectType {
+
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "MimeType")
+    protected String mimeType;
+    @XmlAttribute(name = "Encoding")
+    @XmlSchemaType(name = "anyURI")
+    protected String encoding;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * {@link String }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the mimeType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    /**
+     * Sets the value of the mimeType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMimeType(String value) {
+        this.mimeType = value;
+    }
+
+    /**
+     * Gets the value of the encoding property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEncoding() {
+        return encoding;
+    }
+
+    /**
+     * Sets the value of the encoding property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEncoding(String value) {
+        this.encoding = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java
new file mode 100644
index 0000000..ec52449
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java
@@ -0,0 +1,115 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for PGPDataType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="PGPDataType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;choice&gt;
+ *         &lt;sequence&gt;
+ *           &lt;element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *           &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/&gt;
+ *           &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;/sequence&gt;
+ *         &lt;sequence&gt;
+ *           &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *           &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;/sequence&gt;
+ *       &lt;/choice&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PGPDataType", propOrder = {
+    "content"
+})
+public class PGPDataType {
+
+    /**
+     * Gets the rest of the content model. 
+     * 
+     * &lt;p&gt;
+     * You are getting this "catch-all" property because of the following reason: 
+     * The field name "PGPKeyPacket" is used by two different parts of a schema. See: 
+     * line 219 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/xml/schema/w3c/xmldsig-core-schema.xsd
+     * line 214 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/xml/schema/w3c/xmldsig-core-schema.xsd
+     * &lt;p&gt;
+     * To get rid of this property, apply a property customization to one 
+     * of both of the following declarations to change their names:
+     * 
+     */
+    @XmlElementRefs({
+        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    })
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+
+    /**
+     * Gets the rest of the content model. 
+     * 
+     * &lt;p&gt;
+     * You are getting this "catch-all" property because of the following reason: 
+     * The field name "PGPKeyPacket" is used by two different parts of a schema. See: 
+     * line 219 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/xml/schema/w3c/xmldsig-core-schema.xsd
+     * line 214 of file:/C:/Users/GavinBaumanis/workspace/2.AuDigitalHealth/hi-wsdl-java/wsdls/xml/schema/w3c/xmldsig-core-schema.xsd
+     * &lt;p&gt;
+     * To get rid of this property, apply a property customization to one 
+     * of both of the following declarations to change their names:
+     * 
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link Object }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java
new file mode 100644
index 0000000..c14bc88
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java
@@ -0,0 +1,86 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for RSAKeyValueType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="RSAKeyValueType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *         &lt;element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RSAKeyValueType", propOrder = {
+    "modulus",
+    "exponent"
+})
+public class RSAKeyValueType {
+
+    @XmlElement(name = "Modulus", required = true)
+    protected byte[] modulus;
+    @XmlElement(name = "Exponent", required = true)
+    protected byte[] exponent;
+
+    /**
+     * Gets the value of the modulus property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getModulus() {
+        return modulus;
+    }
+
+    /**
+     * Sets the value of the modulus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setModulus(byte[] value) {
+        this.modulus = value;
+    }
+
+    /**
+     * Gets the value of the exponent property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getExponent() {
+        return exponent;
+    }
+
+    /**
+     * Sets the value of the exponent property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setExponent(byte[] value) {
+        this.exponent = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java
new file mode 100644
index 0000000..89af46a
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java
@@ -0,0 +1,207 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for ReferenceType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="ReferenceType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *       &lt;attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *       &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ReferenceType", propOrder = {
+    "transforms",
+    "digestMethod",
+    "digestValue"
+})
+public class ReferenceType {
+
+    @XmlElement(name = "Transforms")
+    protected TransformsType transforms;
+    @XmlElement(name = "DigestMethod", required = true)
+    protected DigestMethodType digestMethod;
+    @XmlElement(name = "DigestValue", required = true)
+    protected byte[] digestValue;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "URI")
+    @XmlSchemaType(name = "anyURI")
+    protected String uri;
+    @XmlAttribute(name = "Type")
+    @XmlSchemaType(name = "anyURI")
+    protected String type;
+
+    /**
+     * Gets the value of the transforms property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TransformsType }
+     *     
+     */
+    public TransformsType getTransforms() {
+        return transforms;
+    }
+
+    /**
+     * Sets the value of the transforms property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TransformsType }
+     *     
+     */
+    public void setTransforms(TransformsType value) {
+        this.transforms = value;
+    }
+
+    /**
+     * Gets the value of the digestMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DigestMethodType }
+     *     
+     */
+    public DigestMethodType getDigestMethod() {
+        return digestMethod;
+    }
+
+    /**
+     * Sets the value of the digestMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DigestMethodType }
+     *     
+     */
+    public void setDigestMethod(DigestMethodType value) {
+        this.digestMethod = value;
+    }
+
+    /**
+     * Gets the value of the digestValue property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getDigestValue() {
+        return digestValue;
+    }
+
+    /**
+     * Sets the value of the digestValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setDigestValue(byte[] value) {
+        this.digestValue = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the uri property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getURI() {
+        return uri;
+    }
+
+    /**
+     * Sets the value of the uri property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURI(String value) {
+        this.uri = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java
new file mode 100644
index 0000000..469e37d
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java
@@ -0,0 +1,120 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for RetrievalMethodType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="RetrievalMethodType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *       &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RetrievalMethodType", propOrder = {
+    "transforms"
+})
+public class RetrievalMethodType {
+
+    @XmlElement(name = "Transforms")
+    protected TransformsType transforms;
+    @XmlAttribute(name = "URI")
+    @XmlSchemaType(name = "anyURI")
+    protected String uri;
+    @XmlAttribute(name = "Type")
+    @XmlSchemaType(name = "anyURI")
+    protected String type;
+
+    /**
+     * Gets the value of the transforms property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TransformsType }
+     *     
+     */
+    public TransformsType getTransforms() {
+        return transforms;
+    }
+
+    /**
+     * Sets the value of the transforms property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TransformsType }
+     *     
+     */
+    public void setTransforms(TransformsType value) {
+        this.transforms = value;
+    }
+
+    /**
+     * Gets the value of the uri property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getURI() {
+        return uri;
+    }
+
+    /**
+     * Sets the value of the uri property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURI(String value) {
+        this.uri = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java
new file mode 100644
index 0000000..508b0a5
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java
@@ -0,0 +1,79 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for SPKIDataType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SPKIDataType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence maxOccurs="unbounded"&gt;
+ *         &lt;element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *         &lt;any processContents='lax' namespace='##other' minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SPKIDataType", propOrder = {
+    "spkiSexpAndAny"
+})
+public class SPKIDataType {
+
+    @XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+    @XmlAnyElement(lax = true)
+    protected List<Object> spkiSexpAndAny;
+
+    /**
+     * Gets the value of the spkiSexpAndAny property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the spkiSexpAndAny property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getSPKISexpAndAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link Object }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the spkiSexpAndAny property.
+     */
+    public List<Object> getSPKISexpAndAny() {
+        if (spkiSexpAndAny == null) {
+            spkiSexpAndAny = new ArrayList<>();
+        }
+        return this.spkiSexpAndAny;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java
new file mode 100644
index 0000000..7c9b792
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java
@@ -0,0 +1,111 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for SignatureMethodType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SignatureMethodType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/&gt;
+ *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignatureMethodType", propOrder = {
+    "content"
+})
+public class SignatureMethodType {
+
+    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Algorithm", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String algorithm;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link Object }
+     * {@link String }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the algorithm property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    /**
+     * Sets the value of the algorithm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlgorithm(String value) {
+        this.algorithm = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java
new file mode 100644
index 0000000..655d293
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java
@@ -0,0 +1,107 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for SignaturePropertiesType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SignaturePropertiesType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignaturePropertiesType", propOrder = {
+    "signatureProperty"
+})
+public class SignaturePropertiesType {
+
+    @XmlElement(name = "SignatureProperty", required = true)
+    protected List<SignaturePropertyType> signatureProperty;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the signatureProperty property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the signatureProperty property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getSignatureProperty().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SignaturePropertyType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the signatureProperty property.
+     */
+    public List<SignaturePropertyType> getSignatureProperty() {
+        if (signatureProperty == null) {
+            signatureProperty = new ArrayList<>();
+        }
+        return this.signatureProperty;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java
new file mode 100644
index 0000000..dd89f8d
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java
@@ -0,0 +1,140 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for SignaturePropertyType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SignaturePropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;choice maxOccurs="unbounded"&gt;
+ *         &lt;any processContents='lax' namespace='##other'/&gt;
+ *       &lt;/choice&gt;
+ *       &lt;attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignaturePropertyType", propOrder = {
+    "content"
+})
+public class SignaturePropertyType {
+
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Target", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String target;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Object }
+     * {@link String }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the target property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * Sets the value of the target property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTarget(String value) {
+        this.target = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java
new file mode 100644
index 0000000..aa26de7
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java
@@ -0,0 +1,191 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for SignatureType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SignatureType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignatureType", propOrder = {
+    "signedInfo",
+    "signatureValue",
+    "keyInfo",
+    "object"
+})
+public class SignatureType {
+
+    @XmlElement(name = "SignedInfo", required = true)
+    protected SignedInfoType signedInfo;
+    @XmlElement(name = "SignatureValue", required = true)
+    protected SignatureValueType signatureValue;
+    @XmlElement(name = "KeyInfo")
+    protected KeyInfoType keyInfo;
+    @XmlElement(name = "Object")
+    protected List<ObjectType> object;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the signedInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SignedInfoType }
+     *     
+     */
+    public SignedInfoType getSignedInfo() {
+        return signedInfo;
+    }
+
+    /**
+     * Sets the value of the signedInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SignedInfoType }
+     *     
+     */
+    public void setSignedInfo(SignedInfoType value) {
+        this.signedInfo = value;
+    }
+
+    /**
+     * Gets the value of the signatureValue property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SignatureValueType }
+     *     
+     */
+    public SignatureValueType getSignatureValue() {
+        return signatureValue;
+    }
+
+    /**
+     * Sets the value of the signatureValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SignatureValueType }
+     *     
+     */
+    public void setSignatureValue(SignatureValueType value) {
+        this.signatureValue = value;
+    }
+
+    /**
+     * Gets the value of the keyInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link KeyInfoType }
+     *     
+     */
+    public KeyInfoType getKeyInfo() {
+        return keyInfo;
+    }
+
+    /**
+     * Sets the value of the keyInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link KeyInfoType }
+     *     
+     */
+    public void setKeyInfo(KeyInfoType value) {
+        this.keyInfo = value;
+    }
+
+    /**
+     * Gets the value of the object property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the object property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getObject().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ObjectType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the object property.
+     */
+    public List<ObjectType> getObject() {
+        if (object == null) {
+            object = new ArrayList<>();
+        }
+        return this.object;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java
new file mode 100644
index 0000000..6f40ee1
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java
@@ -0,0 +1,92 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for SignatureValueType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SignatureValueType"&gt;
+ *   &lt;simpleContent&gt;
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema&gt;base64Binary"&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/simpleContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignatureValueType", propOrder = {
+    "value"
+})
+public class SignatureValueType {
+
+    @XmlValue
+    protected byte[] value;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    public byte[] getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setValue(byte[] value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java
new file mode 100644
index 0000000..c97d407
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java
@@ -0,0 +1,163 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlID;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * &lt;p&gt;Java class for SignedInfoType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="SignedInfoType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignedInfoType", propOrder = {
+    "canonicalizationMethod",
+    "signatureMethod",
+    "reference"
+})
+public class SignedInfoType {
+
+    @XmlElement(name = "CanonicalizationMethod", required = true)
+    protected CanonicalizationMethodType canonicalizationMethod;
+    @XmlElement(name = "SignatureMethod", required = true)
+    protected SignatureMethodType signatureMethod;
+    @XmlElement(name = "Reference", required = true)
+    protected List<ReferenceType> reference;
+    @XmlAttribute(name = "Id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+
+    /**
+     * Gets the value of the canonicalizationMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CanonicalizationMethodType }
+     *     
+     */
+    public CanonicalizationMethodType getCanonicalizationMethod() {
+        return canonicalizationMethod;
+    }
+
+    /**
+     * Sets the value of the canonicalizationMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CanonicalizationMethodType }
+     *     
+     */
+    public void setCanonicalizationMethod(CanonicalizationMethodType value) {
+        this.canonicalizationMethod = value;
+    }
+
+    /**
+     * Gets the value of the signatureMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SignatureMethodType }
+     *     
+     */
+    public SignatureMethodType getSignatureMethod() {
+        return signatureMethod;
+    }
+
+    /**
+     * Sets the value of the signatureMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SignatureMethodType }
+     *     
+     */
+    public void setSignatureMethod(SignatureMethodType value) {
+        this.signatureMethod = value;
+    }
+
+    /**
+     * Gets the value of the reference property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the reference property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getReference().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ReferenceType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the reference property.
+     */
+    public List<ReferenceType> getReference() {
+        if (reference == null) {
+            reference = new ArrayList<>();
+        }
+        return this.reference;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java
new file mode 100644
index 0000000..85b7942
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java
@@ -0,0 +1,112 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlMixed;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for TransformType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="TransformType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0"&gt;
+ *         &lt;any processContents='lax' namespace='##other'/&gt;
+ *         &lt;element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *       &lt;/choice&gt;
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransformType", propOrder = {
+    "content"
+})
+public class TransformType {
+
+    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    @XmlMixed
+    @XmlAnyElement(lax = true)
+    protected List<Object> content;
+    @XmlAttribute(name = "Algorithm", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String algorithm;
+
+    /**
+     * Gets the value of the content property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the content property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getContent().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Object }
+     * {@link String }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the content property.
+     */
+    public List<Object> getContent() {
+        if (content == null) {
+            content = new ArrayList<>();
+        }
+        return this.content;
+    }
+
+    /**
+     * Gets the value of the algorithm property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    /**
+     * Sets the value of the algorithm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlgorithm(String value) {
+        this.algorithm = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
new file mode 100644
index 0000000..674e2fa
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
@@ -0,0 +1,72 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for TransformsType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="TransformsType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransformsType", propOrder = {
+    "transform"
+})
+public class TransformsType {
+
+    @XmlElement(name = "Transform", required = true)
+    protected List<TransformType> transform;
+
+    /**
+     * Gets the value of the transform property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the transform property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getTransform().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TransformType }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the transform property.
+     */
+    public List<TransformType> getTransform() {
+        if (transform == null) {
+            transform = new ArrayList<>();
+        }
+        return this.transform;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
new file mode 100644
index 0000000..e91027e
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
@@ -0,0 +1,96 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * &lt;p&gt;Java class for X509DataType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="X509DataType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence maxOccurs="unbounded"&gt;
+ *         &lt;choice&gt;
+ *           &lt;element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/&gt;
+ *           &lt;element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *           &lt;element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *           &lt;element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *           &lt;element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/&gt;
+ *           &lt;any processContents='lax' namespace='##other'/&gt;
+ *         &lt;/choice&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "X509DataType", propOrder = {
+    "x509IssuerSerialOrX509SKIOrX509SubjectName"
+})
+public class X509DataType {
+
+    @XmlElementRefs({
+        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    })
+    @XmlAnyElement(lax = true)
+    protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
+
+    /**
+     * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
+     * 
+     * <p>This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the Jakarta XML Binding object.
+     * This is why there is not a {@code set} method for the x509IssuerSerialOrX509SKIOrX509SubjectName property.</p>
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * </p>
+     * <pre>
+     * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * {@link Object }
+     * {@link Element }
+     * </p>
+     * 
+     * 
+     * @return
+     *     The value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
+     */
+    public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
+        if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
+            x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList<>();
+        }
+        return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java b/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java
new file mode 100644
index 0000000..8979ca3
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java
@@ -0,0 +1,91 @@
+
+package org.w3._2000._09.xmldsig_;
+
+import java.math.BigInteger;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+
+
+/**
+ * &lt;p&gt;Java class for X509IssuerSerialType complex type&lt;/p&gt;.
+ * 
+ * &lt;p&gt;The following schema fragment specifies the expected content contained within this class.&lt;/p&gt;
+ * 
+ * &lt;pre&gt;{&#064;code
+ * &lt;complexType name="X509IssuerSerialType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
+ *         &lt;element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * }&lt;/pre&gt;
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "X509IssuerSerialType", propOrder = {
+    "x509IssuerName",
+    "x509SerialNumber"
+})
+public class X509IssuerSerialType {
+
+    @XmlElement(name = "X509IssuerName", required = true)
+    protected String x509IssuerName;
+    @XmlElement(name = "X509SerialNumber", required = true)
+    protected BigInteger x509SerialNumber;
+
+    /**
+     * Gets the value of the x509IssuerName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getX509IssuerName() {
+        return x509IssuerName;
+    }
+
+    /**
+     * Sets the value of the x509IssuerName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setX509IssuerName(String value) {
+        this.x509IssuerName = value;
+    }
+
+    /**
+     * Gets the value of the x509SerialNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getX509SerialNumber() {
+        return x509SerialNumber;
+    }
+
+    /**
+     * Sets the value of the x509SerialNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setX509SerialNumber(BigInteger value) {
+        this.x509SerialNumber = value;
+    }
+
+}
diff --git a/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java b/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java
new file mode 100644
index 0000000..13b1325
--- /dev/null
+++ b/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java
@@ -0,0 +1,2 @@
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.w3._2000._09.xmldsig_;
diff --git a/src/main/resources/HI_ConsumerSearchIHI-3.0.wsdl b/src/main/resources/HI_ConsumerSearchIHI-3.0.wsdl
index db92567..8023459 100644
--- a/src/main/resources/HI_ConsumerSearchIHI-3.0.wsdl
+++ b/src/main/resources/HI_ConsumerSearchIHI-3.0.wsdl
@@ -47,7 +47,7 @@
         <wsp:PolicyReference URI="#TlsPolicy"/>
         <wsoap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
         <wsdl:operation name="searchIHI">
-            <wsoap12:operation soapAction="" style="document" />
+            <wsoap12:operation soapAction="http://ns.electronichealth.net.au/" style="document" />
             <wsdl:input>
                 <wsoap12:header message="tns:searchIHIInMsg" part="productHeader" use="literal"/>
                 <wsoap12:header message="tns:searchIHIInMsg" part="signatureHeader" use="literal"/>
diff --git a/src/main/resources/HI_ConsumerSearchIHIBatchAsync-3.0.wsdl b/src/main/resources/HI_ConsumerSearchIHIBatchAsync-3.0.wsdl
index f988cf1..021fe1d 100644
--- a/src/main/resources/HI_ConsumerSearchIHIBatchAsync-3.0.wsdl
+++ b/src/main/resources/HI_ConsumerSearchIHIBatchAsync-3.0.wsdl
@@ -6,6 +6,8 @@
 @Version:       2010/07/31 - Initial version
    		    	2011/06/25 - added backward compatible optional element "hpio" 
 	    	 	for Contracted Service Provider usage.  
+	    	 	2012/07/26 - added backward compatible optional element "hpio" 
+	    	 	to read operations for Contracted Service Provider usage.	    	 	
 @CreatedDate:   2010/04/23
 @Release:       3
 @Description:   
@@ -47,7 +49,7 @@
         <wsp:PolicyReference URI="#TlsPolicy"/>
         <wsoap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
         <wsdl:operation name="submitSearchIHIBatch">
-            <wsoap12:operation soapAction="http://ns.electronichealth.net.au/" style="document"/>
+            <wsoap12:operation soapAction="" style="document"/>
             <wsdl:input>
                 <wsoap12:header message="tns:submitSearchIHIBatchInMsg" part="productHeader" use="literal"/>
                 <wsoap12:header message="tns:submitSearchIHIBatchInMsg" part="signatureHeader" use="literal"/>
@@ -74,6 +76,8 @@
                 <wsoap12:header message="tns:retrieveSearchIHIBatchInMsg" part="signatureHeader" use="literal"/>
                 <wsoap12:header message="tns:retrieveSearchIHIBatchInMsg" part="timestampHeader" use="literal"/>
                 <wsoap12:header message="tns:retrieveSearchIHIBatchInMsg" part="userHeader" use="literal"/>
+                <!--	hpio: Backward compatible change, added Sep 2012 release for CSPs. -->	
+                <wsoap12:header message="tns:retrieveSearchIHIBatchInMsg" part="hpioHeader" use="literal"/>                
                 <wsoap12:body parts="request" use="literal"/>
             </wsdl:input>
             <wsdl:output>
@@ -92,6 +96,8 @@
                 <wsoap12:header message="tns:getSearchIHIBatchStatusInMsg" part="signatureHeader" use="literal"/>
                 <wsoap12:header message="tns:getSearchIHIBatchStatusInMsg" part="timestampHeader" use="literal"/>
                 <wsoap12:header message="tns:getSearchIHIBatchStatusInMsg" part="userHeader" use="literal"/>
+                <!--	hpio: Backward compatible change, added Sep 2012 release for CSPs. -->	
+                <wsoap12:header message="tns:getSearchIHIBatchStatusInMsg" part="hpioHeader" use="literal"/>                
                 <wsoap12:body parts="request" use="literal"/>
             </wsdl:input>
             <wsdl:output>
@@ -110,6 +116,8 @@
                 <wsoap12:header message="tns:deleteSearchIHIBatchInMsg" part="signatureHeader" use="literal"/>
                 <wsoap12:header message="tns:deleteSearchIHIBatchInMsg" part="timestampHeader" use="literal"/>
                 <wsoap12:header message="tns:deleteSearchIHIBatchInMsg" part="userHeader" use="literal"/>
+                <!--	hpio: Backward compatible change, added Sep 2012 release for CSPs. -->	
+                <wsoap12:header message="tns:deleteSearchIHIBatchInMsg" part="hpioHeader" use="literal"/>                
                 <wsoap12:body parts="request" use="literal"/>
             </wsdl:input>
             <wsdl:output>
diff --git a/src/main/resources/HI_ConsumerSearchIHIBatchAsyncInterface-3.0.wsdl b/src/main/resources/HI_ConsumerSearchIHIBatchAsyncInterface-3.0.wsdl
index 4d6b2f4..18ba27a 100644
--- a/src/main/resources/HI_ConsumerSearchIHIBatchAsyncInterface-3.0.wsdl
+++ b/src/main/resources/HI_ConsumerSearchIHIBatchAsyncInterface-3.0.wsdl
@@ -6,6 +6,8 @@
 @Version:       2010/07/31 - Initial version
    		    	2011/06/25 - added backward compatible optional element "hpio" 
 	    	 	for Contracted Service Provider usage.  
+	    	 	2012/07/26 - added backward compatible optional element "hpio" 
+	    	 	to read operations for Contracted Service Provider usage.
 @CreatedDate:   2010/04/23
 @Release:       3
 @Description:   
@@ -105,6 +107,8 @@
         <wsdl:part name="timestampHeader" element="ce:timestamp"/>
         <wsdl:part name="signatureHeader" element="ce:signature"/>
         <wsdl:part name="userHeader" element="ce:user"/>
+        <!--	hpio: Backward compatible change, added SEP 2012 release for CSPs. -->	
+		<wsdl:part name="hpioHeader" element="ce:hpio"/>        
     </wsdl:message>
     <wsdl:message name="retrieveSearchIHIBatchOutMsg">
         <wsdl:part name="response" element="tns:retrieveSearchIHIBatchResponse"/>
@@ -117,6 +121,8 @@
         <wsdl:part name="timestampHeader" element="ce:timestamp"/>
         <wsdl:part name="signatureHeader" element="ce:signature"/>
         <wsdl:part name="userHeader" element="ce:user"/>
+        <!--	hpio: Backward compatible change, added SEP 2012 release for CSPs. -->	
+		<wsdl:part name="hpioHeader" element="ce:hpio"/>                
     </wsdl:message>
     <wsdl:message name="getSearchIHIBatchStatusOutMsg">
         <wsdl:part name="response" element="tns:getSearchIHIBatchStatusResponse"/>
@@ -129,6 +135,8 @@
         <wsdl:part name="timestampHeader" element="ce:timestamp"/>
         <wsdl:part name="signatureHeader" element="ce:signature"/>
         <wsdl:part name="userHeader" element="ce:user"/>
+        <!--	hpio: Backward compatible change, added SEP 2012 release for CSPs. -->	
+		<wsdl:part name="hpioHeader" element="ce:hpio"/>        
     </wsdl:message>
     <wsdl:message name="deleteSearchIHIBatchOutMsg">
         <wsdl:part name="response" element="tns:deleteSearchIHIBatchResponse"/>
diff --git a/src/main/resources/HI_ConsumerSearchIHIBatchSync-3.0.wsdl b/src/main/resources/HI_ConsumerSearchIHIBatchSync-3.0.wsdl
index e3174be..96010b0 100644
--- a/src/main/resources/HI_ConsumerSearchIHIBatchSync-3.0.wsdl
+++ b/src/main/resources/HI_ConsumerSearchIHIBatchSync-3.0.wsdl
@@ -47,7 +47,7 @@
         <wsp:PolicyReference URI="#TlsPolicy"/>
         <wsoap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
         <wsdl:operation name="searchIHIBatchSync">
-            <wsoap12:operation soapAction="" style="document"/>
+            <wsoap12:operation soapAction="http://ns.electronichealth.net.au/" style="document"/>
             <wsdl:input>
                 <wsoap12:header message="tns:searchIHIBatchSyncInMsg" part="productHeader" use="literal"/>
                 <wsoap12:header message="tns:searchIHIBatchSyncInMsg" part="signatureHeader" use="literal"/>
diff --git a/src/main/resources/HI_ConsumerSearchIHIInterface-3.0.wsdl b/src/main/resources/HI_ConsumerSearchIHIInterface-3.0.wsdl
index cb93094..a30c044 100644
--- a/src/main/resources/HI_ConsumerSearchIHIInterface-3.0.wsdl
+++ b/src/main/resources/HI_ConsumerSearchIHIInterface-3.0.wsdl
@@ -6,6 +6,9 @@
 @Version:       2010/07/31 - Initial version
    		    	2011/06/25 - added backward compatible optional element "hpio" 
 	    	 	for Contracted Service Provider usage.  
+	    	    2014/05/03 - Add backward compatible optional unstructured address. 		
+	    	    2024/06/01 - Allowed searching via electronicCommunication (mobile/email)					  
+				
 @CreatedDate:   2010/04/23
 @Release:       3
 @Description:   
@@ -20,6 +23,7 @@
     xmlns:cce="http://ns.electronichealth.net.au/hi/xsd/consumercore/ConsumerCoreElements/3.0"
     xmlns:cin="http://ns.electronichealth.net.au/hi/xsd/common/IndividualNameCore/3.0" 
     xmlns:address="http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0"
+	xmlns:ec="http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0"
     xmlns:ihi="http://ns.electronichealth.net.au/hi/xsd/consumercore/IHI/3.0"
     xmlns:cwm="http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHI/3.0" 
     xmlns:tns="http://ns.electronichealth.net.au/hi/svc/ConsumerSearchIHI/3.0" 	
@@ -41,6 +45,9 @@
             <xsd:import 
                 namespace="http://ns.electronichealth.net.au/hi/xsd/consumercore/Address/3.0"
                 schemaLocation="../../../schema/mca/consumer/core/20100731/Address.xsd"/>
+            <xsd:import 
+                namespace="http://ns.electronichealth.net.au/hi/xsd/consumercore/ElectronicCommunication/3.0"
+                schemaLocation="../../../schema/mca/consumer/core/20100731/ElectronicCommunication.xsd"/>
             <xsd:import
                 namespace="http://ns.electronichealth.net.au/hi/xsd/consumermessages/SearchIHI/3.0"
                 schemaLocation="../../../schema/mca/consumer/messages/20100731/SearchIHIMessages.xsd"/>
@@ -54,12 +61,17 @@
                         <xsd:element ref="cce:medicareCardNumber" minOccurs="0"/>
                         <xsd:element ref="cce:medicareIRN" minOccurs="0"/>
                         <xsd:element ref="cce:dvaFileNumber" minOccurs="0"/>
+						    <!-- 2024/06/01 Add backward compatible optional electronicCommunication-->
+                        <xsd:element ref="ec:electronicCommunication" minOccurs="0"/>
+             
                         <xsd:element ref="ce:dateOfBirth"/>
                         <xsd:element ref="ce:sex"/>
                         <xsd:element ref="cin:familyName"/>
                         <xsd:element ref="cin:givenName" minOccurs="0"/>
                         <xsd:element ref="address:australianPostalAddress" minOccurs="0"/>
                         <xsd:element ref="address:australianStreetAddress" minOccurs="0"/>
+                        <!-- 2014/05/03 - Add backward compatible optional unstructured address -->
+                        <xsd:element ref="address:australianUnstructuredStreetAddress" minOccurs="0"/>
                         <xsd:element ref="address:internationalAddress" minOccurs="0"/>
 						<xsd:element ref="cce:history" minOccurs="0"/>
                     </xsd:sequence>
diff --git a/src/test/java/au/gov/nehta/hiwsdl/AustralianStreetAddressPropOrderTest.java b/src/test/java/au/gov/nehta/hiwsdl/AustralianStreetAddressPropOrderTest.java
new file mode 100644
index 0000000..1e59977
--- /dev/null
+++ b/src/test/java/au/gov/nehta/hiwsdl/AustralianStreetAddressPropOrderTest.java
@@ -0,0 +1,73 @@
+package au.gov.nehta.hiwsdl;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+
+import jakarta.xml.bind.annotation.XmlType;
+import org.junit.Test;
+
+/**
+ * Locks JAXB {@code propOrder} for Australian street address types against
+ * the licensed Address schema.
+ */
+public class AustralianStreetAddressPropOrderTest {
+
+    @Test
+    public void australianStreetAddressMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AustralianStreetAddressType",
+                new String[] {
+                        "state",
+                        "postcode",
+                        "suburb",
+                        "addressSiteName",
+                        "unitGroup",
+                        "levelGroup",
+                        "lotNumber",
+                        "streetNumber",
+                        "streetName",
+                        "streetType",
+                        "streetSuffix"
+                });
+    }
+
+    @Test
+    public void australianUnstructuredStreetAddressMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.consumercore.address._3.AustralianUnstructuredStreetAddressType",
+                new String[] {
+                        "addressLineOne",
+                        "addressLineTwo",
+                        "suburb",
+                        "state",
+                        "postcode"
+                });
+    }
+
+    @Test
+    public void searchAustralianAddressMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0.SearchAustralianAddressType",
+                new String[] {
+                        "unitGroup",
+                        "levelGroup",
+                        "addressSiteName",
+                        "streetNumber",
+                        "lotNumber",
+                        "streetName",
+                        "streetType",
+                        "streetSuffix",
+                        "postalDeliveryGroup",
+                        "suburb",
+                        "state",
+                        "postcode"
+                });
+    }
+
+    private static void assertPropOrder(String className, String[] expected) throws Exception {
+        Class<?> type = Class.forName(className);
+        XmlType xmlType = type.getAnnotation(XmlType.class);
+        assertNotNull(className + " missing @XmlType", xmlType);
+        assertArrayEquals(className, expected, xmlType.propOrder());
+    }
+}
diff --git a/src/test/java/au/gov/nehta/hiwsdl/GeneratedWsdlBindingsTest.java b/src/test/java/au/gov/nehta/hiwsdl/GeneratedWsdlBindingsTest.java
index 56de4a6..8354791 100644
--- a/src/test/java/au/gov/nehta/hiwsdl/GeneratedWsdlBindingsTest.java
+++ b/src/test/java/au/gov/nehta/hiwsdl/GeneratedWsdlBindingsTest.java
@@ -11,29 +11,27 @@
 import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.URL;
 import java.net.URLDecoder;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.List;
-import javax.jws.WebMethod;
-import javax.xml.bind.JAXBElement;
+import jakarta.jws.WebMethod;
+import jakarta.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import jakarta.xml.ws.WebServiceFeature;
 import org.junit.Test;
 
 public class GeneratedWsdlBindingsTest {
 
-    private static final List<String> GENERATED_PACKAGE_ROOTS = Arrays.asList(
-        "au.net.electronichealth",
-        "hi_override.org.w3.xmldsig"
-    );
+    private static final List<String> GENERATED_PACKAGE_ROOTS = List.of(
+            "au.net.electronichealth",
+            "hi_override.org.w3.xmldsig");
 
     @Test
     public void generatedPublicMethodsAreInvocableOrDeclaredOnPortInterfaces() throws Exception {
@@ -67,7 +65,7 @@ public void generatedPackageRootsResolveToClasses() throws Exception {
     }
 
     private static List<Class<?>> generatedClasses() throws Exception {
-        List<Class<?>> classes = new ArrayList<Class<?>>();
+        List<Class<?>> classes = new ArrayList<>();
         for (String packageRoot : GENERATED_PACKAGE_ROOTS) {
             classes.addAll(classesInPackage(packageRoot));
         }
@@ -77,17 +75,14 @@ private static List<Class<?>> generatedClasses() throws Exception {
 
     private static List<Class<?>> classesInPackage(String packageName) throws Exception {
         String path = packageName.replace('.', '/');
-        Enumeration<URL> resources = Thread.currentThread().getContextClassLoader().getResources(path);
-        List<Class<?>> classes = new ArrayList<Class<?>>();
-
-        while (resources.hasMoreElements()) {
-            URL resource = resources.nextElement();
+        List<Class<?>> classes = new ArrayList<>();
+        for (URL resource : Collections.list(
+                Thread.currentThread().getContextClassLoader().getResources(path))) {
             if ("file".equals(resource.getProtocol())) {
-                File directory = new File(URLDecoder.decode(resource.getFile(), "UTF-8"));
+                File directory = new File(URLDecoder.decode(resource.getFile(), StandardCharsets.UTF_8));
                 addClasses(directory, packageName, classes);
             }
         }
-
         return classes;
     }
 
@@ -100,15 +95,17 @@ private static void addClasses(File directory, String packageName, List<Class<?>
         for (File file : files) {
             if (file.isDirectory()) {
                 addClasses(file, packageName + "." + file.getName(), classes);
-            } else if (file.getName().endsWith(".class") && !file.getName().contains("$") && !"package-info.class".equals(file.getName())) {
-                String className = packageName + "." + file.getName().substring(0, file.getName().length() - ".class".length());
+            } else if (file.getName().endsWith(".class") && !file.getName().contains("$")
+                    && !"package-info.class".equals(file.getName())) {
+                String className = packageName + "."
+                        + file.getName().substring(0, file.getName().length() - ".class".length());
                 classes.add(Class.forName(className));
             }
         }
     }
 
     private static List<Method> publicDeclaredMethods(Class<?> type) {
-        List<Method> methods = new ArrayList<Method>();
+        List<Method> methods = new ArrayList<>();
         for (Method method : type.getDeclaredMethods()) {
             if (Modifier.isPublic(method.getModifiers()) && !method.isSynthetic() && !method.isBridge()) {
                 methods.add(method);
@@ -139,7 +136,7 @@ private static int exerciseEnumMethod(Class<?> type, Method method) throws Excep
         return 0;
     }
 
-    private static int exerciseServiceMethod(Class<?> type, Method method) {
+    private static int exerciseServiceMethod(Class<?> type, Method method) throws Exception {
         if (!method.getName().startsWith("get") || method.getAnnotation(WebEndpoint.class) == null) {
             return 0;
         }
@@ -151,9 +148,11 @@ private static int exerciseServiceMethod(Class<?> type, Method method) {
             wsdl = Thread.currentThread().getContextClassLoader().getResource(client.wsdlLocation());
         }
         assertNotNull(client.wsdlLocation(), wsdl);
-        assertFalse(client.targetNamespace().isEmpty());
-        assertFalse(client.name().isEmpty());
-        assertFalse(method.getAnnotation(WebEndpoint.class).name().isEmpty());
+
+        Constructor<?> constructor = type.getConstructor(URL.class, QName.class);
+        Object service = constructor.newInstance(wsdl, new QName(client.targetNamespace(), client.name()));
+        Object result = method.invoke(service, sampleArguments(method.getParameterTypes()));
+        assertNotNull(type.getName() + "." + method.getName(), result);
         return 1;
     }
 
diff --git a/src/test/java/au/gov/nehta/hiwsdl/HiWsdlArtifactTest.java b/src/test/java/au/gov/nehta/hiwsdl/HiWsdlArtifactTest.java
index 4c86c59..1dfa21c 100644
--- a/src/test/java/au/gov/nehta/hiwsdl/HiWsdlArtifactTest.java
+++ b/src/test/java/au/gov/nehta/hiwsdl/HiWsdlArtifactTest.java
@@ -1,40 +1,62 @@
 package au.gov.nehta.hiwsdl;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
-import javax.xml.ws.WebServiceClient;
+import java.util.Set;
+import jakarta.xml.ws.WebServiceClient;
 import org.junit.Test;
 
 /**
- * Offline checks for packaged WSDL and JAX-WS {@link WebServiceClient} stubs only.
+ * Offline checks for packaged WSDL and JAX-WS {@link WebServiceClient} stubs
+ * only.
  * Does not invoke or reflectively exercise generated JAXB types.
  */
 public class HiWsdlArtifactTest {
 
-    private static final List<String> HI_BINDING_WSDL = Arrays.asList(
-        "HI_ConsumerSearchIHI-3.0.wsdl",
-        "HI_ConsumerSearchIHIBatchSync-3.0.wsdl",
-        "HI_ProviderBatchAsyncSearchForProviderIndividual-5.1.0.wsdl",
-        "HI_ProviderBatchAsyncSearchForProviderOrganisation-5.1.0.wsdl",
-        "HI_ProviderSearchForProviderIndividual-5.0.0.wsdl",
-        "HI_ProviderSearchForProviderOrganisation-5.0.0.wsdl",
-        "HI_ProviderManageProviderOrganisation-3.2.0.wsdl",
-        "HI_ProviderManageProviderDirectoryEntry-3.2.0.wsdl",
-        "HI_ProviderSearchHIProviderDirectoryForOrganisation-3.2.0.wsdl",
-        "HI_ProviderReadReferenceData-3.2.0.wsdl",
-        "HI_ProviderReadProviderOrganisation-3.2.0.wsdl",
-        "HI_ProviderManageProviderAdministrativeIndividual-3.2.0.wsdl",
-        "HI_ProviderReadProviderAdministrativeIndividual-3.2.0.wsdl",
-        "HI_ProviderSearchHIProviderDirectoryForIndividual-3.2.0.wsdl"
-    );
+    private static final List<String> HI_BINDING_WSDL = List.of(
+            "HI_ConsumerSearchIHI-3.0.wsdl",
+            "HI_ConsumerSearchIHIBatchSync-3.0.wsdl",
+            "HI_ProviderBatchAsyncSearchForProviderIndividual-5.1.0.wsdl",
+            "HI_ProviderBatchAsyncSearchForProviderOrganisation-5.1.0.wsdl",
+            "HI_ProviderSearchForProviderIndividual-5.0.0.wsdl",
+            "HI_ProviderSearchForProviderOrganisation-5.0.0.wsdl",
+            "HI_ProviderManageProviderOrganisation-3.2.0.wsdl",
+            "HI_ProviderManageProviderDirectoryEntry-3.2.0.wsdl",
+            "HI_ProviderSearchHIProviderDirectoryForOrganisation-3.2.0.wsdl",
+            "HI_ProviderReadReferenceData-3.2.0.wsdl",
+            "HI_ProviderReadProviderOrganisation-3.2.0.wsdl",
+            "HI_ProviderManageProviderAdministrativeIndividual-3.2.0.wsdl",
+            "HI_ProviderReadProviderAdministrativeIndividual-3.2.0.wsdl",
+            "HI_ProviderSearchHIProviderDirectoryForIndividual-3.2.0.wsdl",
+            "HI_ConsumerSearchIHIBatchAsync-3.0.wsdl",
+            "HI_ConsumerCreateProvisionalIHI-3.0.wsdl",
+            "HI_ConsumerMergeProvisionalIHI-3.0.wsdl",
+            "HI_ConsumerUpdateProvisionalIHI-3.0.wsdl",
+            "HI_ConsumerCreateUnverifiedIHI-3.0.2.wsdl",
+            "HI_ConsumerResolveProvisionalIHI-3.0.2.wsdl",
+            "HI_ConsumerNotifyDuplicateIHI-3.2.0.wsdl",
+            "HI_ConsumerNotifyReplicaIHI-3.2.0.wsdl",
+            "HI_ConsumerUpdateIHI-3.2.0.wsdl",
+            "HI_ConsumerCreateVerifiedIHI-4.0.0.wsdl",
+            "HI_ProviderManageTdsProviderIndividual-5.1.0.wsdl",
+            "HI_ProviderSearchTdsProviderIndividual-5.1.0.wsdl");
+
+    /**
+     * Superseded service WSDL kept on the classpath; not a primary MCA binding
+     * stub.
+     */
+    private static final String SUPERSEDED_UPDATE_IHI_WSDL = "HI_ConsumerUpdateIHI-3.0.2.wsdl";
 
     @Test
     public void hiBindingWsdlOnClasspath() {
@@ -52,7 +74,60 @@ public void hiBindingServiceStubCount() throws Exception {
                 serviceStubs++;
             }
         }
-        assertEquals(14, serviceStubs);
+        assertEquals(26, serviceStubs);
+    }
+
+    @Test
+    public void serviceStubsReferencePackagedWsdl() throws Exception {
+        for (Class<?> type : serviceClassesOnClasspath()) {
+            WebServiceClient client = type.getAnnotation(WebServiceClient.class);
+            if (client == null) {
+                continue;
+            }
+            assertNotNull(type.getName() + " wsdlLocation=" + client.wsdlLocation(),
+                    resolveWsdl(type, client.wsdlLocation()));
+        }
+    }
+
+    @Test
+    public void serviceStubWsdlLocationsMatchHiBindingWsdl() throws Exception {
+        Set<String> expected = new LinkedHashSet<>(HI_BINDING_WSDL);
+        Set<String> actual = new LinkedHashSet<>();
+        for (Class<?> type : serviceClassesOnClasspath()) {
+            WebServiceClient client = type.getAnnotation(WebServiceClient.class);
+            if (client != null) {
+                actual.add(client.wsdlLocation());
+            }
+        }
+
+        assertEquals(expected, actual);
+        assertFalse(actual.contains(SUPERSEDED_UPDATE_IHI_WSDL));
+    }
+
+    @Test
+    public void supersededUpdateIhiWsdlRemainsOnClasspathWithoutStub() throws Exception {
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        assertNotNull(SUPERSEDED_UPDATE_IHI_WSDL, loader.getResource(SUPERSEDED_UPDATE_IHI_WSDL));
+
+        boolean stubForSuperseded = false;
+        for (Class<?> type : serviceClassesOnClasspath()) {
+            WebServiceClient client = type.getAnnotation(WebServiceClient.class);
+            if (client != null && SUPERSEDED_UPDATE_IHI_WSDL.equals(client.wsdlLocation())) {
+                stubForSuperseded = true;
+                break;
+            }
+        }
+        assertTrue("primary binding list excludes superseded Update IHI WSDL",
+                !HI_BINDING_WSDL.contains(SUPERSEDED_UPDATE_IHI_WSDL));
+        assertFalse(stubForSuperseded);
+    }
+
+    private static URL resolveWsdl(Class<?> stub, String location) {
+        URL url = stub.getResource(location);
+        if (url == null) {
+            url = Thread.currentThread().getContextClassLoader().getResource(location);
+        }
+        return url;
     }
 
     private static List<Class<?>> serviceClassesOnClasspath() throws Exception {
@@ -61,17 +136,14 @@ private static List<Class<?>> serviceClassesOnClasspath() throws Exception {
 
     private static List<Class<?>> classesInPackage(String packageName) throws Exception {
         String path = packageName.replace('.', '/');
-        Enumeration<URL> resources = Thread.currentThread().getContextClassLoader().getResources(path);
         List<Class<?>> classes = new ArrayList<>();
-
-        while (resources.hasMoreElements()) {
-            URL resource = resources.nextElement();
+        for (URL resource : Collections.list(
+                Thread.currentThread().getContextClassLoader().getResources(path))) {
             if ("file".equals(resource.getProtocol())) {
-                File directory = new File(URLDecoder.decode(resource.getFile(), "UTF-8"));
+                File directory = new File(URLDecoder.decode(resource.getFile(), StandardCharsets.UTF_8));
                 addClasses(directory, packageName, classes);
             }
         }
-
         return classes;
     }
 
@@ -85,9 +157,10 @@ private static void addClasses(File directory, String packageName, List<Class<?>
             if (file.isDirectory()) {
                 addClasses(file, packageName + "." + file.getName(), classes);
             } else if (file.getName().endsWith(".class")
-                && !file.getName().contains("$")
-                && !"package-info.class".equals(file.getName())) {
-                String className = packageName + "." + file.getName().substring(0, file.getName().length() - ".class".length());
+                    && !file.getName().contains("$")
+                    && !"package-info.class".equals(file.getName())) {
+                String className = packageName + "."
+                        + file.getName().substring(0, file.getName().length() - ".class".length());
                 classes.add(Class.forName(className));
             }
         }
diff --git a/src/test/java/au/gov/nehta/hiwsdl/InternationalAddressPropOrderTest.java b/src/test/java/au/gov/nehta/hiwsdl/InternationalAddressPropOrderTest.java
new file mode 100644
index 0000000..d1ae25c
--- /dev/null
+++ b/src/test/java/au/gov/nehta/hiwsdl/InternationalAddressPropOrderTest.java
@@ -0,0 +1,69 @@
+package au.gov.nehta.hiwsdl;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+
+import jakarta.xml.bind.annotation.XmlType;
+import org.junit.Test;
+
+/**
+ * Locks JAXB {@code propOrder} for international address types against
+ * the licensed Address schemas.
+ */
+public class InternationalAddressPropOrderTest {
+
+    @Test
+    public void consumerInternationalAddressMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.consumercore.address._3.InternationalAddressType",
+                new String[] {
+                        "internationalStateProvince",
+                        "country",
+                        "internationalPostcode",
+                        "internationalAddressLine"
+                });
+    }
+
+    @Test
+    public void providerInternationalAddressMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressType",
+                new String[] {
+                        "internationalAddressLine",
+                        "internationalStateProvince",
+                        "internationalPostcode",
+                        "country"
+                });
+    }
+
+    @Test
+    public void providerInternationalAddressCriteriaMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.providercore.address._3_2.InternationalAddressCriteriaType",
+                new String[] {
+                        "internationalAddressLine",
+                        "internationalStateProvince",
+                        "internationalPostcode",
+                        "country"
+                });
+    }
+
+    @Test
+    public void searchInternationalAddressMatchesLicensedSchemaSequence() throws Exception {
+        assertPropOrder(
+                "au.net.electronichealth.ns.hi.xsd.common.addresscore._5_0.SearchInternationalAddressType",
+                new String[] {
+                        "internationalAddressLine",
+                        "internationalStateProvince",
+                        "internationalPostcode",
+                        "country"
+                });
+    }
+
+    private static void assertPropOrder(String className, String[] expected) throws Exception {
+        Class<?> type = Class.forName(className);
+        XmlType xmlType = type.getAnnotation(XmlType.class);
+        assertNotNull(className + " missing @XmlType", xmlType);
+        assertArrayEquals(className, expected, xmlType.propOrder());
+    }
+}
diff --git a/src/test/java/au/gov/nehta/hiwsdl/JavaxStackTest.java b/src/test/java/au/gov/nehta/hiwsdl/JakartaStackTest.java
similarity index 58%
rename from src/test/java/au/gov/nehta/hiwsdl/JavaxStackTest.java
rename to src/test/java/au/gov/nehta/hiwsdl/JakartaStackTest.java
index 311a188..1e2db8b 100644
--- a/src/test/java/au/gov/nehta/hiwsdl/JavaxStackTest.java
+++ b/src/test/java/au/gov/nehta/hiwsdl/JakartaStackTest.java
@@ -13,23 +13,26 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import org.junit.Test;
 
-public class JavaxStackTest {
+/**
+ * Locks the Jakarta XML stack on this Java 24 line (no legacy javax JAX-WS/JAXB).
+ */
+public class JakartaStackTest {
 
     @Test
-    public void compileDependenciesAreJavaxApis() throws Exception {
-        assertNotNull(Class.forName("javax.xml.bind.JAXBContext"));
-        assertNotNull(Class.forName("javax.xml.ws.Service"));
-        assertNotNull(Class.forName("javax.jws.WebMethod"));
+    public void compileDependenciesAreJakartaApis() throws Exception {
+        assertNotNull(Class.forName("jakarta.xml.bind.JAXBContext"));
+        assertNotNull(Class.forName("jakarta.xml.ws.Service"));
+        assertNotNull(Class.forName("jakarta.jws.WebMethod"));
         try {
-            Class.forName("jakarta.xml.bind.JAXBContext");
-            fail("jakarta.xml.bind must not be on the compile/test classpath");
+            Class.forName("javax.xml.bind.JAXBContext");
+            fail("javax.xml.bind must not be on the compile/test classpath");
         } catch (ClassNotFoundException expected) {
-            // javax line only
+            // Jakarta line only
         }
     }
 
     @Test
-    public void generatedSourcesDoNotImportJakarta() throws Exception {
+    public void generatedSourcesDoNotImportLegacyJavaxApis() throws Exception {
         Path root = Paths.get("src/main/java");
         final boolean[] found = {false};
         final StringBuilder offenders = new StringBuilder();
@@ -41,7 +44,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws ja
                     return FileVisitResult.CONTINUE;
                 }
                 String content = new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
-                if (content.contains("import jakarta.")) {
+                if (content.contains("import javax.jws")
+                        || content.contains("import javax.xml.bind")
+                        || content.contains("import javax.xml.ws")) {
                     found[0] = true;
                     offenders.append(System.lineSeparator()).append(root.relativize(file));
                 }
@@ -49,6 +54,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws ja
             }
         });
 
-        assertFalse("Generated sources must use javax imports only:" + offenders, found[0]);
+        assertFalse("Generated sources must use Jakarta XML Web Services imports:" + offenders, found[0]);
     }
 }
diff --git a/src/test/java/au/gov/nehta/hiwsdl/SearchForProviderIndividualPropOrderTest.java b/src/test/java/au/gov/nehta/hiwsdl/SearchForProviderIndividualPropOrderTest.java
new file mode 100644
index 0000000..4e42369
--- /dev/null
+++ b/src/test/java/au/gov/nehta/hiwsdl/SearchForProviderIndividualPropOrderTest.java
@@ -0,0 +1,50 @@
+package au.gov.nehta.hiwsdl;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+
+import jakarta.xml.bind.annotation.XmlType;
+import org.junit.Test;
+
+/**
+ * Locks JAXB {@code propOrder} for HI31 Search for Provider Individual request types.
+ */
+public class SearchForProviderIndividualPropOrderTest {
+
+    private static final String[] XSD_SEQUENCE = {
+        "hpiiNumber",
+        "registrationId",
+        "familyName",
+        "onlyNameIndicator",
+        "givenName",
+        "dateOfBirth",
+        "sex",
+        "state",
+        "postcode",
+        "searchAustralianAddress",
+        "searchInternationalAddress"
+    };
+
+    @Test
+    public void hi31SvcSearchForProviderIndividualMatchesLicensedXsd() throws Exception {
+        assertPropOrder(
+            "au.net.electronichealth.ns.hi.svc.providersearchforproviderindividual._5_0.SearchForProviderIndividual",
+            XSD_SEQUENCE
+        );
+    }
+
+    @Test
+    public void hi33MessagesSearchForProviderIndividualMatchesLicensedXsd() throws Exception {
+        assertPropOrder(
+            "au.net.electronichealth.ns.hi.xsd.providermessages.searchindividual._5_0.SearchForProviderIndividual",
+            XSD_SEQUENCE
+        );
+    }
+
+    private static void assertPropOrder(String className, String[] expected) throws Exception {
+        Class<?> type = Class.forName(className);
+        XmlType xmlType = type.getAnnotation(XmlType.class);
+        assertNotNull(className + " missing @XmlType", xmlType);
+        assertArrayEquals(className, expected, xmlType.propOrder());
+    }
+}
diff --git a/src/test/java/au/gov/nehta/hiwsdl/SearchIhiPropOrderTest.java b/src/test/java/au/gov/nehta/hiwsdl/SearchIhiPropOrderTest.java
new file mode 100644
index 0000000..6381fed
--- /dev/null
+++ b/src/test/java/au/gov/nehta/hiwsdl/SearchIhiPropOrderTest.java
@@ -0,0 +1,66 @@
+package au.gov.nehta.hiwsdl;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+
+import jakarta.xml.bind.annotation.XmlType;
+import org.junit.Test;
+
+/**
+ * Locks JAXB {@code propOrder} for Consumer Search IHI request types shipped in this JAR.
+ */
+public class SearchIhiPropOrderTest {
+
+    @Test
+    public void messagesSearchIhiElectronicCommunicationBeforeDateOfBirth() throws Exception {
+        assertPropOrder(
+            "au.net.electronichealth.ns.hi.xsd.consumermessages.searchihi._3.SearchIHI",
+            new String[] {
+                "ihiNumber",
+                "medicareCardNumber",
+                "medicareIRN",
+                "dvaFileNumber",
+                "electronicCommunication",
+                "dateOfBirth",
+                "sex",
+                "familyName",
+                "givenName",
+                "australianPostalAddress",
+                "australianStreetAddress",
+                "internationalAddress",
+                "australianUnstructuredStreetAddress",
+                "history"
+            }
+        );
+    }
+
+    @Test
+    public void interfaceSearchIhiElectronicCommunicationBeforeDateOfBirth() throws Exception {
+        assertPropOrder(
+            "au.net.electronichealth.ns.hi.svc.consumersearchihi._3.SearchIHI",
+            new String[] {
+                "ihiNumber",
+                "medicareCardNumber",
+                "medicareIRN",
+                "dvaFileNumber",
+                "electronicCommunication",
+                "dateOfBirth",
+                "sex",
+                "familyName",
+                "givenName",
+                "australianPostalAddress",
+                "australianStreetAddress",
+                "australianUnstructuredStreetAddress",
+                "internationalAddress",
+                "history"
+            }
+        );
+    }
+
+    private static void assertPropOrder(String className, String[] expected) throws Exception {
+        Class<?> type = Class.forName(className);
+        XmlType xmlType = type.getAnnotation(XmlType.class);
+        assertNotNull(className + " missing @XmlType", xmlType);
+        assertArrayEquals(className, expected, xmlType.propOrder());
+    }
+}
diff --git a/src/test/java/au/gov/nehta/hiwsdl/WsdlStubContractTest.java b/src/test/java/au/gov/nehta/hiwsdl/WsdlStubContractTest.java
new file mode 100644
index 0000000..124b04d
--- /dev/null
+++ b/src/test/java/au/gov/nehta/hiwsdl/WsdlStubContractTest.java
@@ -0,0 +1,346 @@
+package au.gov.nehta.hiwsdl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import jakarta.xml.ws.Action;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebEndpoint;
+import jakarta.xml.ws.WebServiceClient;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Offline contract: packaged WSDL service/port/operation/header names match
+ * generated HI stubs.
+ */
+public class WsdlStubContractTest {
+
+    private static final String WSDL_NS = "http://schemas.xmlsoap.org/wsdl/";
+
+    @Test
+    public void twentySixServiceStubsMatchPackagedWsdl() throws Exception {
+        List<Class<?>> stubs = serviceStubs();
+        assertEquals(26, stubs.size());
+        for (Class<?> stub : stubs) {
+            assertStubMatchesWsdl(stub);
+        }
+    }
+
+    private static void assertStubMatchesWsdl(Class<?> stub) throws Exception {
+        WebServiceClient client = stub.getAnnotation(WebServiceClient.class);
+        assertNotNull(stub.getName(), client);
+
+        URL wsdlUrl = resolveWsdl(stub, client.wsdlLocation());
+        assertNotNull(stub.getName() + " wsdlLocation=" + client.wsdlLocation(), wsdlUrl);
+
+        List<Document> docs = loadWsdlGraph(wsdlUrl);
+        Document root = docs.get(0);
+        Element definitions = root.getDocumentElement();
+        assertEquals(stub.getName() + " targetNamespace", client.targetNamespace(),
+                attr(definitions, "targetNamespace"));
+
+        Element service = namedChild(docs, "service", client.name());
+        assertNotNull(stub.getName() + " missing wsdl:service " + client.name(), service);
+
+        Set<String> portNames = new LinkedHashSet<>();
+        Class<?> portType = null;
+        for (Method method : stub.getDeclaredMethods()) {
+            WebEndpoint endpoint = method.getAnnotation(WebEndpoint.class);
+            if (endpoint == null) {
+                continue;
+            }
+            portNames.add(endpoint.name());
+            if (portType == null && method.getParameterTypes().length == 0
+                    && !Service.class.equals(method.getReturnType())) {
+                portType = method.getReturnType();
+            }
+        }
+        assertFalse(stub.getName() + " has no @WebEndpoint", portNames.isEmpty());
+        assertNotNull(stub.getName() + " port interface", portType);
+
+        for (String portName : portNames) {
+            assertNotNull(stub.getName() + " missing wsdl:port " + portName,
+                    namedChild(children(service, "port"), portName));
+        }
+
+        assertPortTypeMatchesWsdl(stub.getName(), portType, docs);
+    }
+
+    private static void assertPortTypeMatchesWsdl(String stubName, Class<?> portType, List<Document> docs)
+            throws Exception {
+        WebService webService = portType.getAnnotation(WebService.class);
+        assertNotNull(stubName + " " + portType.getName(), webService);
+
+        Element wsdlPortType = portTypeInNamespace(docs, webService.targetNamespace(), webService.name());
+        assertNotNull(stubName + " missing wsdl:portType " + webService.name()
+                + " ns=" + webService.targetNamespace(), wsdlPortType);
+
+        Set<String> wsdlOps = new LinkedHashSet<>();
+        Map<String, Element> wsdlOpByName = new LinkedHashMap<>();
+        for (Element operation : children(wsdlPortType, "operation")) {
+            String name = attr(operation, "name");
+            wsdlOps.add(name);
+            wsdlOpByName.put(name, operation);
+        }
+
+        Set<String> javaOps = new LinkedHashSet<>();
+        for (Method method : portType.getDeclaredMethods()) {
+            WebMethod webMethod = method.getAnnotation(WebMethod.class);
+            if (webMethod == null) {
+                continue;
+            }
+            String opName = webMethod.operationName();
+            if (opName == null || opName.isEmpty()) {
+                opName = method.getName();
+            }
+            assertTrue(stubName + " " + portType.getSimpleName() + "." + method.getName()
+                    + " operation " + opName + " is not in WSDL portType " + webService.name()
+                    + " ops=" + wsdlOps, wsdlOps.contains(opName));
+            javaOps.add(opName);
+
+            Element wsdlOp = wsdlOpByName.get(opName);
+            Action action = method.getAnnotation(Action.class);
+            if (action != null && wsdlOp != null) {
+                Element input = firstChild(wsdlOp, "input");
+                Element output = firstChild(wsdlOp, "output");
+                if (input != null && action.input() != null && !action.input().isEmpty()) {
+                    String wsdlAction = addressingAction(input);
+                    if (wsdlAction != null && !wsdlAction.isEmpty()) {
+                        assertEquals(stubName + " " + opName + " input Action", wsdlAction, action.input());
+                    }
+                }
+                if (output != null && action.output() != null && !action.output().isEmpty()) {
+                    String wsdlAction = addressingAction(output);
+                    if (wsdlAction != null && !wsdlAction.isEmpty()) {
+                        assertEquals(stubName + " " + opName + " output Action", wsdlAction, action.output());
+                    }
+                }
+            }
+
+            Set<String> headerParts = new LinkedHashSet<>();
+            for (WebParam param : collectWebParams(method)) {
+                if (param.header()) {
+                    String part = param.partName();
+                    if (part == null || part.isEmpty()) {
+                        part = param.name();
+                    }
+                    headerParts.add(part);
+                }
+            }
+            assertTrue(stubName + " " + opName + " missing productHeader SOAP header param",
+                    headerParts.contains("productHeader"));
+        }
+
+        assertEquals(stubName + " " + webService.name() + " operation set", wsdlOps, javaOps);
+    }
+
+    private static WebParam[] collectWebParams(Method method) {
+        java.lang.annotation.Annotation[][] all = method.getParameterAnnotations();
+        List<WebParam> params = new ArrayList<>();
+        for (java.lang.annotation.Annotation[] perArg : all) {
+            for (java.lang.annotation.Annotation annotation : perArg) {
+                if (annotation instanceof WebParam) {
+                    params.add((WebParam) annotation);
+                }
+            }
+        }
+        return params.toArray(new WebParam[0]);
+    }
+
+    private static String addressingAction(Element messageRef) {
+        String value = messageRef.getAttributeNS("http://www.w3.org/2007/05/addressing/metadata", "Action");
+        if (value == null || value.isEmpty()) {
+            value = messageRef.getAttributeNS("http://www.w3.org/2006/05/addressing/wsdl", "Action");
+        }
+        if (value == null || value.isEmpty()) {
+            value = attr(messageRef, "Action");
+        }
+        return value;
+    }
+
+    private static URL resolveWsdl(Class<?> stub, String location) {
+        URL url = stub.getResource(location);
+        if (url == null) {
+            url = Thread.currentThread().getContextClassLoader().getResource(location);
+        }
+        return url;
+    }
+
+    private static List<Document> loadWsdlGraph(URL start) throws Exception {
+        List<Document> docs = new ArrayList<>();
+        Set<String> seen = new LinkedHashSet<>();
+        loadWsdlGraph(start, docs, seen);
+        return docs;
+    }
+
+    private static void loadWsdlGraph(URL url, List<Document> docs, Set<String> seen) throws Exception {
+        String key = url.toExternalForm();
+        if (!seen.add(key)) {
+            return;
+        }
+        Document document = parseXml(url);
+        docs.add(document);
+        Element definitions = document.getDocumentElement();
+        for (Element imported : children(definitions, "import")) {
+            String location = attr(imported, "location");
+            if (location == null || location.isEmpty()) {
+                continue;
+            }
+            URL next = new URL(url, location);
+            if ("file".equals(next.getProtocol()) && !new File(next.toURI()).isFile()) {
+                String name = basename(location);
+                URL classpath = Thread.currentThread().getContextClassLoader().getResource(name);
+                assertNotNull("wsdl import not on classpath: " + location, classpath);
+                next = classpath;
+            }
+            loadWsdlGraph(next, docs, seen);
+        }
+    }
+
+    private static String basename(String location) {
+        int slash = Math.max(location.lastIndexOf('/'), location.lastIndexOf('\\'));
+        if (slash >= 0) {
+            return location.substring(slash + 1);
+        }
+        return location;
+    }
+
+    private static Document parseXml(URL url) throws Exception {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        factory.setExpandEntityReferences(false);
+        try {
+            factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        } catch (Exception ignored) {
+            // Parser support differs across JDK XML implementations.
+        }
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        try (InputStream stream = url.openStream()) {
+            return builder.parse(stream);
+        }
+    }
+
+    private static Element portTypeInNamespace(List<Document> docs, String namespace, String name) {
+        for (Document document : docs) {
+            Element definitions = document.getDocumentElement();
+            if (!namespace.equals(attr(definitions, "targetNamespace"))) {
+                continue;
+            }
+            Element found = namedChild(children(definitions, "portType"), name);
+            if (found != null) {
+                return found;
+            }
+        }
+        return null;
+    }
+
+    private static Element namedChild(List<Document> docs, String localName, String name) {
+        for (Document document : docs) {
+            Element found = namedChild(children(document.getDocumentElement(), localName), name);
+            if (found != null) {
+                return found;
+            }
+        }
+        return null;
+    }
+
+    private static Element namedChild(List<Element> elements, String name) {
+        for (Element element : elements) {
+            if (name.equals(attr(element, "name"))) {
+                return element;
+            }
+        }
+        return null;
+    }
+
+    private static Element firstChild(Element parent, String localName) {
+        List<Element> found = children(parent, localName);
+        return found.isEmpty() ? null : found.get(0);
+    }
+
+    private static List<Element> children(Element parent, String localName) {
+        List<Element> found = new ArrayList<>();
+        for (Node node = parent.getFirstChild(); node != null; node = node.getNextSibling()) {
+            if (node.getNodeType() != Node.ELEMENT_NODE) {
+                continue;
+            }
+            Element element = (Element) node;
+            if (!localName.equals(element.getLocalName())) {
+                continue;
+            }
+            String ns = element.getNamespaceURI();
+            if (ns == null || WSDL_NS.equals(ns)) {
+                found.add(element);
+            }
+        }
+        return found;
+    }
+
+    private static String attr(Element element, String name) {
+        String value = element.getAttribute(name);
+        return value == null ? "" : value;
+    }
+
+    private static List<Class<?>> serviceStubs() throws Exception {
+        List<Class<?>> stubs = new ArrayList<>();
+        for (Class<?> type : classesInPackage("au.net.electronichealth.ns.hi.svc")) {
+            if (type.getAnnotation(WebServiceClient.class) != null) {
+                stubs.add(type);
+            }
+        }
+        return stubs;
+    }
+
+    private static List<Class<?>> classesInPackage(String packageName) throws Exception {
+        String path = packageName.replace('.', '/');
+        List<Class<?>> classes = new ArrayList<>();
+        for (URL resource : Collections.list(
+                Thread.currentThread().getContextClassLoader().getResources(path))) {
+            if ("file".equals(resource.getProtocol())) {
+                addClasses(new File(URLDecoder.decode(resource.getFile(), StandardCharsets.UTF_8)),
+                        packageName, classes);
+            }
+        }
+        return classes;
+    }
+
+    private static void addClasses(File directory, String packageName, List<Class<?>> classes) throws Exception {
+        File[] files = directory.listFiles();
+        if (files == null) {
+            return;
+        }
+        for (File file : files) {
+            if (file.isDirectory()) {
+                addClasses(file, packageName + "." + file.getName(), classes);
+            } else if (file.getName().endsWith(".class")
+                    && !file.getName().contains("$")
+                    && !"package-info.class".equals(file.getName())) {
+                String className = packageName + "." + file.getName().substring(0, file.getName().length() - 6);
+                classes.add(Class.forName(className));
+            }
+        }
+    }
+}
diff --git a/wsdls/readme.txt b/wsdls/readme.txt
new file mode 100644
index 0000000..e62dd79
--- /dev/null
+++ b/wsdls/readme.txt
@@ -0,0 +1,14 @@
+Licensed HI WSDL/XSD tree (same layout as hi-b2b-client-java wsdls/xml).
+
+Copy the toolkit xml folder here as wsdls/xml/ (contains wsdl/, schema/, binding/), or override at regeneration time:
+
+  mvn -B clean -Pregenerate-sources generate-sources process-sources "-Dhi.wsdl.sync.generated=true"
+
+  # optional: -Dhi.wsdl.tree.root=/path/to/licensed/tree
+
+When HI interfaces change, copy flat HI_*.wsdl from the licensed tree into src/main/resources/.
+
+For Messages schema SearchIHIMessages.xsd, keep electronicCommunication immediately after identity
+fields and before dateOfBirth (and internationalAddress before australianUnstructuredStreetAddress)
+
+The 26 wsimport executions in pom.xml (-Pregenerate-sources) align with hi-b2b-client-java 24.0.0.