From e6422c1e56a6b6b3bac1a5d432b9e1905ad36ef4 Mon Sep 17 00:00:00 2001
From: quanpham-axonivy <quan.phamvan@axonactive.com>
Date: Wed, 4 Dec 2024 10:41:19 +0700
Subject: [PATCH] MARP-1481 Upgrade for Ivy 12 (#25)

---
 .github/workflows/ci.yml                      |   2 +-
 .github/workflows/dev.yml                     |   2 +-
 .github/workflows/release.yml                 |   2 +-
 pom.xml                                       |  81 +++----
 threema-connector-demo/.project               |  98 +++++----
 threema-connector-demo/.settings/.jsdtscope   |  17 --
 .../.settings/ch.ivyteam.ivy.designer.prefs   |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../org.eclipse.wst.common.component          |   2 +-
 ....eclipse.wst.common.project.facet.core.xml |   6 +-
 ...rg.eclipse.wst.jsdt.ui.superType.container |   1 -
 .../org.eclipse.wst.jsdt.ui.superType.name    |   1 -
 threema-connector-demo/config/variables.yaml  |   4 +-
 .../threema/connector/demo/Data.d.json        |   6 +
 .../threema/connector/demo/Data.ivyClass      |   2 -
 .../threema/connector/demo/Status.d.json      |  15 ++
 .../threema/connector/demo/Status.ivyClass    |   6 -
 .../connector/demo/sendDemoMessageData.d.json |  35 +++
 .../demo/sendDemoMessageData.ivyClass         |  16 --
 threema-connector-demo/pom.xml                |  74 +++----
 .../processes/ThreemaDemoProcess.p.json       | 200 ++++++++----------
 .../demo/KeyPair/KeyPair.rddescriptor         |   7 -
 .../connector/demo/KeyPair/KeyPairData.d.json |  15 ++
 .../demo/KeyPair/KeyPairData.ivyClass         |   6 -
 .../demo/KeyPair/KeyPairProcess.p.json        |  16 +-
 .../demo/ResultPage/ResultPage.rddescriptor   |   7 -
 .../demo/ResultPage/ResultPageData.d.json     |  15 ++
 .../demo/ResultPage/ResultPageData.ivyClass   |   6 -
 .../demo/ResultPage/ResultPageProcess.p.json  |  32 +--
 .../multipleRecipients.rddescriptor           |   7 -
 .../multipleRecipientsData.d.json             |  11 +
 .../multipleRecipientsData.ivyClass           |   4 -
 .../multipleRecipientsProcess.p.json          |  24 ++-
 .../singleRecipient.rddescriptor              |   7 -
 .../singleRecipientData.d.json                |  11 +
 .../singleRecipientData.ivyClass              |   4 -
 .../singleRecipientProcess.p.json             |  24 ++-
 .../webContent/layouts/frame-10.xhtml         |   2 +-
 threema-connector-product/pom.xml             |   2 +-
 threema-connector-test/.project               |  98 +++++----
 threema-connector-test/.settings/.jsdtscope   |  17 --
 .../.settings/ch.ivyteam.ivy.designer.prefs   |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../org.eclipse.wst.common.component          |   2 +-
 ....eclipse.wst.common.project.facet.core.xml |   6 +-
 ...rg.eclipse.wst.jsdt.ui.superType.container |   1 -
 .../org.eclipse.wst.jsdt.ui.superType.name    |   1 -
 threema-connector-test/config/variables.yaml  |   2 +-
 .../threema/connector/test/Data.d.json        |   6 +
 .../threema/connector/test/Data.ivyClass      |   2 -
 threema-connector-test/pom.xml                | 130 ++++++------
 threema-connector-webtest/.project            |  98 +++++----
 .../.settings/.jsdtscope                      |  17 --
 .../.settings/ch.ivyteam.ivy.designer.prefs   |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../org.eclipse.wst.common.component          |   3 +-
 ....eclipse.wst.common.project.facet.core.xml |   6 +-
 ...rg.eclipse.wst.jsdt.ui.superType.container |   1 -
 .../org.eclipse.wst.jsdt.ui.superType.name    |   1 -
 .../config/variables.yaml                     |   1 +
 .../threema/connector/webtest/Data.d.json     |   6 +
 .../threema/connector/webtest/Data.ivyClass   |   2 -
 threema-connector-webtest/pom.xml             | 120 +++++------
 threema-connector/.project                    |  98 +++++----
 threema-connector/.settings/.jsdtscope        |  17 --
 .../.settings/ch.ivyteam.ivy.designer.prefs   |   5 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../org.eclipse.wst.common.component          |   2 +-
 ....eclipse.wst.common.project.facet.core.xml |   6 +-
 ...rg.eclipse.wst.jsdt.ui.superType.container |   1 -
 .../org.eclipse.wst.jsdt.ui.superType.name    |   1 -
 threema-connector/config/variables.yaml       |   3 +-
 .../dataclasses/threema/connector/Data.d.json |   6 +
 .../threema/connector/Data.ivyClass           |   2 -
 .../threema/connector/ReceiverData.d.json     |  43 ++++
 .../threema/connector/ReceiverData.ivyClass   |  20 --
 .../connector/SendThreemaMessageData.d.json   |  27 +++
 .../connector/SendThreemaMessageData.ivyClass |  12 --
 .../connector/createKeyPairData.d.json        |  15 ++
 .../connector/createKeyPairData.ivyClass      |   6 -
 threema-connector/pom.xml                     | 113 +++++-----
 .../processes/multipleRecipients.p.json       |  54 +++--
 .../processes/singleRecipient.p.json          |  77 +++----
 .../processes/util/getReceiverInfo.p.json     | 110 ++++++----
 .../processes/util/messageEncryption.p.json   |  16 +-
 .../processes/util/sendMessage.p.json         |  66 +++---
 .../webContent/layouts/frame-10.xhtml         |   2 +-
 87 files changed, 1056 insertions(+), 975 deletions(-)
 delete mode 100644 threema-connector-demo/.settings/.jsdtscope
 delete mode 100644 threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json
 delete mode 100644 threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass
 create mode 100644 threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json
 delete mode 100644 threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass
 create mode 100644 threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json
 delete mode 100644 threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor
 create mode 100644 threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor
 create mode 100644 threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor
 create mode 100644 threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor
 create mode 100644 threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json
 delete mode 100644 threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass
 delete mode 100644 threema-connector-test/.settings/.jsdtscope
 delete mode 100644 threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 threema-connector-test/dataclasses/threema/connector/test/Data.d.json
 delete mode 100644 threema-connector-test/dataclasses/threema/connector/test/Data.ivyClass
 delete mode 100644 threema-connector-webtest/.settings/.jsdtscope
 delete mode 100644 threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 threema-connector-webtest/dataclasses/threema/connector/webtest/Data.d.json
 delete mode 100644 threema-connector-webtest/dataclasses/threema/connector/webtest/Data.ivyClass
 delete mode 100644 threema-connector/.settings/.jsdtscope
 delete mode 100644 threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 threema-connector/dataclasses/threema/connector/Data.d.json
 delete mode 100644 threema-connector/dataclasses/threema/connector/Data.ivyClass
 create mode 100644 threema-connector/dataclasses/threema/connector/ReceiverData.d.json
 delete mode 100644 threema-connector/dataclasses/threema/connector/ReceiverData.ivyClass
 create mode 100644 threema-connector/dataclasses/threema/connector/SendThreemaMessageData.d.json
 delete mode 100644 threema-connector/dataclasses/threema/connector/SendThreemaMessageData.ivyClass
 create mode 100644 threema-connector/dataclasses/threema/connector/createKeyPairData.d.json
 delete mode 100644 threema-connector/dataclasses/threema/connector/createKeyPairData.ivyClass

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87d78f0..bd4b9c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,4 +9,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index c2fee37..ae5e6c3 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ab5b0d7..bc801b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,4 +4,4 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5
diff --git a/pom.xml b/pom.xml
index 2205884..e3d663e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,46 +1,49 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.connector.threema</groupId><!-- your group id: e.g. 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.axonivy.connector.threema</groupId><!-- your group id: e.g. 
     com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
-  <name>threema-connector</name>
-  <artifactId>threema-connector-modules</artifactId>
-  <version>10.0.5-SNAPSHOT</version><!-- identicate your minimal compliant 
+	<name>threema-connector</name>
+	<artifactId>threema-connector-modules</artifactId>
+	<version>12.0.0-SNAPSHOT</version><!-- identicate your minimal compliant 
     ivy version with the first 2 digits -->
-  <packaging>pom</packaging>
+	<packaging>pom</packaging>
 
-  <modules>
-    <module>${project.name}</module>
-    <module>${project.name}-demo</module>
-    <module>${project.name}-test</module>
-    <module>${project.name}-product</module>
-    <module>${project.name}-webtest</module>
-  </modules>
+	<modules>
+		<module>${project.name}</module>
+		<module>${project.name}-demo</module>
+		<module>${project.name}-test</module>
+		<module>${project.name}-product</module>
+		<module>${project.name}-webtest</module>
+	</modules>
 
-  <scm>
-    <developerConnection>scm:git:https://github.com/axonivy-market/${project.name}.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
+	<scm>
+		<developerConnection>
+			scm:git:https://github.com/axonivy-market/${project.name}.git</developerConnection>
+		<tag>HEAD</tag>
+	</scm>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M1</version>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>3.0.0-M4</version>
-          <configuration>
-            <tagNameFormat>v@{project.version}</tagNameFormat>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.0.0-M1</version>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>3.0.0-M4</version>
+					<configuration>
+						<tagNameFormat>v@{project.version}</tagNameFormat>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 
 </project>
diff --git a/threema-connector-demo/.project b/threema-connector-demo/.project
index 7289f72..8091215 100644
--- a/threema-connector-demo/.project
+++ b/threema-connector-demo/.project
@@ -1,49 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>threema-connector-demo</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-  </natures>
-</projectDescription>
+	<name>threema-connector-demo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
\ No newline at end of file
diff --git a/threema-connector-demo/.settings/.jsdtscope b/threema-connector-demo/.settings/.jsdtscope
deleted file mode 100644
index e4ab59a..0000000
--- a/threema-connector-demo/.settings/.jsdtscope
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry
-    excluding="**/bower_components/*|**/node_modules/*|**/*.min.js"
-    kind="src" path="webContent" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.WebProject">
-    <attributes>
-      <attribute name="hide" value="true" />
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
-  <classpathentry kind="output" path="" />
-</classpath>
diff --git a/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
index 471c536..4f5980c 100644
--- a/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/threema-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=threema.connector.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=threema.connector.demo
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1
diff --git a/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs b/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs
index d4540a5..3a79233 100644
--- a/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs
+++ b/threema-connector-demo/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/threema-connector-demo/.settings/org.eclipse.wst.common.component b/threema-connector-demo/.settings/org.eclipse.wst.common.component
index db6eed0..ed1c089 100644
--- a/threema-connector-demo/.settings/org.eclipse.wst.common.component
+++ b/threema-connector-demo/.settings/org.eclipse.wst.common.component
@@ -15,4 +15,4 @@
     <property name="java-output-path"
       value="/threema-connector-demo/target/classes" />
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3bb273d..ac11c9f 100644
--- a/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web" />
-  <installed facet="java" version="17" />
+  <installed facet="java" version="21" />
   <installed facet="jst.web" version="3.0" />
-  <installed facet="wst.jsdt.web" version="1.0" />
   <installed facet="jst.jsf" version="2.1" />
-</faceted-project>
+</faceted-project>
\ No newline at end of file
diff --git a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/threema-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/threema-connector-demo/config/variables.yaml b/threema-connector-demo/config/variables.yaml
index d0f17d7..098962a 100644
--- a/threema-connector-demo/config/variables.yaml
+++ b/threema-connector-demo/config/variables.yaml
@@ -1,4 +1,4 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
 Variables:
-   
 
-   
\ No newline at end of file
+
diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json b/threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json
new file mode 100644
index 0000000..7e0f21a
--- /dev/null
+++ b/threema-connector-demo/dataclasses/threema/connector/demo/Data.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Data",
+  "namespace" : "threema.connector.demo",
+  "isBusinessCaseData" : false
+}
\ No newline at end of file
diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass b/threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass
deleted file mode 100644
index 69ce4a5..0000000
--- a/threema-connector-demo/dataclasses/threema/connector/demo/Data.ivyClass
+++ /dev/null
@@ -1,2 +0,0 @@
-Data #class
-threema.connector.demo #namespace
diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json b/threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json
new file mode 100644
index 0000000..2fee1a1
--- /dev/null
+++ b/threema-connector-demo/dataclasses/threema/connector/demo/Status.d.json
@@ -0,0 +1,15 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Status",
+  "namespace" : "threema.connector.demo",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "recipient",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "status",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass b/threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass
deleted file mode 100644
index ea4d952..0000000
--- a/threema-connector-demo/dataclasses/threema/connector/demo/Status.ivyClass
+++ /dev/null
@@ -1,6 +0,0 @@
-Status #class
-threema.connector.demo #namespace
-recipient String #field
-recipient PERSISTENT #fieldModifier
-status String #field
-status PERSISTENT #fieldModifier
diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json b/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json
new file mode 100644
index 0000000..41b7510
--- /dev/null
+++ b/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.d.json
@@ -0,0 +1,35 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "sendDemoMessageData",
+  "namespace" : "threema.connector.demo",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "receiver",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "plainMessage",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "type",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "apiResponse",
+    "type" : "List<String>",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "publicKey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "privatekey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "sendAnother",
+    "type" : "Boolean",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass b/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass
deleted file mode 100644
index 43c34d8..0000000
--- a/threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass
+++ /dev/null
@@ -1,16 +0,0 @@
-sendDemoMessageData #class
-threema.connector.demo #namespace
-receiver String #field
-receiver PERSISTENT #fieldModifier
-plainMessage String #field
-plainMessage PERSISTENT #fieldModifier
-type String #field
-type PERSISTENT #fieldModifier
-apiResponse List<String> #field
-apiResponse PERSISTENT #fieldModifier
-publicKey String #field
-publicKey PERSISTENT #fieldModifier
-privatekey String #field
-privatekey PERSISTENT #fieldModifier
-sendAnother Boolean #field
-sendAnother PERSISTENT #fieldModifier
diff --git a/threema-connector-demo/pom.xml b/threema-connector-demo/pom.xml
index 0110f20..d1f777a 100644
--- a/threema-connector-demo/pom.xml
+++ b/threema-connector-demo/pom.xml
@@ -1,38 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.connector.threema</groupId>
-  <artifactId>threema-connector-demo</artifactId>
-  <version>10.0.5-SNAPSHOT</version>
-  <packaging>iar</packaging>
-  <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
-  </properties>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <dependencies>
-    <dependency>
-      <groupId>com.axonivy.connector.threema</groupId>
-      <artifactId>threema-connector</artifactId>
-      <version>${project.version}</version>
-      <type>iar</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.axonivy.ivy.ci</groupId>
-        <artifactId>project-build-plugin</artifactId>
-        <version>${project.build.plugin.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.axonivy.connector.threema</groupId>
+	<artifactId>threema-connector-demo</artifactId>
+	<version>12.0.0-SNAPSHOT</version>
+	<packaging>iar</packaging>
+	<properties>
+		<project.build.plugin.version>12.0.0-SNAPSHOT</project.build.plugin.version>
+	</properties>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.axonivy.connector.threema</groupId>
+			<artifactId>threema-connector</artifactId>
+			<version>${project.version}</version>
+			<type>iar</type>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.axonivy.ivy.ci</groupId>
+				<artifactId>project-build-plugin</artifactId>
+				<version>${project.build.plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/threema-connector-demo/processes/ThreemaDemoProcess.p.json b/threema-connector-demo/processes/ThreemaDemoProcess.p.json
index 715015a..6afb48a 100644
--- a/threema-connector-demo/processes/ThreemaDemoProcess.p.json
+++ b/threema-connector-demo/processes/ThreemaDemoProcess.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B8EEA3B9A84FAE",
   "config" : {
     "data" : "threema.connector.demo.sendDemoMessageData"
@@ -9,14 +9,17 @@
       "type" : "RequestStart",
       "name" : "SendMessageToSingleRecipient.ivp",
       "config" : {
-        "callSignature" : "SendMessageToSingleRecipient",
-        "outLink" : "SendMessageToSingleRecipient.ivp",
-        "tags" : "demo"
+        "signature" : "SendMessageToSingleRecipient"
       },
+      "tags" : [
+        "demo"
+      ],
       "visual" : {
         "at" : { "x" : 96, "y" : 168 }
       },
-      "connect" : { "id" : "f19", "to" : "f5" }
+      "connect" : [
+        { "id" : "f19", "to" : "f5" }
+      ]
     }, {
       "id" : "f4",
       "type" : "TaskEnd",
@@ -28,20 +31,8 @@
       "type" : "DialogCall",
       "name" : "singleRecipient",
       "config" : {
-        "dialogId" : "threema.connector.demo.singleRecipient",
-        "startMethod" : "start(threema.connector.demo.sendDemoMessageData)",
-        "output" : {
-          "map" : {
-            "out" : [
-              "in",
-              "result.sendDemoMessageData"
-            ]
-          }
-        },
+        "dialog" : "threema.connector.demo.singleRecipient:start(threema.connector.demo.sendDemoMessageData)",
         "call" : {
-          "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
-          ],
           "map" : {
             "param.sendDemoMessageData" : "in"
           }
@@ -50,45 +41,48 @@
       "visual" : {
         "at" : { "x" : 272, "y" : 168 }
       },
-      "connect" : { "id" : "f11", "to" : "f6" }
+      "connect" : [
+        { "id" : "f11", "to" : "f6" }
+      ]
     }, {
       "id" : "f6",
       "type" : "SubProcessCall",
       "name" : "singleMessage",
       "config" : {
         "processCall" : "singleRecipient:call(String,String,util.LookupType)",
-        "output" : {
-          "map" : {
-            "out" : "in",
-            "out.plainMessage" : "in.plainMessage"
-          },
-          "code" : "out.apiResponse.add(result.apiResponse);"
-        },
         "call" : {
-          "params" : [
-            { "name" : "plainMsg", "type" : "String" },
-            { "name" : "receiverID", "type" : "String" },
-            { "name" : "lookupType", "type" : "util.LookupType" }
-          ],
           "map" : {
             "param.plainMsg" : "in.plainMessage",
             "param.receiverID" : "in.receiver",
             "param.lookupType" : "util.LookupType.getByString(in.type)"
           }
+        },
+        "output" : {
+          "map" : {
+            "out" : "in",
+            "out.plainMessage" : "in.plainMessage"
+          },
+          "code" : "out.apiResponse.add(result.apiResponse);"
         }
       },
       "visual" : {
         "at" : { "x" : 512, "y" : 168 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f18", "to" : "f7" }
+      "connect" : [
+        { "id" : "f18", "to" : "f7" }
+      ]
     }, {
       "id" : "f7",
       "type" : "DialogCall",
       "name" : "ResultPage",
       "config" : {
-        "dialogId" : "threema.connector.demo.ResultPage",
-        "startMethod" : "start(threema.connector.demo.sendDemoMessageData)",
+        "dialog" : "threema.connector.demo.ResultPage:start(threema.connector.demo.sendDemoMessageData)",
+        "call" : {
+          "map" : {
+            "param.sendDemoMessageData" : "in"
+          }
+        },
         "output" : {
           "map" : {
             "out" : "result.sendDemoMessageData",
@@ -96,33 +90,30 @@
             "out.receiver" : "\"\"",
             "out.type" : "\"\""
           }
-        },
-        "call" : {
-          "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
-          ],
-          "map" : {
-            "param.sendDemoMessageData" : "in"
-          }
         }
       },
       "visual" : {
         "at" : { "x" : 688, "y" : 168 }
       },
-      "connect" : { "id" : "f24", "to" : "f23" }
+      "connect" : [
+        { "id" : "f24", "to" : "f23" }
+      ]
     }, {
       "id" : "f8",
       "type" : "RequestStart",
       "name" : "SendMessageToMultipleRecipients.ivp",
       "config" : {
-        "callSignature" : "SendMessageToMultipleRecipients",
-        "outLink" : "SendMessageToMultipleRecipients.ivp",
-        "tags" : "demo"
+        "signature" : "SendMessageToMultipleRecipients"
       },
+      "tags" : [
+        "demo"
+      ],
       "visual" : {
         "at" : { "x" : 96, "y" : 280 }
       },
-      "connect" : { "id" : "f20", "to" : "f10" }
+      "connect" : [
+        { "id" : "f20", "to" : "f10" }
+      ]
     }, {
       "id" : "f9",
       "type" : "TaskEnd",
@@ -134,68 +125,51 @@
       "type" : "DialogCall",
       "name" : "multipleRecipients",
       "config" : {
-        "dialogId" : "threema.connector.demo.multipleRecipients",
-        "startMethod" : "start(threema.connector.demo.sendDemoMessageData)",
-        "output" : {
-          "map" : {
-            "out" : [
-              "in",
-              "result.sendDemoMessageData",
-              "result.sendDemoMessageData"
-            ]
-          }
-        },
-        "call" : {
-          "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
-          ],
-          "map" : {
-            "param.sendDemoMessageData" : [
-              "in",
-              "in"
-            ]
-          }
-        }
+        "dialog" : "threema.connector.demo.multipleRecipients:start(threema.connector.demo.sendDemoMessageData)"
       },
       "visual" : {
         "at" : { "x" : 272, "y" : 280 }
       },
-      "connect" : { "id" : "f15", "to" : "f12" }
+      "connect" : [
+        { "id" : "f15", "to" : "f12" }
+      ]
     }, {
       "id" : "f12",
       "type" : "SubProcessCall",
       "name" : "handleMessage",
       "config" : {
         "processCall" : "multipleRecipients:call(String,List<String>)",
-        "output" : {
-          "map" : {
-            "out" : "in",
-            "out.apiResponse" : "result.apiResponse"
-          }
-        },
         "call" : {
-          "params" : [
-            { "name" : "plainMsg", "type" : "String" },
-            { "name" : "receivers", "type" : "List<String>" }
-          ],
           "map" : {
             "param.plainMsg" : "in.plainMessage",
             "param.receivers" : "in.receiver.split(\"\\n\")"
           }
+        },
+        "output" : {
+          "map" : {
+            "out" : "in",
+            "out.apiResponse" : "result.apiResponse"
+          }
         }
       },
       "visual" : {
         "at" : { "x" : 512, "y" : 280 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f17", "to" : "f13" }
+      "connect" : [
+        { "id" : "f17", "to" : "f13" }
+      ]
     }, {
       "id" : "f13",
       "type" : "DialogCall",
       "name" : "ResultPage",
       "config" : {
-        "dialogId" : "threema.connector.demo.ResultPage",
-        "startMethod" : "start(threema.connector.demo.sendDemoMessageData)",
+        "dialog" : "threema.connector.demo.ResultPage:start(threema.connector.demo.sendDemoMessageData)",
+        "call" : {
+          "map" : {
+            "param.sendDemoMessageData" : "in"
+          }
+        },
         "output" : {
           "map" : {
             "out" : "in",
@@ -203,32 +177,27 @@
             "out.receiver" : "\"\"",
             "out.type" : "\"\""
           }
-        },
-        "call" : {
-          "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
-          ],
-          "map" : {
-            "param.sendDemoMessageData" : "in"
-          }
         }
       },
       "visual" : {
         "at" : { "x" : 688, "y" : 280 }
       },
-      "connect" : { "id" : "f27", "to" : "f14" }
+      "connect" : [
+        { "id" : "f27", "to" : "f14" }
+      ]
     }, {
       "id" : "f0",
       "type" : "RequestStart",
       "name" : "GenerateKeyPair.ivp",
       "config" : {
-        "callSignature" : "GenerateKeyPair",
-        "outLink" : "GenerateKeyPair.ivp"
+        "signature" : "GenerateKeyPair"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 368 }
       },
-      "connect" : { "id" : "f22", "to" : "f2" }
+      "connect" : [
+        { "id" : "f22", "to" : "f2" }
+      ]
     }, {
       "id" : "f1",
       "type" : "TaskEnd",
@@ -255,53 +224,50 @@
       "visual" : {
         "at" : { "x" : 272, "y" : 368 }
       },
-      "connect" : { "id" : "f26", "to" : "f25" }
+      "connect" : [
+        { "id" : "f26", "to" : "f25" }
+      ]
     }, {
       "id" : "f25",
       "type" : "DialogCall",
       "name" : "KeyPair",
       "config" : {
-        "dialogId" : "threema.connector.demo.KeyPair",
-        "startMethod" : "start(String,String)",
-        "call" : {
-          "params" : [
-            { "name" : "publicKey", "type" : "String" },
-            { "name" : "privatekey", "type" : "String" }
-          ],
-          "map" : {
-            "param.publicKey" : [
-              "in.publicKey",
-              "in.publicKey"
-            ],
-            "param.privatekey" : [
-              "in.privatekey",
-              "in.privatekey"
-            ]
-          }
-        }
+        "dialog" : "threema.connector.demo.KeyPair:start(String,String)"
       },
       "visual" : {
         "at" : { "x" : 520, "y" : 368 }
       },
-      "connect" : { "id" : "f21", "to" : "f1" }
+      "connect" : [
+        { "id" : "f21", "to" : "f1" }
+      ]
     }, {
       "id" : "f23",
       "type" : "Alternative",
+      "config" : {
+        "conditions" : {
+          "f16" : "in.sendAnother"
+        }
+      },
       "visual" : {
         "at" : { "x" : 840, "y" : 168 }
       },
       "connect" : [
-        { "id" : "f16", "to" : "f5", "via" : [ { "x" : 840, "y" : 104 }, { "x" : 272, "y" : 104 } ], "condition" : "in.sendAnother" },
+        { "id" : "f16", "to" : "f5", "via" : [ { "x" : 840, "y" : 104 }, { "x" : 272, "y" : 104 } ] },
         { "id" : "f29", "to" : "f4" }
       ]
     }, {
       "id" : "f14",
       "type" : "Alternative",
+      "config" : {
+        "conditions" : {
+          "f31" : "in.sendAnother"
+        }
+      },
       "visual" : {
         "at" : { "x" : 840, "y" : 280 }
       },
       "connect" : [
-        { "id" : "f31", "to" : "f10", "via" : [ { "x" : 840, "y" : 216 }, { "x" : 272, "y" : 216 } ], "condition" : "in.sendAnother" },
+        { "id" : "f31", "to" : "f10", "via" : [ { "x" : 840, "y" : 216 }, { "x" : 272, "y" : 216 } ] },
         { "id" : "f30", "to" : "f9" }
       ]
     } ]
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor
deleted file mode 100644
index ae605f0..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.rddescriptor
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<richDialogDescriptor>
-    <property>
-        <name>viewTechnology</name>
-        <value>JSF</value>
-    </property>
-</richDialogDescriptor>
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json
new file mode 100644
index 0000000..a2f371e
--- /dev/null
+++ b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.d.json
@@ -0,0 +1,15 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "KeyPairData",
+  "namespace" : "threema.connector.demo.KeyPair",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "publicKey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "privatekey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass
deleted file mode 100644
index 2ee413c..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairData.ivyClass
+++ /dev/null
@@ -1,6 +0,0 @@
-KeyPairData #class
-threema.connector.demo.KeyPair #namespace
-publicKey String #field
-publicKey PERSISTENT #fieldModifier
-privatekey String #field
-privatekey PERSISTENT #fieldModifier
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json
index e08a9c5..b0b9655 100644
--- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json
+++ b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B902D7EEB4DF97",
   "kind" : "HTML_DIALOG",
   "config" : {
@@ -10,11 +10,11 @@
       "type" : "HtmlDialogStart",
       "name" : "start(String,String)",
       "config" : {
-        "callSignature" : "start",
+        "signature" : "start",
         "input" : {
           "params" : [
-            { "name" : "publicKey", "type" : "String" },
-            { "name" : "privatekey", "type" : "String" }
+            { "name" : "publicKey", "type" : "String", "desc" : "" },
+            { "name" : "privatekey", "type" : "String", "desc" : "" }
           ],
           "map" : {
             "out.publicKey" : "param.publicKey",
@@ -26,7 +26,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     }, {
       "id" : "f1",
       "type" : "HtmlDialogEnd",
@@ -43,7 +45,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 160 }
       },
-      "connect" : { "id" : "f5", "to" : "f4" }
+      "connect" : [
+        { "id" : "f5", "to" : "f4" }
+      ]
     }, {
       "id" : "f4",
       "type" : "HtmlDialogExit",
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor
deleted file mode 100644
index ae605f0..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPage.rddescriptor
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<richDialogDescriptor>
-    <property>
-        <name>viewTechnology</name>
-        <value>JSF</value>
-    </property>
-</richDialogDescriptor>
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json
new file mode 100644
index 0000000..4317031
--- /dev/null
+++ b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.d.json
@@ -0,0 +1,15 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "ResultPageData",
+  "namespace" : "threema.connector.demo.ResultPage",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "sendDemoMessageData",
+    "type" : "threema.connector.demo.sendDemoMessageData",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "statusData",
+    "type" : "List<threema.connector.demo.Status>",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass
deleted file mode 100644
index 26676ce..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageData.ivyClass
+++ /dev/null
@@ -1,6 +0,0 @@
-ResultPageData #class
-threema.connector.demo.ResultPage #namespace
-sendDemoMessageData threema.connector.demo.sendDemoMessageData #field
-sendDemoMessageData PERSISTENT #fieldModifier
-statusData List<threema.connector.demo.Status> #field
-statusData PERSISTENT #fieldModifier
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json
index 1a3cf61..ea4f8c8 100644
--- a/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json
+++ b/threema-connector-demo/src_hd/threema/connector/demo/ResultPage/ResultPageProcess.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B23815CA49935E",
   "kind" : "HTML_DIALOG",
   "config" : {
@@ -10,21 +10,21 @@
       "type" : "HtmlDialogStart",
       "name" : "start(sendDemoMessageData)",
       "config" : {
-        "callSignature" : "start",
-        "result" : {
+        "signature" : "start",
+        "input" : {
           "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
+            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" }
           ],
           "map" : {
-            "result.sendDemoMessageData" : "in.sendDemoMessageData"
+            "out.sendDemoMessageData" : "param.sendDemoMessageData"
           }
         },
-        "input" : {
+        "result" : {
           "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
+            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" }
           ],
           "map" : {
-            "out.sendDemoMessageData" : "param.sendDemoMessageData"
+            "result.sendDemoMessageData" : "in.sendDemoMessageData"
           }
         },
         "guid" : "18B23815CA5CE936"
@@ -32,7 +32,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f6", "to" : "f2" }
+      "connect" : [
+        { "id" : "f6", "to" : "f2" }
+      ]
     }, {
       "id" : "f1",
       "type" : "HtmlDialogEnd",
@@ -55,7 +57,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 160 }
       },
-      "connect" : { "id" : "f5", "to" : "f4" }
+      "connect" : [
+        { "id" : "f5", "to" : "f4" }
+      ]
     }, {
       "id" : "f4",
       "type" : "HtmlDialogExit",
@@ -85,7 +89,9 @@
       "visual" : {
         "at" : { "x" : 208, "y" : 64 }
       },
-      "connect" : { "id" : "f7", "to" : "f1" }
+      "connect" : [
+        { "id" : "f7", "to" : "f1" }
+      ]
     }, {
       "id" : "f8",
       "type" : "HtmlDialogEventStart",
@@ -102,6 +108,8 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 224 }
       },
-      "connect" : { "id" : "f9", "to" : "f4" }
+      "connect" : [
+        { "id" : "f9", "to" : "f4" }
+      ]
     } ]
 }
\ No newline at end of file
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor
deleted file mode 100644
index ae605f0..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipients.rddescriptor
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<richDialogDescriptor>
-    <property>
-        <name>viewTechnology</name>
-        <value>JSF</value>
-    </property>
-</richDialogDescriptor>
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json
new file mode 100644
index 0000000..f601407
--- /dev/null
+++ b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.d.json
@@ -0,0 +1,11 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "multipleRecipientsData",
+  "namespace" : "threema.connector.demo.multipleRecipients",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "sendDemoMessageData",
+    "type" : "threema.connector.demo.sendDemoMessageData",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass
deleted file mode 100644
index ab92c58..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsData.ivyClass
+++ /dev/null
@@ -1,4 +0,0 @@
-multipleRecipientsData #class
-threema.connector.demo.multipleRecipients #namespace
-sendDemoMessageData threema.connector.demo.sendDemoMessageData #field
-sendDemoMessageData PERSISTENT #fieldModifier
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json
index 246dd30..1267f03 100644
--- a/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json
+++ b/threema-connector-demo/src_hd/threema/connector/demo/multipleRecipients/multipleRecipientsProcess.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B23798EF7AA160",
   "kind" : "HTML_DIALOG",
   "config" : {
@@ -10,21 +10,21 @@
       "type" : "HtmlDialogStart",
       "name" : "start(sendDemoMessageData)",
       "config" : {
-        "callSignature" : "start",
-        "result" : {
+        "signature" : "start",
+        "input" : {
           "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
+            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" }
           ],
           "map" : {
-            "result.sendDemoMessageData" : "in.sendDemoMessageData"
+            "out.sendDemoMessageData" : "param.sendDemoMessageData"
           }
         },
-        "input" : {
+        "result" : {
           "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
+            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" }
           ],
           "map" : {
-            "out.sendDemoMessageData" : "param.sendDemoMessageData"
+            "result.sendDemoMessageData" : "in.sendDemoMessageData"
           }
         },
         "guid" : "18B23798EF997276"
@@ -32,7 +32,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     }, {
       "id" : "f1",
       "type" : "HtmlDialogEnd",
@@ -49,7 +51,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 160 }
       },
-      "connect" : { "id" : "f5", "to" : "f4" }
+      "connect" : [
+        { "id" : "f5", "to" : "f4" }
+      ]
     }, {
       "id" : "f4",
       "type" : "HtmlDialogExit",
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor
deleted file mode 100644
index ae605f0..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipient.rddescriptor
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<richDialogDescriptor>
-    <property>
-        <name>viewTechnology</name>
-        <value>JSF</value>
-    </property>
-</richDialogDescriptor>
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json
new file mode 100644
index 0000000..1d14cfc
--- /dev/null
+++ b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.d.json
@@ -0,0 +1,11 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "singleRecipientData",
+  "namespace" : "threema.connector.demo.singleRecipient",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "sendDemoMessageData",
+    "type" : "threema.connector.demo.sendDemoMessageData",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass
deleted file mode 100644
index 55cea03..0000000
--- a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientData.ivyClass
+++ /dev/null
@@ -1,4 +0,0 @@
-singleRecipientData #class
-threema.connector.demo.singleRecipient #namespace
-sendDemoMessageData threema.connector.demo.sendDemoMessageData #field
-sendDemoMessageData PERSISTENT #fieldModifier
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json
index 02b40b9..dcc9791 100644
--- a/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json
+++ b/threema-connector-demo/src_hd/threema/connector/demo/singleRecipient/singleRecipientProcess.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B22F7818988EDB",
   "kind" : "HTML_DIALOG",
   "config" : {
@@ -10,21 +10,21 @@
       "type" : "HtmlDialogStart",
       "name" : "start(sendDemoMessageData)",
       "config" : {
-        "callSignature" : "start",
-        "result" : {
+        "signature" : "start",
+        "input" : {
           "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
+            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" }
           ],
           "map" : {
-            "result.sendDemoMessageData" : "in.sendDemoMessageData"
+            "out.sendDemoMessageData" : "param.sendDemoMessageData"
           }
         },
-        "input" : {
+        "result" : {
           "params" : [
-            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData" }
+            { "name" : "sendDemoMessageData", "type" : "threema.connector.demo.sendDemoMessageData", "desc" : "" }
           ],
           "map" : {
-            "out.sendDemoMessageData" : "param.sendDemoMessageData"
+            "result.sendDemoMessageData" : "in.sendDemoMessageData"
           }
         },
         "guid" : "18B22F7818A93A33"
@@ -32,7 +32,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     }, {
       "id" : "f1",
       "type" : "HtmlDialogEnd",
@@ -49,7 +51,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 160 }
       },
-      "connect" : { "id" : "f5", "to" : "f4" }
+      "connect" : [
+        { "id" : "f5", "to" : "f4" }
+      ]
     }, {
       "id" : "f4",
       "type" : "HtmlDialogExit",
diff --git a/threema-connector-demo/webContent/layouts/frame-10.xhtml b/threema-connector-demo/webContent/layouts/frame-10.xhtml
index e0a3f36..82fb330 100644
--- a/threema-connector-demo/webContent/layouts/frame-10.xhtml
+++ b/threema-connector-demo/webContent/layouts/frame-10.xhtml
@@ -33,7 +33,7 @@ and refence it below in the head part.
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}"
     library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" /> 
diff --git a/threema-connector-product/pom.xml b/threema-connector-product/pom.xml
index cdea98d..15fa8c2 100644
--- a/threema-connector-product/pom.xml
+++ b/threema-connector-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.threema</groupId>
   <artifactId>threema-connector-product</artifactId>
-  <version>10.0.5-SNAPSHOT</version>
+  <version>12.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/threema-connector-test/.project b/threema-connector-test/.project
index 7068587..886f96c 100644
--- a/threema-connector-test/.project
+++ b/threema-connector-test/.project
@@ -1,49 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>threema-connector-test</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-  </natures>
-</projectDescription>
+	<name>threema-connector-test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
\ No newline at end of file
diff --git a/threema-connector-test/.settings/.jsdtscope b/threema-connector-test/.settings/.jsdtscope
deleted file mode 100644
index e4ab59a..0000000
--- a/threema-connector-test/.settings/.jsdtscope
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry
-    excluding="**/bower_components/*|**/node_modules/*|**/*.min.js"
-    kind="src" path="webContent" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.WebProject">
-    <attributes>
-      <attribute name="hide" value="true" />
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
-  <classpathentry kind="output" path="" />
-</classpath>
diff --git a/threema-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/threema-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
index c370ccd..1d159b3 100644
--- a/threema-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/threema-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=threema.connector.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=threema.connector.test
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1
diff --git a/threema-connector-test/.settings/org.eclipse.jdt.core.prefs b/threema-connector-test/.settings/org.eclipse.jdt.core.prefs
index d4540a5..3a79233 100644
--- a/threema-connector-test/.settings/org.eclipse.jdt.core.prefs
+++ b/threema-connector-test/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/threema-connector-test/.settings/org.eclipse.wst.common.component b/threema-connector-test/.settings/org.eclipse.wst.common.component
index dec10f3..c6fc719 100644
--- a/threema-connector-test/.settings/org.eclipse.wst.common.component
+++ b/threema-connector-test/.settings/org.eclipse.wst.common.component
@@ -15,4 +15,4 @@
     <property name="java-output-path"
       value="/threema-connector-test/target/classes" />
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/threema-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml b/threema-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3bb273d..ac11c9f 100644
--- a/threema-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/threema-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web" />
-  <installed facet="java" version="17" />
+  <installed facet="java" version="21" />
   <installed facet="jst.web" version="3.0" />
-  <installed facet="wst.jsdt.web" version="1.0" />
   <installed facet="jst.jsf" version="2.1" />
-</faceted-project>
+</faceted-project>
\ No newline at end of file
diff --git a/threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/threema-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/threema-connector-test/config/variables.yaml b/threema-connector-test/config/variables.yaml
index e24d46a..c0af14b 100644
--- a/threema-connector-test/config/variables.yaml
+++ b/threema-connector-test/config/variables.yaml
@@ -1,3 +1,3 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
 Variables:
 
-   
\ No newline at end of file
diff --git a/threema-connector-test/dataclasses/threema/connector/test/Data.d.json b/threema-connector-test/dataclasses/threema/connector/test/Data.d.json
new file mode 100644
index 0000000..cb69b12
--- /dev/null
+++ b/threema-connector-test/dataclasses/threema/connector/test/Data.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Data",
+  "namespace" : "threema.connector.test",
+  "isBusinessCaseData" : false
+}
\ No newline at end of file
diff --git a/threema-connector-test/dataclasses/threema/connector/test/Data.ivyClass b/threema-connector-test/dataclasses/threema/connector/test/Data.ivyClass
deleted file mode 100644
index de785c2..0000000
--- a/threema-connector-test/dataclasses/threema/connector/test/Data.ivyClass
+++ /dev/null
@@ -1,2 +0,0 @@
-Data #class
-threema.connector.test #namespace
diff --git a/threema-connector-test/pom.xml b/threema-connector-test/pom.xml
index 145b57b..db84986 100644
--- a/threema-connector-test/pom.xml
+++ b/threema-connector-test/pom.xml
@@ -1,66 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.connector.threema</groupId>
-  <artifactId>threema-connector-test</artifactId>
-  <version>10.0.5-SNAPSHOT</version>
-  <packaging>iar</packaging>
-  <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
-    <tester.version>10.0.16</tester.version>
-  </properties>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>com.axonivy.connector.threema</groupId>
-      <artifactId>threema-connector</artifactId>
-      <version>${project.version}</version>
-      <type>iar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.axonivy.ivy.test</groupId>
-      <artifactId>unit-tester</artifactId>
-      <version>${tester.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <testSourceDirectory>src_test</testSourceDirectory>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.0.0-M1</version>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>com.axonivy.ivy.ci</groupId>
-        <artifactId>project-build-plugin</artifactId>
-        <version>${project.build.plugin.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.axonivy.connector.threema</groupId>
+	<artifactId>threema-connector-test</artifactId>
+	<version>12.0.0-SNAPSHOT</version>
+	<packaging>iar</packaging>
+	<properties>
+		<project.build.plugin.version>12.0.0</project.build.plugin.version>
+		<tester.version>12.0.0</tester.version>
+	</properties>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<repositories>
+		<repository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.axonivy.connector.threema</groupId>
+			<artifactId>threema-connector</artifactId>
+			<version>${project.version}</version>
+			<type>iar</type>
+		</dependency>
+		<dependency>
+			<groupId>com.axonivy.ivy.test</groupId>
+			<artifactId>unit-tester</artifactId>
+			<version>${tester.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<testSourceDirectory>src_test</testSourceDirectory>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.0.0-M1</version>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>com.axonivy.ivy.ci</groupId>
+				<artifactId>project-build-plugin</artifactId>
+				<version>${project.build.plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/threema-connector-webtest/.project b/threema-connector-webtest/.project
index d8bca7c..3a1d0a7 100644
--- a/threema-connector-webtest/.project
+++ b/threema-connector-webtest/.project
@@ -1,49 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>threema-connector-webtest</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-  </natures>
-</projectDescription>
+	<name>threema-connector-webtest</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
\ No newline at end of file
diff --git a/threema-connector-webtest/.settings/.jsdtscope b/threema-connector-webtest/.settings/.jsdtscope
deleted file mode 100644
index e4ab59a..0000000
--- a/threema-connector-webtest/.settings/.jsdtscope
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry
-    excluding="**/bower_components/*|**/node_modules/*|**/*.min.js"
-    kind="src" path="webContent" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.WebProject">
-    <attributes>
-      <attribute name="hide" value="true" />
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
-  <classpathentry kind="output" path="" />
-</classpath>
diff --git a/threema-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs b/threema-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs
index 822cc6b..4b2ba6a 100644
--- a/threema-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/threema-connector-webtest/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=threema.connector.webtest.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=threema.connector.webtest
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1
diff --git a/threema-connector-webtest/.settings/org.eclipse.jdt.core.prefs b/threema-connector-webtest/.settings/org.eclipse.jdt.core.prefs
index d4540a5..3a79233 100644
--- a/threema-connector-webtest/.settings/org.eclipse.jdt.core.prefs
+++ b/threema-connector-webtest/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/threema-connector-webtest/.settings/org.eclipse.wst.common.component b/threema-connector-webtest/.settings/org.eclipse.wst.common.component
index 294e9ee..f2f9dd6 100644
--- a/threema-connector-webtest/.settings/org.eclipse.wst.common.component
+++ b/threema-connector-webtest/.settings/org.eclipse.wst.common.component
@@ -7,7 +7,6 @@
     <wb-resource deploy-path="/WEB-INF/classes"
       source-path="/src" />
     <wb-resource deploy-path="/WEB-INF/classes"
-      source-path="/src_hd" />
     <wb-resource deploy-path="/WEB-INF/classes"
       source-path="/src_wsproc" />
     <wb-resource deploy-path="/WEB-INF/classes"
@@ -17,4 +16,4 @@
     <property name="java-output-path"
       value="/threema-connector-webtest/target/classes" />
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/threema-connector-webtest/.settings/org.eclipse.wst.common.project.facet.core.xml b/threema-connector-webtest/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3bb273d..ac11c9f 100644
--- a/threema-connector-webtest/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/threema-connector-webtest/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web" />
-  <installed facet="java" version="17" />
+  <installed facet="java" version="21" />
   <installed facet="jst.web" version="3.0" />
-  <installed facet="wst.jsdt.web" version="1.0" />
   <installed facet="jst.jsf" version="2.1" />
-</faceted-project>
+</faceted-project>
\ No newline at end of file
diff --git a/threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.container b/threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.name b/threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/threema-connector-webtest/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/threema-connector-webtest/config/variables.yaml b/threema-connector-webtest/config/variables.yaml
index 64c8fa0..4448394 100644
--- a/threema-connector-webtest/config/variables.yaml
+++ b/threema-connector-webtest/config/variables.yaml
@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
 # == Variables ==
 # 
 # You can define here your project Variables.
diff --git a/threema-connector-webtest/dataclasses/threema/connector/webtest/Data.d.json b/threema-connector-webtest/dataclasses/threema/connector/webtest/Data.d.json
new file mode 100644
index 0000000..a9f46f1
--- /dev/null
+++ b/threema-connector-webtest/dataclasses/threema/connector/webtest/Data.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Data",
+  "namespace" : "threema.connector.webtest",
+  "isBusinessCaseData" : false
+}
\ No newline at end of file
diff --git a/threema-connector-webtest/dataclasses/threema/connector/webtest/Data.ivyClass b/threema-connector-webtest/dataclasses/threema/connector/webtest/Data.ivyClass
deleted file mode 100644
index 34a701a..0000000
--- a/threema-connector-webtest/dataclasses/threema/connector/webtest/Data.ivyClass
+++ /dev/null
@@ -1,2 +0,0 @@
-Data #class
-threema.connector.webtest #namespace
diff --git a/threema-connector-webtest/pom.xml b/threema-connector-webtest/pom.xml
index f213b73..9852493 100644
--- a/threema-connector-webtest/pom.xml
+++ b/threema-connector-webtest/pom.xml
@@ -1,61 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.connector.threema</groupId>
-  <artifactId>threema-connector-webtest</artifactId>
-  <version>10.0.5-SNAPSHOT</version>
-  <packaging>iar-integration-test</packaging>
-  <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
-    <tester.version>10.0.16</tester.version>
-  </properties>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>com.axonivy.connector.threema</groupId>
-      <artifactId>threema-connector-demo</artifactId>
-      <version>${project.version}</version>
-      <type>iar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.axonivy.connector.threema</groupId>
-      <artifactId>threema-connector-test</artifactId>
-      <version>${project.version}</version>
-      <type>iar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.axonivy.ivy.webtest</groupId>
-      <artifactId>web-tester</artifactId>
-      <version>${tester.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <testSourceDirectory>src_test</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>com.axonivy.ivy.ci</groupId>
-        <artifactId>project-build-plugin</artifactId>
-        <version>${project.build.plugin.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.axonivy.connector.threema</groupId>
+	<artifactId>threema-connector-webtest</artifactId>
+	<version>12.0.0-SNAPSHOT</version>
+	<packaging>iar-integration-test</packaging>
+	<properties>
+		<project.build.plugin.version>12.0.0</project.build.plugin.version>
+		<tester.version>12.0.0</tester.version>
+	</properties>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<repositories>
+		<repository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.axonivy.connector.threema</groupId>
+			<artifactId>threema-connector-demo</artifactId>
+			<version>${project.version}</version>
+			<type>iar</type>
+		</dependency>
+		<dependency>
+			<groupId>com.axonivy.connector.threema</groupId>
+			<artifactId>threema-connector-test</artifactId>
+			<version>${project.version}</version>
+			<type>iar</type>
+		</dependency>
+		<dependency>
+			<groupId>com.axonivy.ivy.webtest</groupId>
+			<artifactId>web-tester</artifactId>
+			<version>${tester.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<testSourceDirectory>src_test</testSourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>com.axonivy.ivy.ci</groupId>
+				<artifactId>project-build-plugin</artifactId>
+				<version>${project.build.plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/threema-connector/.project b/threema-connector/.project
index fd84dab..12509d0 100644
--- a/threema-connector/.project
+++ b/threema-connector/.project
@@ -1,49 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>threema-connector</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-  </natures>
-</projectDescription>
+	<name>threema-connector</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
\ No newline at end of file
diff --git a/threema-connector/.settings/.jsdtscope b/threema-connector/.settings/.jsdtscope
deleted file mode 100644
index e4ab59a..0000000
--- a/threema-connector/.settings/.jsdtscope
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry
-    excluding="**/bower_components/*|**/node_modules/*|**/*.min.js"
-    kind="src" path="webContent" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.WebProject">
-    <attributes>
-      <attribute name="hide" value="true" />
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="con"
-    path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
-  <classpathentry kind="output" path="" />
-</classpath>
diff --git a/threema-connector/.settings/ch.ivyteam.ivy.designer.prefs b/threema-connector/.settings/ch.ivyteam.ivy.designer.prefs
index 99bffe8..c761a75 100644
--- a/threema-connector/.settings/ch.ivyteam.ivy.designer.prefs
+++ b/threema-connector/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=threema.connector.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=threema.connector
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1
diff --git a/threema-connector/.settings/org.eclipse.jdt.core.prefs b/threema-connector/.settings/org.eclipse.jdt.core.prefs
index d4540a5..3a79233 100644
--- a/threema-connector/.settings/org.eclipse.jdt.core.prefs
+++ b/threema-connector/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/threema-connector/.settings/org.eclipse.wst.common.component b/threema-connector/.settings/org.eclipse.wst.common.component
index e3fa242..369a88c 100644
--- a/threema-connector/.settings/org.eclipse.wst.common.component
+++ b/threema-connector/.settings/org.eclipse.wst.common.component
@@ -14,4 +14,4 @@
     <property name="java-output-path"
       value="/threema-connector/target/classes" />
   </wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file
diff --git a/threema-connector/.settings/org.eclipse.wst.common.project.facet.core.xml b/threema-connector/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3bb273d..ac11c9f 100644
--- a/threema-connector/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/threema-connector/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web" />
-  <installed facet="java" version="17" />
+  <installed facet="java" version="21" />
   <installed facet="jst.web" version="3.0" />
-  <installed facet="wst.jsdt.web" version="1.0" />
   <installed facet="jst.jsf" version="2.1" />
-</faceted-project>
+</faceted-project>
\ No newline at end of file
diff --git a/threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container b/threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name b/threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/threema-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/threema-connector/config/variables.yaml b/threema-connector/config/variables.yaml
index e4fd1d0..4249348 100644
--- a/threema-connector/config/variables.yaml
+++ b/threema-connector/config/variables.yaml
@@ -1,6 +1,7 @@
+# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
 Variables:
   threemaConnector:
-   
+    
     # Your Threema.Gateway ID 
     threemaId: ''
     
diff --git a/threema-connector/dataclasses/threema/connector/Data.d.json b/threema-connector/dataclasses/threema/connector/Data.d.json
new file mode 100644
index 0000000..6de6d58
--- /dev/null
+++ b/threema-connector/dataclasses/threema/connector/Data.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Data",
+  "namespace" : "threema.connector",
+  "isBusinessCaseData" : false
+}
\ No newline at end of file
diff --git a/threema-connector/dataclasses/threema/connector/Data.ivyClass b/threema-connector/dataclasses/threema/connector/Data.ivyClass
deleted file mode 100644
index d6fb40b..0000000
--- a/threema-connector/dataclasses/threema/connector/Data.ivyClass
+++ /dev/null
@@ -1,2 +0,0 @@
-Data #class
-threema.connector #namespace
diff --git a/threema-connector/dataclasses/threema/connector/ReceiverData.d.json b/threema-connector/dataclasses/threema/connector/ReceiverData.d.json
new file mode 100644
index 0000000..309d5ec
--- /dev/null
+++ b/threema-connector/dataclasses/threema/connector/ReceiverData.d.json
@@ -0,0 +1,43 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "ReceiverData",
+  "namespace" : "threema.connector",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "identifier",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "threemaId",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "type",
+    "type" : "util.LookupType",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "publicKey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "nonce",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "encryptedMessage",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "plainMessage",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "messageJson",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "apiResponse",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector/dataclasses/threema/connector/ReceiverData.ivyClass b/threema-connector/dataclasses/threema/connector/ReceiverData.ivyClass
deleted file mode 100644
index a03b5eb..0000000
--- a/threema-connector/dataclasses/threema/connector/ReceiverData.ivyClass
+++ /dev/null
@@ -1,20 +0,0 @@
-ReceiverData #class
-threema.connector #namespace
-identifier String #field
-identifier PERSISTENT #fieldModifier
-threemaId String #field
-threemaId PERSISTENT #fieldModifier
-type util.LookupType #field
-type PERSISTENT #fieldModifier
-publicKey String #field
-publicKey PERSISTENT #fieldModifier
-nonce String #field
-nonce PERSISTENT #fieldModifier
-encryptedMessage String #field
-encryptedMessage PERSISTENT #fieldModifier
-plainMessage String #field
-plainMessage PERSISTENT #fieldModifier
-messageJson String #field
-messageJson PERSISTENT #fieldModifier
-apiResponse String #field
-apiResponse PERSISTENT #fieldModifier
diff --git a/threema-connector/dataclasses/threema/connector/SendThreemaMessageData.d.json b/threema-connector/dataclasses/threema/connector/SendThreemaMessageData.d.json
new file mode 100644
index 0000000..528efd3
--- /dev/null
+++ b/threema-connector/dataclasses/threema/connector/SendThreemaMessageData.d.json
@@ -0,0 +1,27 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "SendThreemaMessageData",
+  "namespace" : "threema.connector",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "receiver",
+    "type" : "List<String>",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "plainMessage",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "receiverData",
+    "type" : "List<threema.connector.ReceiverData>",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "sendCount",
+    "type" : "Number",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "apiResponses",
+    "type" : "List<String>",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector/dataclasses/threema/connector/SendThreemaMessageData.ivyClass b/threema-connector/dataclasses/threema/connector/SendThreemaMessageData.ivyClass
deleted file mode 100644
index 7ffa4ff..0000000
--- a/threema-connector/dataclasses/threema/connector/SendThreemaMessageData.ivyClass
+++ /dev/null
@@ -1,12 +0,0 @@
-SendThreemaMessageData #class
-threema.connector #namespace
-receiver List<String> #field
-receiver PERSISTENT #fieldModifier
-plainMessage String #field
-plainMessage PERSISTENT #fieldModifier
-receiverData List<threema.connector.ReceiverData> #field
-receiverData PERSISTENT #fieldModifier
-sendCount Number #field
-sendCount PERSISTENT #fieldModifier
-apiResponses List<String> #field
-apiResponses PERSISTENT #fieldModifier
diff --git a/threema-connector/dataclasses/threema/connector/createKeyPairData.d.json b/threema-connector/dataclasses/threema/connector/createKeyPairData.d.json
new file mode 100644
index 0000000..5e741f3
--- /dev/null
+++ b/threema-connector/dataclasses/threema/connector/createKeyPairData.d.json
@@ -0,0 +1,15 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "createKeyPairData",
+  "namespace" : "threema.connector",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "privateKey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "publicKey",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
\ No newline at end of file
diff --git a/threema-connector/dataclasses/threema/connector/createKeyPairData.ivyClass b/threema-connector/dataclasses/threema/connector/createKeyPairData.ivyClass
deleted file mode 100644
index 5e2b755..0000000
--- a/threema-connector/dataclasses/threema/connector/createKeyPairData.ivyClass
+++ /dev/null
@@ -1,6 +0,0 @@
-createKeyPairData #class
-threema.connector #namespace
-privateKey String #field
-privateKey PERSISTENT #fieldModifier
-publicKey String #field
-publicKey PERSISTENT #fieldModifier
diff --git a/threema-connector/pom.xml b/threema-connector/pom.xml
index d8606e3..92133b3 100644
--- a/threema-connector/pom.xml
+++ b/threema-connector/pom.xml
@@ -1,54 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.axonivy.connector.threema</groupId>
-  <artifactId>threema-connector</artifactId>
-  <version>10.0.5-SNAPSHOT</version>
-  <packaging>iar</packaging>
-  <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
-  </properties>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.axonivy.ivy.ci</groupId>
-        <artifactId>project-build-plugin</artifactId>
-        <version>${project.build.plugin.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-       <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>3.1.0</version>
-            <executions>
-                <execution>
-                    <id>download-threema-msgapi-tool</id>
-                    <phase>validate</phase>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                    <configuration>
-                        <target>
-                        	  <mkdir dir="${project.basedir}/lib" />
-                            <get src="https://gateway.threema.ch/sdk/threema-msgapi-sdk-java-2.1.0.zip" dest="${project.basedir}/lib/threema-msgapi-tool.zip" />
-                            <unzip src="${project.basedir}/lib/threema-msgapi-tool.zip" dest="${project.basedir}/lib" overwrite="false">
-                                <patternset includes="threema-msgapi-tool.jar" />
-                            </unzip>     
-                            <delete file="${project.basedir}/lib/threema-msgapi-tool.zip" />                            
-                        </target>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.axonivy.connector.threema</groupId>
+	<artifactId>threema-connector</artifactId>
+	<version>12.0.0-SNAPSHOT</version>
+	<packaging>iar</packaging>
+	<properties>
+		<project.build.plugin.version>12.0.0</project.build.plugin.version>
+	</properties>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>sonatype</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.axonivy.ivy.ci</groupId>
+				<artifactId>project-build-plugin</artifactId>
+				<version>${project.build.plugin.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>download-threema-msgapi-tool</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<mkdir dir="${project.basedir}/lib" />
+								<get
+									src="https://gateway.threema.ch/sdk/threema-msgapi-sdk-java-2.1.0.zip"
+									dest="${project.basedir}/lib/threema-msgapi-tool.zip" />
+								<unzip
+									src="${project.basedir}/lib/threema-msgapi-tool.zip"
+									dest="${project.basedir}/lib"
+									overwrite="false">
+									<patternset
+										includes="threema-msgapi-tool.jar" />
+								</unzip>
+								<delete
+									file="${project.basedir}/lib/threema-msgapi-tool.zip" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/threema-connector/processes/multipleRecipients.p.json b/threema-connector/processes/multipleRecipients.p.json
index 5714346..c987632 100644
--- a/threema-connector/processes/multipleRecipients.p.json
+++ b/threema-connector/processes/multipleRecipients.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B22DA4C8AA09A2",
   "kind" : "CALLABLE_SUB",
   "config" : {
@@ -10,11 +10,11 @@
       "type" : "CallSubStart",
       "name" : "call(String,List<String>)",
       "config" : {
-        "callSignature" : "call",
+        "signature" : "call",
         "input" : {
           "params" : [
-            { "name" : "plainMsg", "type" : "String" },
-            { "name" : "receivers", "type" : "List<String>" }
+            { "name" : "plainMsg", "type" : "String", "desc" : "" },
+            { "name" : "receivers", "type" : "List<String>", "desc" : "" }
           ],
           "map" : {
             "out.plainMessage" : "param.plainMsg",
@@ -23,14 +23,16 @@
         },
         "result" : {
           "params" : [
-            { "name" : "apiResponse", "type" : "List<String>" }
+            { "name" : "apiResponse", "type" : "List<String>", "desc" : "" }
           ],
           "map" : {
             "result.apiResponse" : "in.apiResponses"
           }
-        },
-        "tags" : "connector"
+        }
       },
+      "tags" : [
+        "connector"
+      ],
       "visual" : {
         "at" : { "x" : 96, "y" : 64 },
         "description" : [
@@ -39,7 +41,9 @@
         ],
         "icon" : "res:/webContent/icons/threema-icon_black.png?small"
       },
-      "connect" : { "id" : "f3", "to" : "f2" }
+      "connect" : [
+        { "id" : "f3", "to" : "f2" }
+      ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
@@ -80,16 +84,23 @@
         "at" : { "x" : 288, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f4", "to" : "f6" }
+      "connect" : [
+        { "id" : "f4", "to" : "f6" }
+      ]
     }, {
       "id" : "f6",
       "type" : "Alternative",
+      "config" : {
+        "conditions" : {
+          "f11" : "in.sendCount < in.receiverData.size()"
+        }
+      },
       "visual" : {
         "at" : { "x" : 432, "y" : 64 },
         "description" : "send messages to each recipient"
       },
       "connect" : [
-        { "id" : "f11", "to" : "f7", "via" : [ { "x" : 528, "y" : 208 } ], "condition" : "in.sendCount < in.receiverData.size()" },
+        { "id" : "f11", "to" : "f7", "via" : [ { "x" : 528, "y" : 208 } ] },
         { "id" : "f10", "to" : "f1" }
       ]
     }, {
@@ -98,30 +109,27 @@
       "name" : "singleRecipient",
       "config" : {
         "processCall" : "singleRecipient:call(String,String,util.LookupType)",
-        "output" : {
-          "map" : {
-            "out" : "in",
-            "out.sendCount" : "in.sendCount + 1"
-          },
-          "code" : "out.apiResponses.add(result.apiResponse);"
-        },
         "call" : {
-          "params" : [
-            { "name" : "plainMsg", "type" : "String" },
-            { "name" : "receiverID", "type" : "String" },
-            { "name" : "lookupType", "type" : "util.LookupType" }
-          ],
           "map" : {
             "param.plainMsg" : "in.plainMessage",
             "param.receiverID" : "in.receiverData.get(in.sendCount).identifier",
             "param.lookupType" : "in.receiverData.get(in.sendCount).type"
           }
+        },
+        "output" : {
+          "map" : {
+            "out" : "in",
+            "out.sendCount" : "in.sendCount + 1"
+          },
+          "code" : "out.apiResponses.add(result.apiResponse);"
         }
       },
       "visual" : {
         "at" : { "x" : 432, "y" : 208 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f5", "to" : "f6", "via" : [ { "x" : 344, "y" : 208 } ] }
+      "connect" : [
+        { "id" : "f5", "to" : "f6", "via" : [ { "x" : 344, "y" : 208 } ] }
+      ]
     } ]
 }
\ No newline at end of file
diff --git a/threema-connector/processes/singleRecipient.p.json b/threema-connector/processes/singleRecipient.p.json
index 544ffa6..89ecf2e 100644
--- a/threema-connector/processes/singleRecipient.p.json
+++ b/threema-connector/processes/singleRecipient.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B22C8212D554A9",
   "kind" : "CALLABLE_SUB",
   "config" : {
@@ -10,12 +10,12 @@
       "type" : "CallSubStart",
       "name" : "call(String,String,LookupType)",
       "config" : {
-        "callSignature" : "call",
+        "signature" : "call",
         "input" : {
           "params" : [
-            { "name" : "plainMsg", "type" : "String" },
-            { "name" : "receiverID", "type" : "String" },
-            { "name" : "lookupType", "type" : "util.LookupType" }
+            { "name" : "plainMsg", "type" : "String", "desc" : "" },
+            { "name" : "receiverID", "type" : "String", "desc" : "" },
+            { "name" : "lookupType", "type" : "util.LookupType", "desc" : "" }
           ],
           "map" : {
             "out.identifier" : "param.receiverID",
@@ -34,20 +34,24 @@
         },
         "result" : {
           "params" : [
-            { "name" : "apiResponse", "type" : "String" }
+            { "name" : "apiResponse", "type" : "String", "desc" : "" }
           ],
           "map" : {
             "result.apiResponse" : "in.apiResponse"
           }
-        },
-        "tags" : "connector"
+        }
       },
+      "tags" : [
+        "connector"
+      ],
       "visual" : {
         "at" : { "x" : 40, "y" : 64 },
         "description" : "Subprocess to handle sending an encrypted message",
         "icon" : "res:/webContent/icons/threema-icon_black.png?small"
       },
-      "connect" : { "id" : "f2", "to" : "f3" }
+      "connect" : [
+        { "id" : "f2", "to" : "f3" }
+      ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
@@ -60,17 +64,14 @@
       "name" : "getReceiverInfo",
       "config" : {
         "processCall" : "util/getReceiverInfo:call(threema.connector.ReceiverData)",
-        "output" : {
+        "call" : {
           "map" : {
-            "out" : "result.receiverData"
+            "param.receiverData" : "in"
           }
         },
-        "call" : {
-          "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
-          ],
+        "output" : {
           "map" : {
-            "param.receiverData" : "in"
+            "out" : "result.receiverData"
           }
         }
       },
@@ -79,24 +80,23 @@
         "description" : "lookup receiver info (threemaId & public key)",
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f9", "to" : "f5" }
+      "connect" : [
+        { "id" : "f9", "to" : "f5" }
+      ]
     }, {
       "id" : "f4",
       "type" : "SubProcessCall",
       "name" : "messageEncryption",
       "config" : {
         "processCall" : "util/messageEncryption:call(threema.connector.ReceiverData)",
-        "output" : {
+        "call" : {
           "map" : {
-            "out" : "result.receiverData"
+            "param.receiverData" : "in"
           }
         },
-        "call" : {
-          "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
-          ],
+        "output" : {
           "map" : {
-            "param.receiverData" : "in"
+            "out" : "result.receiverData"
           }
         }
       },
@@ -105,25 +105,24 @@
         "description" : "encrypt the message with receivers public key",
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f7", "to" : "f6" }
+      "connect" : [
+        { "id" : "f7", "to" : "f6" }
+      ]
     }, {
       "id" : "f6",
       "type" : "SubProcessCall",
       "name" : "send",
       "config" : {
         "processCall" : "util/sendMessage:call(threema.connector.ReceiverData)",
-        "output" : {
+        "call" : {
           "map" : {
-            "out" : "in",
-            "out.apiResponse" : "result.receiverData.apiResponse"
+            "param.receiverData" : "in"
           }
         },
-        "call" : {
-          "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
-          ],
+        "output" : {
           "map" : {
-            "param.receiverData" : "in"
+            "out" : "in",
+            "out.apiResponse" : "result.receiverData.apiResponse"
           }
         }
       },
@@ -132,19 +131,25 @@
         "description" : "send the encrypted message",
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f8", "to" : "f1" }
+      "connect" : [
+        { "id" : "f8", "to" : "f1" }
+      ]
     }, {
       "id" : "f5",
       "type" : "Alternative",
+      "config" : {
+        "conditions" : {
+          "f12" : "!in.apiResponse.contains(\"200\")"
+        }
+      },
       "visual" : {
         "at" : { "x" : 288, "y" : 64 }
       },
       "connect" : [
         { "id" : "f12", "to" : "f1", "via" : [ { "x" : 288, "y" : 144 }, { "x" : 720, "y" : 144 } ], "label" : {
             "name" : "Skip if lookup failed",
-            "segment" : 0.5,
             "offset" : { "x" : 217, "y" : 30 }
-          }, "condition" : "!in.apiResponse.contains(\"200\")" },
+          } },
         { "id" : "f11", "to" : "f4" }
       ]
     } ]
diff --git a/threema-connector/processes/util/getReceiverInfo.p.json b/threema-connector/processes/util/getReceiverInfo.p.json
index 9f653ce..a3d72d9 100644
--- a/threema-connector/processes/util/getReceiverInfo.p.json
+++ b/threema-connector/processes/util/getReceiverInfo.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B22C967B82A625",
   "kind" : "CALLABLE_SUB",
   "config" : {
@@ -10,10 +10,10 @@
       "type" : "CallSubStart",
       "name" : "call(receiverData)",
       "config" : {
-        "callSignature" : "call",
+        "signature" : "call",
         "input" : {
           "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
+            { "name" : "receiverData", "type" : "threema.connector.ReceiverData", "desc" : "" }
           ],
           "map" : {
             "out" : "param.receiverData",
@@ -22,7 +22,7 @@
         },
         "result" : {
           "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
+            { "name" : "receiverData", "type" : "threema.connector.ReceiverData", "desc" : "" }
           ],
           "map" : {
             "result.receiverData" : "in"
@@ -33,7 +33,9 @@
         "at" : { "x" : 96, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png?small"
       },
-      "connect" : { "id" : "f2", "to" : "f7" }
+      "connect" : [
+        { "id" : "f2", "to" : "f7" }
+      ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
@@ -45,61 +47,80 @@
       "type" : "RestClientCall",
       "name" : "LookupId",
       "config" : {
-        "path" : "/lookup/{type}/{id}",
-        "clientId" : "af315689-b538-4142-a823-0632d66754d7",
-        "clientErrorCode" : "ivy:error:rest:client",
-        "queryParams" : {
-          "secret" : "ivy.var.get(\"threemaConnector.secret\")",
-          "from" : "ivy.var.get(\"threemaConnector.threemaId\")"
-        },
-        "statusErrorCode" : ">> Ignore status",
-        "responseMapping" : {
-          "out" : "in",
-          "out.apiResponse" : "\"ID-Lookup: \" + response.getStatus().toString()",
-          "out.threemaId" : "result"
-        },
-        "templateParams" : {
-          "id" : "in.identifier",
-          "type" : "in.type.toString()"
+        "target" : {
+          "clientId" : "af315689-b538-4142-a823-0632d66754d7",
+          "path" : "/lookup/{type}/{id}",
+          "templateParams" : {
+            "id" : "in.identifier",
+            "type" : "in.type.toString()"
+          },
+          "queryParams" : {
+            "secret" : "ivy.var.get(\"threemaConnector.secret\")",
+            "from" : "ivy.var.get(\"threemaConnector.threemaId\")"
+          }
         },
-        "resultType" : "java.lang.String"
+        "response" : {
+          "entity" : {
+            "type" : "java.lang.String",
+            "map" : {
+              "out" : "in",
+              "out.apiResponse" : "\"ID-Lookup: \" + response.getStatus().toString()",
+              "out.threemaId" : "result"
+            }
+          },
+          "statusError" : ">> Ignore status"
+        }
       },
       "visual" : {
         "at" : { "x" : 336, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f8", "to" : "f4" }
+      "connect" : [
+        { "id" : "f8", "to" : "f4" }
+      ]
     }, {
       "id" : "f6",
       "type" : "RestClientCall",
       "name" : "LookupPubKey",
       "config" : {
-        "path" : "/pubkeys/{threemaId}",
-        "clientId" : "af315689-b538-4142-a823-0632d66754d7",
-        "clientErrorCode" : "ivy:error:rest:client",
-        "queryParams" : {
-          "from" : "ivy.var.get(\"threemaConnector.threemaId\")",
-          "secret" : "ivy.var.get(\"threemaConnector.secret\")"
-        },
-        "statusErrorCode" : ">> Ignore status",
-        "responseMapping" : {
-          "out" : "in",
-          "out.apiResponse" : "\"PublicKey-Lookup: \" + response.getStatus().toString()",
-          "out.publicKey" : "result"
-        },
-        "templateParams" : {
-          "threemaId" : "in.threemaId"
+        "target" : {
+          "clientId" : "af315689-b538-4142-a823-0632d66754d7",
+          "path" : "/pubkeys/{threemaId}",
+          "templateParams" : {
+            "threemaId" : "in.threemaId"
+          },
+          "queryParams" : {
+            "from" : "ivy.var.get(\"threemaConnector.threemaId\")",
+            "secret" : "ivy.var.get(\"threemaConnector.secret\")"
+          }
         },
-        "resultType" : "java.lang.String"
+        "response" : {
+          "entity" : {
+            "type" : "java.lang.String",
+            "map" : {
+              "out" : "in",
+              "out.apiResponse" : "\"PublicKey-Lookup: \" + response.getStatus().toString()",
+              "out.publicKey" : "result"
+            }
+          },
+          "statusError" : ">> Ignore status"
+        }
       },
       "visual" : {
         "at" : { "x" : 648, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f5", "to" : "f1" }
+      "connect" : [
+        { "id" : "f5", "to" : "f1" }
+      ]
     }, {
       "id" : "f7",
       "type" : "Alternative",
+      "config" : {
+        "conditions" : {
+          "f10" : "in.type == util.LookupType.THREEMAID"
+        }
+      },
       "visual" : {
         "at" : { "x" : 176, "y" : 64 }
       },
@@ -108,19 +129,24 @@
             "name" : "Skip if ThreemaID is known",
             "segment" : 2.14,
             "offset" : { "x" : -224, "y" : 7 }
-          }, "condition" : "in.type == util.LookupType.THREEMAID" },
+          } },
         { "id" : "f9", "to" : "f3" }
       ]
     }, {
       "id" : "f4",
       "type" : "Alternative",
+      "config" : {
+        "conditions" : {
+          "f13" : "!in.apiResponse.contains(\"200\")"
+        }
+      },
       "visual" : {
         "at" : { "x" : 512, "y" : 64 }
       },
       "connect" : [
         { "id" : "f13", "to" : "f1", "via" : [ { "x" : 512, "y" : 0 }, { "x" : 808, "y" : 0 } ], "label" : {
             "name" : "Skip if lookup failed"
-          }, "condition" : "!in.apiResponse.contains(\"200\")" },
+          } },
         { "id" : "f12", "to" : "f6" }
       ]
     } ]
diff --git a/threema-connector/processes/util/messageEncryption.p.json b/threema-connector/processes/util/messageEncryption.p.json
index 88e014f..6772353 100644
--- a/threema-connector/processes/util/messageEncryption.p.json
+++ b/threema-connector/processes/util/messageEncryption.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B22CD369A6089F",
   "kind" : "CALLABLE_SUB",
   "config" : {
@@ -10,10 +10,10 @@
       "type" : "CallSubStart",
       "name" : "call(receiverData)",
       "config" : {
-        "callSignature" : "call",
+        "signature" : "call",
         "input" : {
           "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
+            { "name" : "receiverData", "type" : "threema.connector.ReceiverData", "desc" : "" }
           ],
           "map" : {
             "out" : "param.receiverData"
@@ -21,7 +21,7 @@
         },
         "result" : {
           "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
+            { "name" : "receiverData", "type" : "threema.connector.ReceiverData", "desc" : "" }
           ],
           "map" : {
             "result.receiverData" : "in"
@@ -32,7 +32,9 @@
         "at" : { "x" : 96, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png?small"
       },
-      "connect" : { "id" : "f4", "to" : "f2" }
+      "connect" : [
+        { "id" : "f4", "to" : "f2" }
+      ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
@@ -59,6 +61,8 @@
         "at" : { "x" : 288, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f3", "to" : "f1" }
+      "connect" : [
+        { "id" : "f3", "to" : "f1" }
+      ]
     } ]
 }
\ No newline at end of file
diff --git a/threema-connector/processes/util/sendMessage.p.json b/threema-connector/processes/util/sendMessage.p.json
index 74939bb..55dcab6 100644
--- a/threema-connector/processes/util/sendMessage.p.json
+++ b/threema-connector/processes/util/sendMessage.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18B22CED0FA1555D",
   "kind" : "CALLABLE_SUB",
   "config" : {
@@ -10,10 +10,10 @@
       "type" : "CallSubStart",
       "name" : "call(receiverData)",
       "config" : {
-        "callSignature" : "call",
+        "signature" : "call",
         "input" : {
           "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
+            { "name" : "receiverData", "type" : "threema.connector.ReceiverData", "desc" : "" }
           ],
           "map" : {
             "out" : "param.receiverData"
@@ -21,7 +21,7 @@
         },
         "result" : {
           "params" : [
-            { "name" : "receiverData", "type" : "threema.connector.ReceiverData" }
+            { "name" : "receiverData", "type" : "threema.connector.ReceiverData", "desc" : "" }
           ],
           "map" : {
             "result.receiverData" : "in"
@@ -32,7 +32,9 @@
         "at" : { "x" : 96, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png?small"
       },
-      "connect" : { "id" : "f4", "to" : "f2" }
+      "connect" : [
+        { "id" : "f4", "to" : "f2" }
+      ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
@@ -44,35 +46,43 @@
       "type" : "RestClientCall",
       "name" : "sendMessage",
       "config" : {
-        "bodyForm" : {
-          "from" : "ivy.var.get(\"threemaConnector.threemaId\")",
-          "to" : "in.threemaId",
-          "nonce" : "in.nonce",
-          "box" : "in.encryptedMessage",
-          "secret" : "ivy.var.get(\"threemaConnector.secret\")",
-          "" : ""
-        },
-        "path" : "send_e2e",
-        "headers" : {
-          "Accept" : "*/*",
-          "X-Requested-By" : "\"ivy\""
-        },
-        "clientId" : "af315689-b538-4142-a823-0632d66754d7",
-        "clientErrorCode" : "ivy:error:rest:client",
         "method" : "POST",
-        "statusErrorCode" : ">> Ignore status",
-        "responseMapping" : {
-          "out" : "in",
-          "out.apiResponse" : "response.getStatus() == 200 ? \"Sent successfully (\" + response.getStatus() + \")\" : \"Error while sending (\" + response.getStatus() + \")\""
+        "target" : {
+          "clientId" : "af315689-b538-4142-a823-0632d66754d7",
+          "path" : "send_e2e",
+          "headers" : {
+            "X-Requested-By" : "\"ivy\""
+          }
         },
-        "resultType" : "java.lang.String",
-        "bodyInputType" : "FORM",
-        "bodyMediaType" : "application/x-www-form-urlencoded"
+        "body" : {
+          "type" : "FORM",
+          "mediaType" : "application/x-www-form-urlencoded",
+          "form" : {
+            "from" : [ "ivy.var.get(\"threemaConnector.threemaId\")" ],
+            "to" : [ "in.threemaId" ],
+            "nonce" : [ "in.nonce" ],
+            "box" : [ "in.encryptedMessage" ],
+            "secret" : [ "ivy.var.get(\"threemaConnector.secret\")" ],
+            "" : [ "" ]
+          }
+        },
+        "response" : {
+          "entity" : {
+            "type" : "java.lang.String",
+            "map" : {
+              "out" : "in",
+              "out.apiResponse" : "response.getStatus() == 200 ? \"Sent successfully (\" + response.getStatus() + \")\" : \"Error while sending (\" + response.getStatus() + \")\""
+            }
+          },
+          "statusError" : ">> Ignore status"
+        }
       },
       "visual" : {
         "at" : { "x" : 264, "y" : 64 },
         "icon" : "res:/webContent/icons/threema-icon_black.png"
       },
-      "connect" : { "id" : "f3", "to" : "f1" }
+      "connect" : [
+        { "id" : "f3", "to" : "f1" }
+      ]
     } ]
 }
\ No newline at end of file
diff --git a/threema-connector/webContent/layouts/frame-10.xhtml b/threema-connector/webContent/layouts/frame-10.xhtml
index 936a73b..b6244a1 100644
--- a/threema-connector/webContent/layouts/frame-10.xhtml
+++ b/threema-connector/webContent/layouts/frame-10.xhtml
@@ -32,7 +32,7 @@ and refence it below in the head part.
   <link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" />