From 70a529076d0adc7af555c5e383d3f66a9cd7a57f Mon Sep 17 00:00:00 2001
From: Tijs Rademakers <tijs.rademakers@gmail.com>
Date: Wed, 12 Jun 2024 12:13:42 +0200
Subject: [PATCH] Add support for SQL Server NVarchar (#3909)

* Work in progress: to support differentiating between varchar/nvarchar

(which is needed to improve sql server performance), all mappings need to get the correct type.
For other databases, regular varchar is fine, hence why the typehandler is always the same for those databases

* Nvarchar mappings for TimerJob

* event subscription and cmmn engine updates

* Nvarchar mappings for Execution

* Nvarchar mappings for Batch

* Nvarchar mappings for ExternalWorkerJob

* Nvarchar mappings for ByteArray

* cmmn engine updates

* Nvarchar mappings for Job

* cmmn engine updates

* Nvarchar mappings for Property and Comment

* cmmn engine updates

* Nvarchar mappings for HistoricDetail and HistoricTaskInstance

* cmmn engine updates

* cmmn engine updates

* cmmn engine updates

* Nvarchar mappings for HistoricProcessInstance and Resource

* Nvarchar mappings for Model and ProcessDefinitionInfo

* Simplify nvarchar test

* Nvarchar mappings for Model and HistoricEntityLink

* cmmn engine updates

* Nvarchar mappings for VariableInstance

* cmmn engine updates

* Nvarchar mappings for HistoricActivityInstance

* Nvarchar mappings for DMN

* App engine nvarchar changes

* Comment out varchar to nvarchar changes

* IDM nvarchar changes

* event registry updates

* fixes

---------

Co-authored-by: Joram Barrez <jbarrez@users.noreply.github.com>
---
 .../app/db/mapping/entity/AppDefinition.xml   |   84 +-
 .../app/db/mapping/entity/AppDeployment.xml   |   26 +-
 .../app/db/mapping/entity/AppResource.xml     |   10 +-
 .../batch/service/db/mapping/entity/Batch.xml |   84 +-
 .../service/db/mapping/entity/BatchPart.xml   |  132 +-
 .../data/impl/MybatisResourceDataManager.java |    2 +-
 .../liquibase/flowable-cmmn-db-changelog.xml  |   11 +
 .../cmmn/db/mapping/entity/CaseDefinition.xml |  106 +-
 .../cmmn/db/mapping/entity/CaseInstance.xml   |  304 +--
 .../cmmn/db/mapping/entity/CmmnDeployment.xml |   64 +-
 .../cmmn/db/mapping/entity/CmmnResource.xml   |   34 +-
 .../mapping/entity/HistoricCaseInstance.xml   |  307 ++-
 .../entity/HistoricMilestoneInstance.xml      |   66 +-
 .../entity/HistoricPlanItemInstance.xml       |  264 +--
 .../db/mapping/entity/MilestoneInstance.xml   |   62 +-
 .../db/mapping/entity/PlanItemInstance.xml    |  256 +-
 .../db/mapping/entity/SentryPartInstance.xml  |   46 +-
 .../dmn/db/mapping/entity/Decision.xml        |   86 +-
 .../dmn/db/mapping/entity/DmnDeployment.xml   |   24 +-
 .../dmn/db/mapping/entity/DmnResource.xml     |   20 +-
 .../entity/HistoricDecisionExecution.xml      |   42 +-
 .../impl/AbstractEngineConfiguration.java     |   18 +-
 .../common/db/mapping/entity/ByteArray.xml    |   40 +-
 .../common/db/mapping/entity/Property.xml     |   28 +-
 .../db/mapping/entity/ActivityInstance.xml    |  170 +-
 .../flowable/db/mapping/entity/Attachment.xml |  100 +-
 .../flowable/db/mapping/entity/Comment.xml    |  114 +-
 .../flowable/db/mapping/entity/Deployment.xml |  112 +-
 .../db/mapping/entity/EventLogEntry.xml       |  102 +-
 .../flowable/db/mapping/entity/Execution.xml  |  630 ++---
 .../entity/HistoricActivityInstance.xml       |  184 +-
 .../db/mapping/entity/HistoricDetail.xml      |  176 +-
 .../entity/HistoricProcessInstance.xml        |  456 ++--
 .../org/flowable/db/mapping/entity/Model.xml  |  118 +-
 .../db/mapping/entity/ProcessDefinition.xml   |  222 +-
 .../mapping/entity/ProcessDefinitionInfo.xml  |   34 +-
 .../flowable/db/mapping/entity/Resource.xml   |   36 +-
 .../service/db/mapping/entity/EntityLink.xml  |  150 +-
 .../db/mapping/entity/HistoricEntityLink.xml  |  170 +-
 .../db/mapping/entity/ChannelDefinition.xml   |   96 +-
 .../db/mapping/entity/EventDefinition.xml     |   88 +-
 .../db/mapping/entity/EventDeployment.xml     |   28 +-
 .../db/mapping/entity/EventResource.xml       |   32 +-
 .../db/mapping/entity/EventSubscription.xml   |  690 +++---
 .../mapping/entity/HistoricIdentityLink.xml   |  120 +-
 .../db/mapping/entity/IdentityLink.xml        |  180 +-
 .../flowable/idm/db/mapping/entity/Group.xml  |   62 +-
 .../idm/db/mapping/entity/IdentityInfo.xml    |   80 +-
 .../idm/db/mapping/entity/IdmByteArray.xml    |   26 +-
 .../idm/db/mapping/entity/IdmProperty.xml     |   24 +-
 .../idm/db/mapping/entity/Membership.xml      |   20 +-
 .../idm/db/mapping/entity/Privilege.xml       |   32 +-
 .../db/mapping/entity/PrivilegeMapping.xml    |   48 +-
 .../flowable/idm/db/mapping/entity/Token.xml  |   92 +-
 .../flowable/idm/db/mapping/entity/User.xml   |  118 +-
 .../db/mapping/entity/DeadLetterJob.xml       |  260 +-
 .../db/mapping/entity/ExternalWorkerJob.xml   |  328 +--
 .../service/db/mapping/entity/HistoryJob.xml  |  136 +-
 .../job/service/db/mapping/entity/Job.xml     |  272 +--
 .../db/mapping/entity/SuspendedJob.xml        |  264 +--
 .../service/db/mapping/entity/TimerJob.xml    |  304 +--
 .../db/EngineMappingsValidationTest.java      |  150 +-
 .../db/EntityParameterTypesOverview.java      | 2109 +++++++++++++++++
 .../mapping/entity/HistoricTaskInstance.xml   |  824 +++----
 .../mapping/entity/HistoricTaskLogEntry.xml   |  168 +-
 .../task/service/db/mapping/entity/Task.xml   |  766 +++---
 .../entity/HistoricVariableInstance.xml       |  218 +-
 .../db/mapping/entity/VariableInstance.xml    |  210 +-
 68 files changed, 7458 insertions(+), 5177 deletions(-)
 create mode 100644 modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EntityParameterTypesOverview.java

diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDefinition.xml b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDefinition.xml
index d28fa3557bd..594dc7025dc 100644
--- a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDefinition.xml
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDefinition.xml
@@ -62,18 +62,18 @@
   </update>
   
   <delete id="deleteAppDefinition" parameterType="org.flowable.app.engine.impl.persistence.entity.AppDefinitionEntityImpl">
-    delete from ${prefix}ACT_APP_APPDEF where ID_ = #{id}
+    delete from ${prefix}ACT_APP_APPDEF where ID_ = #{id, jdbcType=VARCHAR}
   </delete>  
 
   <delete id="deleteAppDefinitionsByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_APP_APPDEF where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}ACT_APP_APPDEF where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
   </delete>
   
   <resultMap id="appDefinitionResultMap" type="org.flowable.app.engine.impl.persistence.entity.AppDefinitionEntityImpl">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="revision" column="REV_" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
+    <result property="revision" column="REV_" jdbcType="INTEGER"/>
+    <result property="category" column="CATEGORY_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
     <result property="key" column="KEY_" jdbcType="VARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
     <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
@@ -89,51 +89,51 @@
   </select>
 
   <select id="selectAppDefinitionById" parameterType="string" resultMap="appDefinitionResultMap">
-    select * from ${prefix}ACT_APP_APPDEF where ID_ = #{appDefinitionId}
+    select * from ${prefix}ACT_APP_APPDEF where ID_ = #{appDefinitionId, jdbcType=VARCHAR}
   </select>
 
   <select id="selectAppDefinitionByDeploymentAndKey" parameterType="map" resultMap="appDefinitionResultMap">
     select * 
     from ${prefix}ACT_APP_APPDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{appDefinitionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{appDefinitionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
    <select id="selectAppDefinitionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="appDefinitionResultMap">
     select * 
     from ${prefix}ACT_APP_APPDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{appDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{appDefinitionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
   
   <select id="selectAppDefinitionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{parameter.appDefinitionKey} and VERSION_ = #{parameter.appDefinitionVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.appDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.appDefinitionVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
   <select id="selectAppDefinitionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{parameter.appDefinitionKey} and VERSION_ = #{parameter.appDefinitionVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.appDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.appDefinitionVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectLatestAppDefinitionByKey" parameterType="string" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{key} and
+    where KEY_ = #{key, jdbcType=VARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey, jdbcType=VARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
   
   <select id="selectLatestAppDefinitionByKeyAndTenantId" parameterType="map" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{appDefinitionKey} and
-          TENANT_ID_ = #{tenantId} and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{appDefinitionKey, jdbcType=VARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=VARCHAR} and
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey, jdbcType=VARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR})
   </select>
   
   <select id="selectAppDefinitionsByQueryCriteria" parameterType="org.flowable.app.engine.impl.repository.AppDefinitionQueryImpl" resultMap="appDefinitionResultMap">
@@ -153,72 +153,72 @@
     from ${prefix}ACT_APP_APPDEF RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}${wildcardEscapeClause}
+        and RES.KEY_ like #{keyLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=VARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}${wildcardEscapeClause}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
              </if>
              <if test="withoutTenantId">
                and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -229,10 +229,10 @@
         )
       </if>
        <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDeployment.xml b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDeployment.xml
index 3a42c81f550..1db9a84dd7d 100644
--- a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDeployment.xml
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDeployment.xml
@@ -70,7 +70,7 @@
   <!-- DEPLOYMENT DELETE -->
   
   <delete id="deleteAppDeployment" parameterType="string">
-    delete from ${prefix}ACT_APP_DEPLOYMENT where ID_ = #{id}
+    delete from ${prefix}ACT_APP_DEPLOYMENT where ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <!-- DEPLOYMENT RESULTMAP -->
@@ -87,7 +87,7 @@
   <!-- DEPLOYMENT SELECT -->
 
   <select id="selectAppDeploymentsByName" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appDeploymentResultMap">
-    select * from ${prefix}ACT_APP_DEPLOYMENT D where NAME_=#{parameter} order by D.DEPLOY_TIME_ desc
+    select * from ${prefix}ACT_APP_DEPLOYMENT D where NAME_=#{parameter, jdbcType=VARCHAR} order by D.DEPLOY_TIME_ desc
   </select>
   
   <select id="selectAppDeployment" parameterType="string" resultMap="appDeploymentResultMap">
@@ -111,46 +111,46 @@
     from ${prefix}ACT_APP_DEPLOYMENT RES
     <where>
       <if test="deploymentId != null">
-        RES.ID_ = #{deploymentId}
+        RES.ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
         and RES.ID_ IN
         <foreach item="deploymentId" index="index" collection="deploymentIds" 
                  open="(" separator="," close=")">
-          #{deploymentId}
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="latest">
         and RES.DEPLOY_TIME_ = (select max(DEPLOY_TIME_) from ${prefix}ACT_APP_DEPLOYMENT where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
              </if>
         )
       </if>
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppResource.xml b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppResource.xml
index 288e1516f84..24e7f1413df 100644
--- a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppResource.xml
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppResource.xml
@@ -36,7 +36,7 @@
   <!-- RESOURCE DELETE -->
 
   <delete id="deleteAppResourcesByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id}
+    delete from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id, jdbcType=VARCHAR}
   </delete>
   
   <!-- RESOURCE RESULTMAP -->
@@ -51,17 +51,17 @@
   <!-- RESOURCE SELECT -->
 
   <select id="selectAppResourceNamesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
-    select NAME_ from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select NAME_ from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <select id="selectAppResourceByDeploymentIdAndResourceName" parameterType="map" resultMap="appResourceResultMap">
     select * from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-          AND NAME_ = #{resourceName}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+          AND NAME_ = #{resourceName, jdbcType=VARCHAR}
   </select>
 
   <select id="selectAppResourcesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appResourceResultMap">
-    select * from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select * from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <update id="updateAppResource" parameterType="org.flowable.app.engine.impl.persistence.entity.AppResourceEntityImpl">
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/Batch.xml b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/Batch.xml
index c16209fd0b1..9e83fd5ebf4 100644
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/Batch.xml
+++ b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/Batch.xml
@@ -5,47 +5,47 @@
 <mapper namespace="org.flowable.batch.service.impl.persistence.entity.BatchEntityImpl">
 
     <resultMap id="batchResultMap" type="org.flowable.batch.service.impl.persistence.entity.BatchEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <id property="id" column="ID_" jdbcType="NVARCHAR"/>
         <result property="revision" column="REV_" jdbcType="INTEGER"/>
-        <result property="batchType" column="TYPE_" jdbcType="VARCHAR"/>
-        <result property="batchSearchKey" column="SEARCH_KEY_" jdbcType="VARCHAR"/>
-        <result property="batchSearchKey2" column="SEARCH_KEY2_" jdbcType="VARCHAR"/>
+        <result property="batchType" column="TYPE_" jdbcType="NVARCHAR"/>
+        <result property="batchSearchKey" column="SEARCH_KEY_" jdbcType="NVARCHAR"/>
+        <result property="batchSearchKey2" column="SEARCH_KEY2_" jdbcType="NVARCHAR"/>
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
         <result property="completeTime" column="COMPLETE_TIME_" jdbcType="TIMESTAMP"/>
-        <result property="status" column="STATUS_" jdbcType="VARCHAR"/>
+        <result property="status" column="STATUS_" jdbcType="NVARCHAR"/>
         <result property="batchDocRefId" column="BATCH_DOC_ID_" typeHandler="BatchByteArrayRefTypeHandler"/>
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR"/>
     </resultMap>
 
     <!-- Batch INSERTS -->
     <insert id="insertBatch" parameterType="org.flowable.batch.service.impl.persistence.entity.BatchEntityImpl">
         INSERT INTO ${prefix}FLW_RU_BATCH(ID_, REV_, TYPE_, SEARCH_KEY_, SEARCH_KEY2_, CREATE_TIME_, COMPLETE_TIME_, STATUS_, BATCH_DOC_ID_, TENANT_ID_)
-        VALUES (#{id, jdbcType=VARCHAR},
+        VALUES (#{id, jdbcType=NVARCHAR},
                 #{revision, jdbcType=INTEGER},
-                #{batchType, jdbcType=VARCHAR},
-                #{batchSearchKey, jdbcType=VARCHAR},
-                #{batchSearchKey2, jdbcType=VARCHAR},
+                #{batchType, jdbcType=NVARCHAR},
+                #{batchSearchKey, jdbcType=NVARCHAR},
+                #{batchSearchKey2, jdbcType=NVARCHAR},
                 #{createTime, jdbcType=TIMESTAMP},
                 #{completeTime, jdbcType=TIMESTAMP},
-                #{status, jdbcType=VARCHAR},
+                #{status, jdbcType=NVARCHAR},
                 #{batchDocRefId, typeHandler=BatchByteArrayRefTypeHandler},
-                #{tenantId, jdbcType=VARCHAR})
+                #{tenantId, jdbcType=NVARCHAR})
     </insert>
 
     <insert id="bulkInsertBatch" parameterType="java.util.List">
         INSERT INTO ${prefix}FLW_RU_BATCH(ID_, REV_, TYPE_, SEARCH_KEY_, SEARCH_KEY2_, CREATE_TIME_, COMPLETE_TIME_, STATUS_, BATCH_DOC_ID_, TENANT_ID_)
         VALUES
         <foreach collection="list" item="batch" index="index" separator=",">
-            (#{batch.id, jdbcType=VARCHAR},
+            (#{batch.id, jdbcType=NVARCHAR},
             #{batch.revision, jdbcType=INTEGER},
-            #{batch.batchType, jdbcType=VARCHAR},
-            #{batch.batchSearchKey, jdbcType=VARCHAR},
-            #{batch.batchSearchKey2, jdbcType=VARCHAR},
+            #{batch.batchType, jdbcType=NVARCHAR},
+            #{batch.batchSearchKey, jdbcType=NVARCHAR},
+            #{batch.batchSearchKey2, jdbcType=NVARCHAR},
             #{batch.createTime, jdbcType=TIMESTAMP},
             #{batch.completeTime, jdbcType=TIMESTAMP},
-            #{batch.status, jdbcType=VARCHAR},
+            #{batch.status, jdbcType=NVARCHAR},
             #{batch.batchDocRefId, typeHandler=BatchByteArrayRefTypeHandler},
-            #{batch.tenantId, jdbcType=VARCHAR})
+            #{batch.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
@@ -53,16 +53,16 @@
         INSERT ALL
         <foreach collection="list" item="batch" index="index">
             INTO ${prefix}FLW_RU_BATCH(ID_, REV_, TYPE_, SEARCH_KEY_, SEARCH_KEY2_, CREATE_TIME_, COMPLETE_TIME_, STATUS_, BATCH_DOC_ID_, TENANT_ID_) VALUES
-            (#{batch.id, jdbcType=VARCHAR},
+            (#{batch.id, jdbcType=NVARCHAR},
             #{batch.revision, jdbcType=INTEGER},
-            #{batch.batchType, jdbcType=VARCHAR},
-            #{batch.batchSearchKey, jdbcType=VARCHAR},
-            #{batch.batchSearchKey2, jdbcType=VARCHAR},
+            #{batch.batchType, jdbcType=NVARCHAR},
+            #{batch.batchSearchKey, jdbcType=NVARCHAR},
+            #{batch.batchSearchKey2, jdbcType=NVARCHAR},
             #{batch.createTime, jdbcType=TIMESTAMP},
             #{batch.completeTime, jdbcType=TIMESTAMP},
-            #{batch.status, jdbcType=VARCHAR},
+            #{batch.status, jdbcType=NVARCHAR},
             #{batch.batchDocRefId, typeHandler=BatchByteArrayRefTypeHandler},
-            #{batch.tenantId, jdbcType=VARCHAR})
+            #{batch.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -73,16 +73,16 @@
         <set>
             REV_ = #{revisionNext, jdbcType=INTEGER},
             <if test="originalPersistentState.status != null">
-                STATUS_ = #{status, jdbcType=VARCHAR},
+                STATUS_ = #{status, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.completeTime != completeTime">
                 COMPLETE_TIME_ = #{completeTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.tenantId != tenantId">
-                TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
+                TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_ = #{id, jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
@@ -90,7 +90,7 @@
     <delete id="deleteBatch" parameterType="org.flowable.batch.service.impl.persistence.entity.BatchEntityImpl">
         delete
         from ${prefix}FLW_RU_BATCH
-        where ID_ = #{id, jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
 
     <delete id="bulkDeleteBatches" parameterType="org.flowable.batch.service.impl.BatchQueryImpl">
@@ -133,13 +133,13 @@
     <select id="selectBatch" parameterType="string" resultMap="batchResultMap">
         select *
         from ${prefix}FLW_RU_BATCH
-        where ID_ = #{id, jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectBatchesBySearchKey" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="batchResultMap">
         select *
         from ${prefix}FLW_RU_BATCH
-        where SEARCH_KEY_ = #{parameter.searchKey, jdbcType=VARCHAR} or SEARCH_KEY2_ = #{parameter.searchKey2, jdbcType=VARCHAR}
+        where SEARCH_KEY_ = #{parameter.searchKey, jdbcType=NVARCHAR} or SEARCH_KEY2_ = #{parameter.searchKey2, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectAllBatches" parameterType="string" resultMap="batchResultMap">
@@ -163,44 +163,44 @@
         from ${prefix}FLW_RU_BATCH RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="batchType != null">
-                and RES.TYPE_ = #{batchType}
+                and RES.TYPE_ = #{batchType, jdbcType=NVARCHAR}
             </if>
             <if test="batchTypes != null and !batchTypes.empty">
                 and RES.TYPE_ IN
                 <foreach item="batchTypeItem" index="index" collection="batchTypes"
                          open="(" separator="," close=")">
-                    #{batchTypeItem}
+                    #{batchTypeItem, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="searchKey != null">
-                and RES.SEARCH_KEY_ = #{searchKey}
+                and RES.SEARCH_KEY_ = #{searchKey, jdbcType=NVARCHAR}
             </if>
             <if test="searchKey2 != null">
-                and RES.SEARCH_KEY2_ = #{searchKey2}
+                and RES.SEARCH_KEY2_ = #{searchKey2, jdbcType=NVARCHAR}
             </if>
             <if test="createTimeHigherThan != null">
-                and RES.CREATE_TIME_ &gt; #{createTimeHigherThan}
+                and RES.CREATE_TIME_ &gt; #{createTimeHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="createTimeLowerThan != null">
-                and RES.CREATE_TIME_ &lt; #{createTimeLowerThan}
+                and RES.CREATE_TIME_ &lt; #{createTimeLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="completeTimeHigherThan != null">
-                and RES.COMPLETE_TIME_ &gt; #{completeTimeHigherThan}
+                and RES.COMPLETE_TIME_ &gt; #{completeTimeHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="completeTimeLowerThan != null">
-                and RES.COMPLETE_TIME_ &lt; #{completeTimeLowerThan}
+                and RES.COMPLETE_TIME_ &lt; #{completeTimeLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="status != null">
-                and RES.STATUS_ = #{status}
+                and RES.STATUS_ = #{status, jdbcType=NVARCHAR}
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/BatchPart.xml b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/BatchPart.xml
index 5d82e6ec06b..e1b0bee7bd9 100644
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/BatchPart.xml
+++ b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/mapping/entity/BatchPart.xml
@@ -5,63 +5,63 @@
 <mapper namespace="org.flowable.batch.service.impl.persistence.entity.BatchPartEntityImpl">
 
     <resultMap id="batchPartMap" type="org.flowable.batch.service.impl.persistence.entity.BatchPartEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <id property="id" column="ID_" jdbcType="NVARCHAR"/>
         <result property="revision" column="REV_" jdbcType="INTEGER"/>
-        <result property="batchId" column="BATCH_ID_" jdbcType="VARCHAR"/>
-        <result property="type" column="TYPE_" jdbcType="VARCHAR"/>
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-        <result property="searchKey" column="SEARCH_KEY_" jdbcType="VARCHAR"/>
-        <result property="searchKey2" column="SEARCH_KEY2_" jdbcType="VARCHAR"/>
-        <result property="status" column="STATUS_" jdbcType="VARCHAR"/>
+        <result property="batchId" column="BATCH_ID_" jdbcType="NVARCHAR"/>
+        <result property="type" column="TYPE_" jdbcType="NVARCHAR"/>
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="searchKey" column="SEARCH_KEY_" jdbcType="NVARCHAR"/>
+        <result property="searchKey2" column="SEARCH_KEY2_" jdbcType="NVARCHAR"/>
+        <result property="status" column="STATUS_" jdbcType="NVARCHAR"/>
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
         <result property="completeTime" column="COMPLETE_TIME_" jdbcType="TIMESTAMP"/>
         <result property="resultDocRefId" column="RESULT_DOC_ID_" typeHandler="BatchByteArrayRefTypeHandler"/>
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR"/>
 
-        <result property="batchType" column="BATCH_TYPE_" jdbcType="VARCHAR"/>
-        <result property="batchSearchKey" column="BATCH_SEARCH_KEY_" jdbcType="VARCHAR"/>
-        <result property="batchSearchKey2" column="BATCH_SEARCH_KEY2_" jdbcType="VARCHAR"/>
+        <result property="batchType" column="BATCH_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="batchSearchKey" column="BATCH_SEARCH_KEY_" jdbcType="NVARCHAR"/>
+        <result property="batchSearchKey2" column="BATCH_SEARCH_KEY2_" jdbcType="NVARCHAR"/>
     </resultMap>
 
     <!-- BatchPart INSERTS -->
     <insert id="insertBatchPart" parameterType="org.flowable.batch.service.impl.persistence.entity.BatchPartEntityImpl">
         INSERT INTO ${prefix}FLW_RU_BATCH_PART(ID_, REV_, BATCH_ID_, TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SEARCH_KEY_, SEARCH_KEY2_, STATUS_, CREATE_TIME_, COMPLETE_TIME_, RESULT_DOC_ID_, TENANT_ID_)
-        VALUES (#{id, jdbcType=VARCHAR},
+        VALUES (#{id, jdbcType=NVARCHAR},
             #{revision, jdbcType=INTEGER},
-            #{batchId, jdbcType=VARCHAR},
-            #{type, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{searchKey, jdbcType=VARCHAR},
-            #{searchKey2, jdbcType=VARCHAR},
-            #{status, jdbcType=VARCHAR},
+            #{batchId, jdbcType=NVARCHAR},
+            #{type, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{searchKey, jdbcType=NVARCHAR},
+            #{searchKey2, jdbcType=NVARCHAR},
+            #{status, jdbcType=NVARCHAR},
             #{createTime, jdbcType=TIMESTAMP},
             #{completeTime, jdbcType=TIMESTAMP},
             #{resultDocRefId, typeHandler=BatchByteArrayRefTypeHandler},
-            #{tenantId, jdbcType=VARCHAR})
+            #{tenantId, jdbcType=NVARCHAR})
     </insert>
 
     <insert id="bulkInsertBatchPart" parameterType="java.util.List">
         INSERT INTO ${prefix}FLW_RU_BATCH_PART(ID_, REV_, BATCH_ID_, TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SEARCH_KEY_, SEARCH_KEY2_, STATUS_, CREATE_TIME_, COMPLETE_TIME_, RESULT_DOC_ID_, TENANT_ID_)
         VALUES
         <foreach collection="list" item="batchPart" index="index" separator=",">
-            (#{batchPart.id, jdbcType=VARCHAR},
+            (#{batchPart.id, jdbcType=NVARCHAR},
             #{batchPart.revision, jdbcType=INTEGER},
-            #{batchPart.batchId, jdbcType=VARCHAR},
-            #{batchPart.type, jdbcType=VARCHAR},
-            #{batchPart.scopeId, jdbcType=VARCHAR},
-            #{batchPart.subScopeId, jdbcType=VARCHAR},
-            #{batchPart.scopeType, jdbcType=VARCHAR},
-            #{batchPart.searchKey, jdbcType=VARCHAR},
-            #{batchPart.searchKey2, jdbcType=VARCHAR},
-            #{batchPart.status, jdbcType=VARCHAR},
+            #{batchPart.batchId, jdbcType=NVARCHAR},
+            #{batchPart.type, jdbcType=NVARCHAR},
+            #{batchPart.scopeId, jdbcType=NVARCHAR},
+            #{batchPart.subScopeId, jdbcType=NVARCHAR},
+            #{batchPart.scopeType, jdbcType=NVARCHAR},
+            #{batchPart.searchKey, jdbcType=NVARCHAR},
+            #{batchPart.searchKey2, jdbcType=NVARCHAR},
+            #{batchPart.status, jdbcType=NVARCHAR},
             #{batchPart.createTime, jdbcType=TIMESTAMP},
             #{batchPart.completeTime, jdbcType=TIMESTAMP},
             #{batchPart.resultDocRefId, typeHandler=BatchByteArrayRefTypeHandler},
-            #{batchPart.tenantId, jdbcType=VARCHAR})
+            #{batchPart.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
@@ -69,20 +69,20 @@
         INSERT ALL
         <foreach collection="list" item="batchPart" index="index">
             INTO ${prefix}FLW_RU_BATCH_PART(ID_, REV_, BATCH_ID_, TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SEARCH_KEY_, SEARCH_KEY2_, STATUS_, CREATE_TIME_, COMPLETE_TIME_, RESULT_DOC_ID_, TENANT_ID_) VALUES
-            (#{batchPart.id, jdbcType=VARCHAR},
+            (#{batchPart.id, jdbcType=NVARCHAR},
             #{batchPart.revision, jdbcType=INTEGER},
-            #{batchPart.batchId, jdbcType=VARCHAR},
-            #{batchPart.type, jdbcType=VARCHAR},
-            #{batchPart.scopeId, jdbcType=VARCHAR},
-            #{batchPart.subScopeId, jdbcType=VARCHAR},
-            #{batchPart.scopeType, jdbcType=VARCHAR},
-            #{batchPart.searchKey, jdbcType=VARCHAR},
-            #{batchPart.searchKey2, jdbcType=VARCHAR},
-            #{batchPart.status, jdbcType=VARCHAR},
+            #{batchPart.batchId, jdbcType=NVARCHAR},
+            #{batchPart.type, jdbcType=NVARCHAR},
+            #{batchPart.scopeId, jdbcType=NVARCHAR},
+            #{batchPart.subScopeId, jdbcType=NVARCHAR},
+            #{batchPart.scopeType, jdbcType=NVARCHAR},
+            #{batchPart.searchKey, jdbcType=NVARCHAR},
+            #{batchPart.searchKey2, jdbcType=NVARCHAR},
+            #{batchPart.status, jdbcType=NVARCHAR},
             #{batchPart.createTime, jdbcType=TIMESTAMP},
             #{batchPart.completeTime, jdbcType=TIMESTAMP},
             #{batchPart.resultDocRefId, typeHandler=BatchByteArrayRefTypeHandler},
-            #{batchPart.tenantId, jdbcType=VARCHAR})
+            #{batchPart.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -99,44 +99,44 @@
                 COMPLETE_TIME_ = #{completeTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.status != status">
-                STATUS_ = #{status, jdbcType=VARCHAR},
+                STATUS_ = #{status, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.tenantId != tenantId">
-                TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
+                TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_ = #{id, jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <!-- BatchPart DELETE -->
     <delete id="deleteBatchPart" parameterType="string">
-      delete from ${prefix}FLW_RU_BATCH_PART where ID_ = #{id, jdbcType=VARCHAR}
+      delete from ${prefix}FLW_RU_BATCH_PART where ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
     
     <delete id="deleteBatchPartByBatchId" parameterType="string">
-      delete from ${prefix}FLW_RU_BATCH_PART where BATCH_ID_ = #{batchId, jdbcType=VARCHAR}
+      delete from ${prefix}FLW_RU_BATCH_PART where BATCH_ID_ = #{batchId, jdbcType=NVARCHAR}
     </delete>
 
     <!-- BatchPart SELECT -->
     <select id="selectBatchPart" parameterType="string" resultMap="batchPartMap">
         <include refid="selectBatchPartsWithBatchJoinSql"/>
-        where RES.ID_ = #{id, jdbcType=VARCHAR}
+        where RES.ID_ = #{id, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectBatchPartsByBatchId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="batchPartMap">
         <include refid="selectBatchPartsWithBatchJoinSql"/>
-        where RES.BATCH_ID_ = #{parameter.batchId, jdbcType=VARCHAR}
+        where RES.BATCH_ID_ = #{parameter.batchId, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectBatchPartsByBatchIdAndStatus" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="batchPartMap">
         <include refid="selectBatchPartsWithBatchJoinSql"/>
-        where RES.BATCH_ID_ = #{parameter.batchId, jdbcType=VARCHAR} and RES.STATUS_ = #{parameter.status, jdbcType=VARCHAR}
+        where RES.BATCH_ID_ = #{parameter.batchId, jdbcType=NVARCHAR} and RES.STATUS_ = #{parameter.status, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectBatchPartsByScopeIdAndScopeType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="batchPartMap">
         <include refid="selectBatchPartsWithBatchJoinSql"/>
-        where RES.SCOPE_ID_ = #{parameter.scopeId, jdbcType=VARCHAR} or RES.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+        where RES.SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} or RES.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectBatchPartsByQueryCriteria" parameterType="org.flowable.batch.service.impl.BatchPartQueryImpl" resultMap="batchPartMap">
@@ -165,46 +165,46 @@
     <sql id="commonSelectBatchPartsByQueryCriteriaSql">
         <where>
             <if test="id != null">
-                AND RES.ID_ = #{id, jdbcType=VARCHAR}
+                AND RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="type != null">
-                AND RES.TYPE_ = #{type, jdbcType=VARCHAR}
+                AND RES.TYPE_ = #{type, jdbcType=NVARCHAR}
             </if>
             <if test="batchId != null">
-                AND RES.BATCH_ID_ = #{batchId, jdbcType=VARCHAR}
+                AND RES.BATCH_ID_ = #{batchId, jdbcType=NVARCHAR}
             </if>
             <if test="searchKey != null">
-                AND RES.SEARCH_KEY_ = #{searchKey, jdbcType=VARCHAR}
+                AND RES.SEARCH_KEY_ = #{searchKey, jdbcType=NVARCHAR}
             </if>
             <if test="searchKey2 != null">
-                AND RES.SEARCH_KEY2_ = #{searchKey2, jdbcType=VARCHAR}
+                AND RES.SEARCH_KEY2_ = #{searchKey2, jdbcType=NVARCHAR}
             </if>
             <if test="batchType != null">
-                AND BATCH_.TYPE_ = #{batchType, jdbcType=VARCHAR}
+                AND BATCH_.TYPE_ = #{batchType, jdbcType=NVARCHAR}
             </if>
             <if test="batchSearchKey != null">
-                AND BATCH_.SEARCH_KEY_ = #{batchSearchKey, jdbcType=VARCHAR}
+                AND BATCH_.SEARCH_KEY_ = #{batchSearchKey, jdbcType=NVARCHAR}
             </if>
             <if test="batchSearchKey2 != null">
-                AND BATCH_.SEARCH_KEY2_ = #{batchSearchKey2, jdbcType=VARCHAR}
+                AND BATCH_.SEARCH_KEY2_ = #{batchSearchKey2, jdbcType=NVARCHAR}
             </if>
             <if test="status != null">
-                AND RES.STATUS_ = #{status, jdbcType=VARCHAR}
+                AND RES.STATUS_ = #{status, jdbcType=NVARCHAR}
             </if>
             <if test="scopeId != null">
-                AND RES.SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR}
+                AND RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="subScopeId != null">
-                AND RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR}
+                AND RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                AND RES.SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
+                AND RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="tenantId != null">
-                AND RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+                AND RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisResourceDataManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisResourceDataManager.java
index 09f3fa9bc9e..a0c4bb15462 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisResourceDataManager.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/persistence/entity/data/impl/MybatisResourceDataManager.java
@@ -50,7 +50,7 @@ public void deleteResourcesByDeploymentId(String deploymentId) {
     public CmmnResourceEntity findResourceByDeploymentIdAndResourceName(String deploymentId, String resourceName) {
         Map<String, Object> params = new HashMap<>();
         params.put("deploymentId", deploymentId);
-        params.put("resourceName", resourceName);
+        params.put("name", resourceName);
         return (CmmnResourceEntity) getDbSqlSession().selectOne("selectCmmnResourceByDeploymentIdAndResourceName", params);
     }
 
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml
index 4cea65bc3cd..f7f2a78ef1e 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml
@@ -591,4 +591,15 @@
         </createIndex>
     </changeSet>
 
+<!--    <changeSet id="19" author="flowable" dbms="mssql">-->
+<!--        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="NAME_" newDataType="nvarchar(255)" />-->
+<!--        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="START_USER_ID_" newDataType="nvarchar(255)" />-->
+<!--        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="BUSINESS_STATUS_" newDataType="nvarchar(255)" />-->
+
+<!--        &lt;!&ndash; TENANT_ID_ has a default value set &ndash;&gt;-->
+<!--        <dropDefaultValue tableName="ACT_CMMN_RU_CASE_INST" columnName="TENANT_ID_" />-->
+<!--        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="TENANT_ID_" newDataType="nvarchar(255)" />-->
+<!--        <addDefaultValue tableName="ACT_CMMN_RU_CASE_INST" columnName="TENANT_ID_" defaultValue="" />-->
+<!--    </changeSet>-->
+
 </databaseChangeLog>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseDefinition.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseDefinition.xml
index 604c7f4319b..934aca24454 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseDefinition.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseDefinition.xml
@@ -71,18 +71,18 @@
   </update>
   
   <delete id="deleteCaseDefinition" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.CaseDefinitionEntityImpl">
-    delete from ${prefix}ACT_CMMN_CASEDEF where ID_ = #{id}
+    delete from ${prefix}ACT_CMMN_CASEDEF where ID_ = #{id, jdbcType=VARCHAR}
   </delete>  
 
   <delete id="deleteCaseDefinitionsByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_CMMN_CASEDEF where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}ACT_CMMN_CASEDEF where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} 
   </delete>
   
   <resultMap id="caseDefinitionResultMap" type="org.flowable.cmmn.engine.impl.persistence.entity.CaseDefinitionEntityImpl">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="revision" column="REV_" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
+    <result property="revision" column="REV_" jdbcType="INTEGER"/>
+    <result property="category" column="CATEGORY_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
     <result property="key" column="KEY_" jdbcType="VARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
     <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
@@ -97,71 +97,71 @@
   <!-- CASDEFINITION SELECT -->
 
   <select id="selectCaseDefinition" parameterType="string" resultMap="caseDefinitionResultMap">
-    select * from ${prefix}ACT_CMMN_CASEDEF where ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_CMMN_CASEDEF where ID_ = #{id, jdbcType=VARCHAR}
   </select>
 
   <select id="selectCaseDefinitionById" parameterType="string" resultMap="caseDefinitionResultMap">
-    select * from ${prefix}ACT_CMMN_CASEDEF where ID_ = #{caseDefinitionId}
+    select * from ${prefix}ACT_CMMN_CASEDEF where ID_ = #{id, jdbcType=VARCHAR}
   </select>
 
   <select id="selectCaseDefinitionByDeploymentAndKey" parameterType="map" resultMap="caseDefinitionResultMap">
     select * 
     from ${prefix}ACT_CMMN_CASEDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{caseDefinitionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
    <select id="selectCaseDefinitionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="caseDefinitionResultMap">
     select * 
     from ${prefix}ACT_CMMN_CASEDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{caseDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
 
   <select id="selectCaseDefinitionByParentDeploymentAndKey" parameterType="map" resultMap="caseDefinitionResultMap">
     select *
     from ${prefix}ACT_CMMN_CASEDEF DEF
-    where EXISTS (select 1 from ${prefix}ACT_CMMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = DEF.DEPLOYMENT_ID_)
-      and KEY_ = #{caseDefinitionKey}
+    where EXISTS (select 1 from ${prefix}ACT_CMMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR} and D.ID_ = DEF.DEPLOYMENT_ID_)
+      and KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
 
   <select id="selectCaseDefinitionByParentDeploymentAndKeyAndTenantId" parameterType="map" resultMap="caseDefinitionResultMap">
     select *
     from ${prefix}ACT_CMMN_CASEDEF DEF
-    where EXISTS (select 1 from ${prefix}ACT_CMMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = DEF.DEPLOYMENT_ID_)
-      and KEY_ = #{caseDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where EXISTS (select 1 from ${prefix}ACT_CMMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR} and D.ID_ = DEF.DEPLOYMENT_ID_)
+      and KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
   
   <select id="selectCaseDefinitionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="caseDefinitionResultMap">
     select *
     from ${prefix}ACT_CMMN_CASEDEF 
-    where KEY_ = #{parameter.caseDefinitionKey} and VERSION_ = #{parameter.caseDefinitionVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.caseDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.caseDefinitionVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
   <select id="selectCaseDefinitionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="caseDefinitionResultMap">
     select *
     from ${prefix}ACT_CMMN_CASEDEF 
-    where KEY_ = #{parameter.caseDefinitionKey} and VERSION_ = #{parameter.caseDefinitionVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.caseDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.caseDefinitionVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectLatestCaseDefinitionByKey" parameterType="string" resultMap="caseDefinitionResultMap">
     select *
     from ${prefix}ACT_CMMN_CASEDEF 
-    where KEY_ = #{key} and
+    where KEY_ = #{key, jdbcType=VARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_CMMN_CASEDEF where KEY_ = #{caseDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_CMMN_CASEDEF where KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
   
   <select id="selectLatestCaseDefinitionByKeyAndTenantId" parameterType="map" resultMap="caseDefinitionResultMap">
     select *
     from ${prefix}ACT_CMMN_CASEDEF 
-    where KEY_ = #{caseDefinitionKey} and
-          TENANT_ID_ = #{tenantId} and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_CMMN_CASEDEF where KEY_ = #{caseDefinitionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=VARCHAR} and
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_CMMN_CASEDEF where KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR})
   </select>
   
   <select id="selectCaseDefinitionsByQueryCriteria" parameterType="org.flowable.cmmn.engine.impl.repository.CaseDefinitionQueryImpl" resultMap="caseDefinitionResultMap">
@@ -181,78 +181,78 @@
     from ${prefix}ACT_CMMN_CASEDEF RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase}${wildcardEscapeClause})
+        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause})
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}${wildcardEscapeClause}
+        and RES.KEY_ like #{keyLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=VARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}${wildcardEscapeClause}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="parentDeploymentId != null">
-          and EXISTS (select 1 from ${prefix}ACT_CMMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = RES.DEPLOYMENT_ID_)
+          and EXISTS (select 1 from ${prefix}ACT_CMMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR} and D.ID_ = RES.DEPLOYMENT_ID_)
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}ACT_CMMN_CASEDEF where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
              </if>
              <if test="withoutTenantId">
                and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -263,10 +263,10 @@
         )
       </if>
        <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -275,7 +275,7 @@
           AND
           <trim prefix="(" prefixOverrides="OR" suffix=")">
              <if test="authorizationUserId != null">
-                 exists (select ID_  from ${prefix}ACT_RU_IDENTITYLINK  IDN where IDN.SCOPE_DEFINITION_ID_ = RES.ID_ and IDN.SCOPE_TYPE_ = 'cmmn' and IDN.USER_ID_ = #{authorizationUserId})
+                 exists (select ID_  from ${prefix}ACT_RU_IDENTITYLINK  IDN where IDN.SCOPE_DEFINITION_ID_ = RES.ID_ and IDN.SCOPE_TYPE_ = 'cmmn' and IDN.USER_ID_ = #{authorizationUserId, jdbcType=NVARCHAR})
              </if>
               <if test="authorizationGroups != null &amp;&amp; !authorizationGroups.empty">
                   OR exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK  IDN where IDN.SCOPE_DEFINITION_ID_ = RES.ID_ and IDN.SCOPE_TYPE_ = 'cmmn' and 
@@ -285,9 +285,9 @@
                         or
                         </if>
                         IDN.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="authorizationGroupListItem"
+                        <foreach item="authorizationGroup" index="index" collection="authorizationGroupListItem"
                               open="(" separator="," close=")">
-                          #{group}
+                          #{authorizationGroup, jdbcType=NVARCHAR}
                         </foreach>
                     </foreach>
                     )
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml
index fed9c045473..cf8be50c10f 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml
@@ -6,23 +6,23 @@
 
     <insert id="insertCaseInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntityImpl">
         insert into ${prefix}ACT_CMMN_RU_CASE_INST (ID_, REV_, PARENT_ID_, CASE_DEF_ID_, BUSINESS_KEY_, NAME_, STATE_, START_TIME_, START_USER_ID_, LAST_REACTIVATION_TIME_, LAST_REACTIVATION_USER_ID_, CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, IS_COMPLETEABLE_, TENANT_ID_, BUSINESS_STATUS_) values (
-            #{id ,jdbcType=VARCHAR},
-            1, #{parentId ,jdbcType=VARCHAR},
-            #{caseDefinitionId ,jdbcType=VARCHAR},
-            #{businessKey ,jdbcType=VARCHAR},
-            #{name ,jdbcType=VARCHAR},
-            #{state ,jdbcType=VARCHAR},
-            #{startTime ,jdbcType=TIMESTAMP},
-            #{startUserId ,jdbcType=VARCHAR},
-            #{lastReactivationTime ,jdbcType=TIMESTAMP},
-            #{lastReactivationUserId ,jdbcType=VARCHAR},
-            #{callbackId ,jdbcType=VARCHAR},
-            #{callbackType ,jdbcType=VARCHAR},
-            #{referenceId ,jdbcType=VARCHAR},
-            #{referenceType ,jdbcType=VARCHAR},
-            #{completeable ,jdbcType=BOOLEAN},
-            #{tenantId ,jdbcType=VARCHAR},
-            #{businessStatus ,jdbcType=VARCHAR}
+            #{id, jdbcType=VARCHAR},
+            1, #{parentId, jdbcType=VARCHAR},
+            #{caseDefinitionId, jdbcType=VARCHAR},
+            #{businessKey, jdbcType=VARCHAR},
+            #{name, jdbcType=VARCHAR},
+            #{state, jdbcType=VARCHAR},
+            #{startTime, jdbcType=TIMESTAMP},
+            #{startUserId, jdbcType=VARCHAR},
+            #{lastReactivationTime, jdbcType=TIMESTAMP},
+            #{lastReactivationUserId, jdbcType=VARCHAR},
+            #{callbackId, jdbcType=VARCHAR},
+            #{callbackType, jdbcType=VARCHAR},
+            #{referenceId, jdbcType=VARCHAR},
+            #{referenceType, jdbcType=VARCHAR},
+            #{completeable, jdbcType=BOOLEAN},
+            #{tenantId, jdbcType=VARCHAR},
+            #{businessStatus, jdbcType=VARCHAR}
         )
     </insert>
 
@@ -31,23 +31,23 @@
         values
         <foreach collection="list" item="caseInstance" index="index" separator=",">
             (
-                #{caseInstance.id ,jdbcType=VARCHAR},
-                1, #{caseInstance.parentId ,jdbcType=VARCHAR},
-                #{caseInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{caseInstance.businessKey ,jdbcType=VARCHAR},
-                #{caseInstance.name ,jdbcType=VARCHAR},
-                #{caseInstance.state ,jdbcType=VARCHAR},
-                #{caseInstance.startTime ,jdbcType=TIMESTAMP},
-                #{caseInstance.startUserId ,jdbcType=VARCHAR},
-                #{caseInstance.lastReactivationTime ,jdbcType=TIMESTAMP},
-                #{caseInstance.lastReactivationUserId ,jdbcType=VARCHAR},
+                #{caseInstance.id, jdbcType=VARCHAR},
+                1, #{caseInstance.parentId, jdbcType=VARCHAR},
+                #{caseInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{caseInstance.businessKey, jdbcType=VARCHAR},
+                #{caseInstance.name, jdbcType=VARCHAR},
+                #{caseInstance.state, jdbcType=VARCHAR},
+                #{caseInstance.startTime, jdbcType=TIMESTAMP},
+                #{caseInstance.startUserId, jdbcType=VARCHAR},
+                #{caseInstance.lastReactivationTime, jdbcType=TIMESTAMP},
+                #{caseInstance.lastReactivationUserId, jdbcType=VARCHAR},
                 #{caseInstance.callbackId, jdbcType=VARCHAR},
                 #{caseInstance.callbackType, jdbcType=VARCHAR},
-                #{caseInstance.referenceId ,jdbcType=VARCHAR},
-                #{caseInstance.referenceType ,jdbcType=VARCHAR},
+                #{caseInstance.referenceId, jdbcType=VARCHAR},
+                #{caseInstance.referenceType, jdbcType=VARCHAR},
                 #{caseInstance.completeable, jdbcType=BOOLEAN},
-                #{caseInstance.tenantId ,jdbcType=VARCHAR},
-                #{caseInstance.businessStatus ,jdbcType=VARCHAR}
+                #{caseInstance.tenantId, jdbcType=VARCHAR},
+                #{caseInstance.businessStatus, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
@@ -57,23 +57,23 @@
         <foreach collection="list" item="caseInstance" index="index">
             into ${prefix}ACT_CMMN_RU_CASE_INST (ID_, REV_, PARENT_ID_, CASE_DEF_ID_, BUSINESS_KEY_, NAME_, STATE_, START_TIME_, START_USER_ID_, LAST_REACTIVATION_TIME_, LAST_REACTIVATION_USER_ID_, CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, IS_COMPLETEABLE_, TENANT_ID_, BUSINESS_STATUS_) VALUES
             (
-                #{caseInstance.id ,jdbcType=VARCHAR},
-                1, #{caseInstance.parentId ,jdbcType=VARCHAR},
-                #{caseInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{caseInstance.businessKey ,jdbcType=VARCHAR},
-                #{caseInstance.name ,jdbcType=VARCHAR},
-                #{caseInstance.state ,jdbcType=VARCHAR},
-                #{caseInstance.startTime ,jdbcType=TIMESTAMP},
-                #{caseInstance.startUserId ,jdbcType=VARCHAR},
-                #{caseInstance.lastReactivationTime ,jdbcType=TIMESTAMP},
-                #{caseInstance.lastReactivationUserId ,jdbcType=VARCHAR},
+                #{caseInstance.id, jdbcType=VARCHAR},
+                1, #{caseInstance.parentId, jdbcType=VARCHAR},
+                #{caseInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{caseInstance.businessKey, jdbcType=VARCHAR},
+                #{caseInstance.name, jdbcType=VARCHAR},
+                #{caseInstance.state, jdbcType=VARCHAR},
+                #{caseInstance.startTime, jdbcType=TIMESTAMP},
+                #{caseInstance.startUserId, jdbcType=VARCHAR},
+                #{caseInstance.lastReactivationTime, jdbcType=TIMESTAMP},
+                #{caseInstance.lastReactivationUserId, jdbcType=VARCHAR},
                 #{caseInstance.callbackId, jdbcType=VARCHAR},
                 #{caseInstance.callbackType, jdbcType=VARCHAR},
-                #{caseInstance.referenceId ,jdbcType=VARCHAR},
-                #{caseInstance.referenceType ,jdbcType=VARCHAR},
+                #{caseInstance.referenceId, jdbcType=VARCHAR},
+                #{caseInstance.referenceType, jdbcType=VARCHAR},
                 #{caseInstance.completeable, jdbcType=BOOLEAN},
-                #{caseInstance.tenantId ,jdbcType=VARCHAR},
-                #{caseInstance.businessStatus ,jdbcType=VARCHAR}
+                #{caseInstance.tenantId, jdbcType=VARCHAR},
+                #{caseInstance.businessStatus, jdbcType=VARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -123,7 +123,7 @@
                 REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.completeable != completeable">
-                IS_COMPLETEABLE_ = #{completeable, jdbcType=VARCHAR},
+                IS_COMPLETEABLE_ = #{completeable, jdbcType=BOOLEAN},
             </if>
             <if test="originalPersistentState.tenantId != tenantId">
                 TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
@@ -140,7 +140,7 @@
         set
           LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
           LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}
-        where ID_ = #{id}
+        where ID_ = #{id, jdbcType=VARCHAR}
           and (LOCK_TIME_ is null OR LOCK_TIME_ &lt; #{expirationTime, jdbcType=TIMESTAMP})
     </update>
 
@@ -149,7 +149,7 @@
         set
             LOCK_TIME_ = null,
             LOCK_OWNER_ = null
-        where ID_ = #{id}
+        where ID_ = #{id, jdbcType=VARCHAR}
     </update>
 
     <update id="clearAllCaseInstanceLockTimes" parameterType="java.util.Map">
@@ -161,7 +161,7 @@
     </update>
 
     <delete id="deleteCaseInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntityImpl">
-        delete from ${prefix}ACT_CMMN_RU_CASE_INST where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_CMMN_RU_CASE_INST where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <resultMap id="caseInstanceResultMap" type="org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntityImpl">
@@ -206,21 +206,21 @@
     <resultMap id="caseInstanceResultMapWithVariables" type="org.flowable.cmmn.engine.impl.persistence.entity.CaseInstanceEntityImpl" extends="caseInstanceResultMap">
         <collection property="queryVariables" column="SCOPE_ID_" javaType="ArrayList"
                     ofType="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-            <id property="id" column="VAR_ID_"/>
-            <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR"/>
-            <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR"/>
+            <id property="id" column="VAR_ID_" jdbcType="NVARCHAR"/>
+            <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR"/>
+            <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR"/>
             <result property="revision" column="VAR_REV_" jdbcType="INTEGER"/>
-            <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR"/>
-            <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR"/>
-            <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR"/>
-            <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="VARCHAR"/>
-            <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-            <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="VARCHAR"/>
-            <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+            <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR"/>
+            <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR"/>
+            <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR"/>
+            <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="NVARCHAR"/>
+            <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+            <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+            <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
             <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
             <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE"/>
-            <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR"/>
-            <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR"/>
+            <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR"/>
+            <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR"/>
             <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT"/>
         </collection>
     </resultMap>
@@ -348,56 +348,56 @@
     <sql id="commonSelectCaseInstancesByQueryCriteriaSql">
         <where>
             <if test="caseInstanceId != null">
-                and RES.ID_ = #{caseInstanceId}
+                and RES.ID_ = #{caseInstanceId, jdbcType=VARCHAR}
             </if>
             <if test="caseInstanceIds != null">
                 and RES.ID_ IN
                 <foreach item="caseInstanceId" index="index" collection="caseInstanceIds" open="(" separator="," close=")">
-                    #{caseInstanceId}
+                    #{caseInstanceId, jdbcType=VARCHAR}
                 </foreach>
             </if>
             <if test="caseDefinitionId != null">
-                and RES.CASE_DEF_ID_ = #{caseDefinitionId}
+                and RES.CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionKey != null">
-                and CASE_DEF.KEY_ = #{caseDefinitionKey}
+                and CASE_DEF.KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionIds != null">
                 and RES.CASE_DEF_ID_ IN
                 <foreach item="caseDefinitionId" index="index" collection="caseDefinitionIds" open="(" separator="," close=")">
-                    #{caseDefinitionId}
+                    #{caseDefinitionId, jdbcType=VARCHAR}
                 </foreach>
             </if>
             <if test="caseDefinitionKeys != null">
                 and CASE_DEF.KEY_ IN
                 <foreach item="caseDefinitionKey" index="index" collection="caseDefinitionKeys" open="(" separator="," close=")">
-                    #{caseDefinitionKey}
+                    #{caseDefinitionKey, jdbcType=VARCHAR}
                 </foreach>
             </if>
             <if test="caseDefinitionCategory != null">
-                and CASE_DEF.CATEGORY_ = #{caseDefinitionCategory}
+                and CASE_DEF.CATEGORY_ = #{caseDefinitionCategory, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionName != null">
-                and CASE_DEF.NAME_ = #{caseDefinitionName}
+                and CASE_DEF.NAME_ = #{caseDefinitionName, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionVersion != null">
-                and CASE_DEF.VERSION_ = #{caseDefinitionVersion}
+                and CASE_DEF.VERSION_ = #{caseDefinitionVersion, jdbcType=INTEGER}
             </if>
             <if test="caseInstanceParentId != null">
-                and RES.PARENT_ID_ = #{caseInstanceParentId}
+                and RES.PARENT_ID_ = #{caseInstanceParentId, jdbcType=VARCHAR}
             </if>
             <if test="name != null">
-                and RES.NAME_ = #{name}
+                and RES.NAME_ = #{name, jdbcType=VARCHAR}
             </if>
             <if test="nameLike != null">
-                and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+                and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
             </if>
             <if test="nameLikeIgnoreCase != null">
-                and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase})${wildcardEscapeClause}
+                and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=VARCHAR})${wildcardEscapeClause}
             </if>
             <if test="parentScopeId != null">
                 and EXISTS(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
-                    LINK.SCOPE_ID_ = #{parentScopeId}
+                    LINK.SCOPE_ID_ = #{parentScopeId, jdbcType=NVARCHAR}
                     and LINK.REF_SCOPE_ID_ = RES.ID_
                     and LINK.HIERARCHY_TYPE_ = 'parent'
                 )
@@ -405,76 +405,76 @@
             <if test="rootScopeId != null">
                 and exists(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
                     LINK.REF_SCOPE_ID_ = RES.ID_
-                    and LINK.ROOT_SCOPE_ID_ = #{rootScopeId}
+                    and LINK.ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR}
                 )
             </if>
             <if test="businessKey != null">
-                and RES.BUSINESS_KEY_ = #{businessKey}
+                and RES.BUSINESS_KEY_ = #{businessKey, jdbcType=VARCHAR}
             </if>
             <if test="businessStatus != null">
-                and RES.BUSINESS_STATUS_ = #{businessStatus}
+                and RES.BUSINESS_STATUS_ = #{businessStatus, jdbcType=VARCHAR}
             </if>
             <if test="startedBefore != null">
-                and RES.START_TIME_ &lt;= #{startedBefore}
+                and RES.START_TIME_ &lt;= #{startedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="startedAfter != null">
-                and RES.START_TIME_ &gt;= #{startedAfter}
+                and RES.START_TIME_ &gt;= #{startedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="startedBy != null">
-                and RES.START_USER_ID_ = #{startedBy}
+                and RES.START_USER_ID_ = #{startedBy, jdbcType=VARCHAR}
             </if>
             <if test="state != null">
-                and RES.STATE_ = #{state}
+                and RES.STATE_ = #{state, jdbcType=VARCHAR}
             </if>
             <if test="lastReactivatedBefore != null">
-                and RES.LAST_REACTIVATION_TIME_ &lt;= #{lastReactivatedBefore}
+                and RES.LAST_REACTIVATION_TIME_ &lt;= #{lastReactivatedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastReactivatedAfter != null">
-                and RES.LAST_REACTIVATION_TIME_ &gt;= #{lastReactivatedAfter}
+                and RES.LAST_REACTIVATION_TIME_ &gt;= #{lastReactivatedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastReactivatedBy != null">
-                and RES.LAST_REACTIVATION_USER_ID_ = #{lastReactivatedBy}
+                and RES.LAST_REACTIVATION_USER_ID_ = #{lastReactivatedBy, jdbcType=VARCHAR}
             </if>
             <if test="callbackId != null">
-                and RES.CALLBACK_ID_ = #{callbackId}
+                and RES.CALLBACK_ID_ = #{callbackId, jdbcType=VARCHAR}
             </if>
             <if test="callbackType != null">
-                and RES.CALLBACK_TYPE_ = #{callbackType}
+                and RES.CALLBACK_TYPE_ = #{callbackType, jdbcType=VARCHAR}
             </if>
             <if test="referenceId != null">
-                and RES.REFERENCE_ID_ = #{referenceId}
+                and RES.REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR}
             </if>
             <if test="referenceType != null">
-                and RES.REFERENCE_TYPE_ = #{referenceType}
+                and RES.REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR}
             </if>
             <if test="completeable">
                 and RES.IS_COMPLETEABLE_ = #{completeable, jdbcType=BOOLEAN}
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ is null or RES.TENANT_ID_ = '')
             </if>
             <if test="activePlanItemDefinitionId != null">
-                and EXISTS(select ID_ from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST P where P.CASE_INST_ID_ = RES.ID_ and P.ITEM_DEFINITION_ID_ = #{activePlanItemDefinitionId} and P.STATE_ = 'active')
+                and EXISTS(select ID_ from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST P where P.CASE_INST_ID_ = RES.ID_ and P.ITEM_DEFINITION_ID_ = #{activePlanItemDefinitionId, jdbcType=VARCHAR} and P.STATE_ = 'active')
             </if>
             <if test="activePlanItemDefinitionIds != null">
                 and EXISTS(select ID_ from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST P where P.CASE_INST_ID_ = RES.ID_ and P.ITEM_DEFINITION_ID_ in
                 <foreach item="activePlanItemDefinitionId" index="index" collection="activePlanItemDefinitionIds" open="(" separator="," close=")">
-                    #{activePlanItemDefinitionId}
+                    #{activePlanItemDefinitionId, jdbcType=VARCHAR}
                 </foreach>
                 and P.STATE_ = 'active')
             </if>
             <if test="involvedUser != null">
-                and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and I.USER_ID_ = #{involvedUser})
+                and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and I.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR})
             </if>
             <if test="involvedUserIdentityLink != null">
             	and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-            	I.USER_ID_ = #{involvedUserIdentityLink.userId} and I.TYPE_ = #{involvedUserIdentityLink.type})
+            	I.USER_ID_ = #{involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedUserIdentityLink.type, jdbcType=NVARCHAR})
         	</if>
             <if test="involvedGroups != null">
                 and EXISTS(
@@ -485,9 +485,9 @@
                         or
                         </if>
                         I.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="involvedGroupListItem"
+                        <foreach item="involvedGroup" index="index" collection="involvedGroupListItem"
                               open="(" separator="," close=")">
-                          #{group}
+                          #{involvedGroup, jdbcType=NVARCHAR}
                         </foreach>
                     </foreach>
                     )
@@ -495,15 +495,15 @@
             </if>
             <if test="involvedGroupIdentityLink != null">
 	            and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-	            I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId} and I.TYPE_ = #{involvedGroupIdentityLink.type})
+	            I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
 	        </if>
             <foreach collection="queryVariableValues" index="index" item="queryVariableValue">
                 <choose>
                     <when test="queryVariableValue.operator.equals('EXISTS')">
-                      and EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
+                      and EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                     </when>
                     <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
-                      and NOT EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
+                      and NOT EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                     </when>
                     <otherwise>
                         and exists (
@@ -515,10 +515,10 @@
                                 and V.SCOPE_TYPE_ = 'cmmn'
                                 <if test="queryVariableValue.name != null">
                                     <!-- Match-all variable-names when name is null -->
-                                    and V.NAME_= #{queryVariableValue.name}
+                                    and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                                 </if>
                                 <if test="queryVariableValue.needsTypeCheck()">
-                                    and V.TYPE_ = #{queryVariableValue.type}
+                                    and V.TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                                 </if>
                                 <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                                     <choose>
@@ -533,7 +533,7 @@
                                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                         <otherwise><include refid="variableOperator" /></otherwise>
                                     </choose>
-                                    #{queryVariableValue.textValue}
+                                    #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                                     <choose>
                                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                                     </choose>
@@ -548,7 +548,7 @@
                                         <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                         <otherwise><include refid="variableOperator" /></otherwise>
                                     </choose>
-                                    #{queryVariableValue.textValue2}
+                                    #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                                     <choose>
                                         <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                     </choose>
@@ -556,7 +556,7 @@
                                 <if test="queryVariableValue.longValue != null">
                                     and (V.LONG_
                                     <include refid="variableOperator" />
-                                    #{queryVariableValue.longValue}
+                                    #{queryVariableValue.longValue, jdbcType=BIGINT}
                                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                         or V.LONG_ is null
                                     </if>
@@ -565,7 +565,7 @@
                                 <if test="queryVariableValue.doubleValue != null">
                                     and (V.DOUBLE_
                                     <include refid="variableOperator" />
-                                    #{queryVariableValue.doubleValue}
+                                    #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                         or V.DOUBLE_ is null
                                     </if>
@@ -594,121 +594,121 @@
                 <trim prefix="(" prefixOverrides="OR" suffix=")">
 
                     <if test="orQueryObject.caseInstanceId != null">
-                        or RES.ID_ = #{orQueryObject.caseInstanceId}
+                        or RES.ID_ = #{orQueryObject.caseInstanceId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseInstanceIds != null">
                         or RES.ID_ IN
                         <foreach item="caseInstanceId" index="index" collection="orQueryObject.caseInstanceIds" open="(" separator="," close=")">
-                            #{caseInstanceId}
+                            #{caseInstanceId, jdbcType=VARCHAR}
                         </foreach>
                     </if>
                     <if test="orQueryObject.caseDefinitionId != null">
-                        or RES.CASE_DEF_ID_ = #{orQueryObject.caseDefinitionId}
+                        or RES.CASE_DEF_ID_ = #{orQueryObject.caseDefinitionId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionKey != null">
-                        or CASE_DEF.KEY_ = #{orQueryObject.caseDefinitionKey}
+                        or CASE_DEF.KEY_ = #{orQueryObject.caseDefinitionKey, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionIds != null">
                         or RES.CASE_DEF_ID_ IN
                         <foreach item="caseDefinitionId" index="index" collection="orQueryObject.caseDefinitionIds" open="(" separator="," close=")">
-                            #{caseDefinitionId}
+                            #{caseDefinitionId, jdbcType=VARCHAR}
                         </foreach>
                     </if>
                     <if test="orQueryObject.caseDefinitionKeys != null">
                         or CASE_DEF.KEY_ IN
                         <foreach item="caseDefinitionKey" index="index" collection="orQueryObject.caseDefinitionKeys" open="(" separator="," close=")">
-                            #{caseDefinitionKey}
+                            #{caseDefinitionKey, jdbcType=VARCHAR}
                         </foreach>
                     </if>
                     <if test="orQueryObject.caseDefinitionCategory != null">
-                        or CASE_DEF.CATEGORY_ = #{orQueryObject.caseDefinitionCategory}
+                        or CASE_DEF.CATEGORY_ = #{orQueryObject.caseDefinitionCategory, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionName != null">
-                        or CASE_DEF.NAME_ = #{orQueryObject.caseDefinitionName}
+                        or CASE_DEF.NAME_ = #{orQueryObject.caseDefinitionName, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionVersion != null">
-                        or CASE_DEF.VERSION_ = #{orQueryObject.caseDefinitionVersion}
+                        or CASE_DEF.VERSION_ = #{orQueryObject.caseDefinitionVersion, jdbcType=INTEGER}
                     </if>
                     <if test="orQueryObject.caseInstanceParentId != null">
-                        or RES.PARENT_ID_ = #{orQueryObject.caseInstanceParentId}
+                        or RES.PARENT_ID_ = #{orQueryObject.caseInstanceParentId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.name != null">
-                        or RES.NAME_ = #{orQueryObject.name}
+                        or RES.NAME_ = #{orQueryObject.name, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.nameLike != null">
-                        or RES.NAME_ like #{orQueryObject.nameLike}${wildcardEscapeClause}
+                        or RES.NAME_ like #{orQueryObject.nameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
                     </if>
                     <if test="orQueryObject.nameLikeIgnoreCase != null">
-                        or lower(RES.NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase})${wildcardEscapeClause}
+                        or lower(RES.NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase, jdbcType=VARCHAR})${wildcardEscapeClause}
                     </if>
                     <if test="orQueryObject.businessKey != null">
-                        or RES.BUSINESS_KEY_ = #{orQueryObject.businessKey}
+                        or RES.BUSINESS_KEY_ = #{orQueryObject.businessKey, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.businessStatus != null">
-                        or RES.BUSINESS_STATUS_ = #{orQueryObject.businessStatus}
+                        or RES.BUSINESS_STATUS_ = #{orQueryObject.businessStatus, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.startedBefore != null">
-                        or RES.START_TIME_ &lt;= #{orQueryObject.startedBefore}
+                        or RES.START_TIME_ &lt;= #{orQueryObject.startedBefore, jdbcType=TIMESTAMP}
                     </if>
                     <if test="orQueryObject.startedAfter != null">
-                        or RES.START_TIME_ &gt;= #{orQueryObject.startedAfter}
+                        or RES.START_TIME_ &gt;= #{orQueryObject.startedAfter, jdbcType=TIMESTAMP}
                     </if>
                     <if test="orQueryObject.startedBy != null">
-                        or RES.START_USER_ID_ = #{orQueryObject.startedBy}
+                        or RES.START_USER_ID_ = #{orQueryObject.startedBy, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.state != null">
-                        or RES.STATE_ = #{orQueryObject.state}
+                        or RES.STATE_ = #{orQueryObject.state, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.lastReactivatedBefore != null">
-                        or RES.LAST_REACTIVATED_TIME_ &lt;= #{lastReactivatedBefore}
+                        or RES.LAST_REACTIVATED_TIME_ &lt;= #{lastReactivatedBefore, jdbcType=TIMESTAMP}
                     </if>
                     <if test="orQueryObject.lastReactivatedAfter != null">
-                        or RES.LAST_REACTIVATED_TIME_ &gt;= #{lastReactivatedAfter}
+                        or RES.LAST_REACTIVATED_TIME_ &gt;= #{lastReactivatedAfter, jdbcType=TIMESTAMP}
                     </if>
                     <if test="orQueryObject.lastReactivatedBy != null">
-                        or RES.LAST_REACTIVATED_USER_ID_ = #{lastReactivatedBy}
+                        or RES.LAST_REACTIVATED_USER_ID_ = #{lastReactivatedBy, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.callbackId != null">
-                        or RES.CALLBACK_ID_ = #{orQueryObject.callbackId}
+                        or RES.CALLBACK_ID_ = #{orQueryObject.callbackId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.callbackType != null">
-                        or RES.CALLBACK_TYPE_ = #{orQueryObject.callbackType}
+                        or RES.CALLBACK_TYPE_ = #{orQueryObject.callbackType, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.referenceId != null">
-                        or RES.REFERENCE_ID_ = #{orQueryObject.referenceId}
+                        or RES.REFERENCE_ID_ = #{orQueryObject.referenceId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.referenceType != null">
-                        or RES.REFERENCE_TYPE_ = #{orQueryObject.referenceType}
+                        or RES.REFERENCE_TYPE_ = #{orQueryObject.referenceType, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.completeable">
                         or RES.IS_COMPLETEABLE_ = #{orQueryObject.completeable, jdbcType=BOOLEAN}
                     </if>
                     <if test="orQueryObject.tenantId != null">
-                        or RES.TENANT_ID_ = #{orQueryObject.tenantId}
+                        or RES.TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.tenantIdLike != null">
-                        or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike}
+                        or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.withoutTenantId">
                         or (RES.TENANT_ID_ is null or RES.TENANT_ID_ = '')
                     </if>
                     <if test="orQueryObject.activePlanItemDefinitionId != null">
-		                or EXISTS(select ID_ from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST P where P.CASE_INST_ID_ = RES.ID_ and P.ITEM_DEFINITION_ID_ = #{orQueryObject.activePlanItemDefinitionId} and P.STATE_ = 'active')
+		                or EXISTS(select ID_ from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST P where P.CASE_INST_ID_ = RES.ID_ and P.ITEM_DEFINITION_ID_ = #{orQueryObject.activePlanItemDefinitionId, jdbcType=VARCHAR} and P.STATE_ = 'active')
 		            </if>
 		            <if test="orQueryObject.activePlanItemDefinitionIds != null">
 		                or EXISTS(select ID_ from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST P where P.CASE_INST_ID_ = RES.ID_ and P.ITEM_DEFINITION_ID_ in
 		                <foreach item="activePlanItemDefinitionId" index="index" collection="orQueryObject.activePlanItemDefinitionIds" open="(" separator="," close=")">
-		                    #{activePlanItemDefinitionId}
+		                    #{activePlanItemDefinitionId, jdbcType=VARCHAR}
 		                </foreach>
 		                and P.STATE_ = 'active')
 		            </if>
                     <if test="orQueryObject.involvedUser != null">
                         or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and I.USER_ID_ =
-                        #{orQueryObject.involvedUser})
+                        #{orQueryObject.involvedUser, jdbcType=NVARCHAR})
                     </if>
                     <if test="orQueryObject.involvedUserIdentityLink != null">
 			            or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-			            I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type})
+			            I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type, jdbcType=NVARCHAR})
 			        </if>
                     <if test="orQueryObject.involvedGroups != null">
                         or EXISTS(
@@ -719,9 +719,9 @@
                                 or
                                 </if>
                                 I.GROUP_ID_ IN
-                                <foreach item="group" index="index" collection="involvedGroupListItem"
+                                <foreach item="involvedGroup" index="index" collection="involvedGroupListItem"
                                       open="(" separator="," close=")">
-                                  #{group}
+                                  #{involvedGroup, jdbcType=NVARCHAR}
                                 </foreach>
                             </foreach>
                             )
@@ -729,11 +729,11 @@
                     </if>
 					<if test="orQueryObject.involvedGroupIdentityLink != null">
 			            or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.SCOPE_ID_ = RES.ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-			            I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type})
+			            I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
 			        </if>
                     <if test="orQueryObject.parentScopeId != null">
                         or EXISTS(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
-                            LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId}
+                            LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId, jdbcType=NVARCHAR}
                             and LINK.REF_SCOPE_ID_ = RES.ID_
                             and LINK.HIERARCHY_TYPE_ = 'parent'
                         )
@@ -741,7 +741,7 @@
                     <if test="orQueryObject.rootScopeId != null">
                         or exists(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
                             LINK.REF_SCOPE_ID_ = RES.ID_
-                            and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId}
+                            and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId, jdbcType=NVARCHAR}
                         )
                     </if>
                     <foreach collection="orQueryObject.queryVariableValues" index="index" item="queryVariableValue">
@@ -749,12 +749,12 @@
                         <trim prefix="(" prefixOverrides="AND" suffix=")">
                             <choose>
                                 <when test="queryVariableValue.operator.equals('EXISTS')">
-                                    and EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and
+                                    and EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and
                                     SUB_SCOPE_ID_
                                     is null and SCOPE_TYPE_ = 'cmmn')
                                 </when>
                                 <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
-                                    and NOT EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_
+                                    and NOT EXISTS (select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_
                                     and
                                     SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                                 </when>
@@ -768,10 +768,10 @@
                                             and V.SCOPE_TYPE_ = 'cmmn'
                                             <if test="queryVariableValue.name != null">
                                                 <!-- Match-all variable-names when name is null -->
-                                                and V.NAME_= #{queryVariableValue.name}
+                                                and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                                             </if>
                                             <if test="queryVariableValue.needsTypeCheck()">
-                                                and V.TYPE_ = #{queryVariableValue.type}
+                                                and V.TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                                             </if>
                                             <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                                                 <choose>
@@ -790,7 +790,7 @@
                                                         <include refid="variableOperator"/>
                                                     </otherwise>
                                                 </choose>
-                                                #{queryVariableValue.textValue}
+                                                #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                                                 <choose>
                                                     <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">
                                                         ${wildcardEscapeClause}
@@ -809,7 +809,7 @@
                                                         <include refid="variableOperator"/>
                                                     </otherwise>
                                                 </choose>
-                                                #{queryVariableValue.textValue2}
+                                                #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                                                 <choose>
                                                     <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                                 </choose>
@@ -817,7 +817,7 @@
                                             <if test="queryVariableValue.longValue != null">
                                                 and (V.LONG_
                                                 <include refid="variableOperator"/>
-                                                #{queryVariableValue.longValue}
+                                                #{queryVariableValue.longValue, jdbcType=BIGINT}
                                                 <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                                     or V.LONG_ is null
                                                 </if>
@@ -826,7 +826,7 @@
                                             <if test="queryVariableValue.doubleValue != null">
                                                 and (V.DOUBLE_
                                                 <include refid="variableOperator"/>
-                                                #{queryVariableValue.doubleValue}
+                                                #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                                                 <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                                     or V.DOUBLE_ is null
                                                 </if>
@@ -861,7 +861,7 @@
     </sql>
 
     <select id="selectCaseInstancesByCaseDefinitionId" resultMap="caseInstanceResultMap">
-        select * from ${prefix}ACT_CMMN_RU_CASE_INST where CASE_DEF_ID_ = #{parameter}
+        select * from ${prefix}ACT_CMMN_RU_CASE_INST where CASE_DEF_ID_ = #{parameter, jdbcType=VARCHAR}
     </select>
 
     <sql id="variableOperator">
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnDeployment.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnDeployment.xml
index c10144b9b1a..0653777aec5 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnDeployment.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnDeployment.xml
@@ -22,31 +22,31 @@
   <insert id="bulkInsertCmmnDeployment" parameterType="java.util.List">
         insert into ${prefix}ACT_CMMN_DEPLOYMENT(ID_, NAME_, CATEGORY_, KEY_, TENANT_ID_, DEPLOY_TIME_, PARENT_DEPLOYMENT_ID_)
         values
-        <foreach collection="list" item="deployment" index="index" separator=",">
+        <foreach collection="list" item="cmmnDeployment" index="index" separator=",">
             (
-                #{deployment.id, jdbcType=VARCHAR},
-                #{deployment.name, jdbcType=VARCHAR},
-                #{deployment.category, jdbcType=VARCHAR},
-                #{deployment.key, jdbcType=VARCHAR},
-                #{deployment.tenantId, jdbcType=VARCHAR},
-                #{deployment.deploymentTime, jdbcType=TIMESTAMP},
-                #{deployment.parentDeploymentId, jdbcType=VARCHAR}
+                #{cmmnDeployment.id, jdbcType=VARCHAR},
+                #{cmmnDeployment.name, jdbcType=VARCHAR},
+                #{cmmnDeployment.category, jdbcType=VARCHAR},
+                #{cmmnDeployment.key, jdbcType=VARCHAR},
+                #{cmmnDeployment.tenantId, jdbcType=VARCHAR},
+                #{cmmnDeployment.deploymentTime, jdbcType=TIMESTAMP},
+                #{cmmnDeployment.parentDeploymentId, jdbcType=VARCHAR}
             )
         </foreach>
   </insert>
   
   <insert id="bulkInsertCmmnDeployment" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="deployment" index="index">
+        <foreach collection="list" item="cmmnDeployment" index="index">
             into ${prefix}ACT_CMMN_DEPLOYMENT(ID_, NAME_, CATEGORY_, KEY_, TENANT_ID_, DEPLOY_TIME_, PARENT_DEPLOYMENT_ID_) values
             (
-                #{deployment.id, jdbcType=VARCHAR},
-                #{deployment.name, jdbcType=VARCHAR},
-                #{deployment.category, jdbcType=VARCHAR},
-                #{deployment.key, jdbcType=VARCHAR},
-                #{deployment.tenantId, jdbcType=VARCHAR},
-                #{deployment.deploymentTime, jdbcType=TIMESTAMP},
-                #{deployment.parentDeploymentId, jdbcType=VARCHAR}
+                #{cmmnDeployment.id, jdbcType=VARCHAR},
+                #{cmmnDeployment.name, jdbcType=VARCHAR},
+                #{cmmnDeployment.category, jdbcType=VARCHAR},
+                #{cmmnDeployment.key, jdbcType=VARCHAR},
+                #{cmmnDeployment.tenantId, jdbcType=VARCHAR},
+                #{cmmnDeployment.deploymentTime, jdbcType=TIMESTAMP},
+                #{cmmnDeployment.parentDeploymentId, jdbcType=VARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -76,7 +76,7 @@
   <!-- DEPLOYMENT DELETE -->
   
   <delete id="deleteCmmnDeployment" parameterType="string">
-    delete from ${prefix}ACT_CMMN_DEPLOYMENT where ID_ = #{id}
+    delete from ${prefix}ACT_CMMN_DEPLOYMENT where ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <!-- DEPLOYMENT RESULTMAP -->
@@ -94,7 +94,7 @@
   <!-- DEPLOYMENT SELECT -->
 
   <select id="selectCmmnDeploymentsByName" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="cmmnDeploymentResultMap">
-    select * from ${prefix}ACT_CMMN_DEPLOYMENT D where NAME_=#{parameter} order by D.DEPLOY_TIME_ desc
+    select * from ${prefix}ACT_CMMN_DEPLOYMENT D where NAME_= #{parameter, jdbcType=VARCHAR} order by D.DEPLOY_TIME_ desc
   </select>
   
   <select id="selectCmmnDeployment" parameterType="string" resultMap="cmmnDeploymentResultMap">
@@ -118,59 +118,59 @@
     from ${prefix}ACT_CMMN_DEPLOYMENT RES
     <where>
       <if test="deploymentId != null">
-        RES.ID_ = #{deploymentId}
+        RES.ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
         and RES.ID_ IN
         <foreach item="deploymentId" index="index" collection="deploymentIds" 
                  open="(" separator="," close=")">
-          #{deploymentId}
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )  
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="parentDeploymentId != null">
-        and RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId}
+        and RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR}
       </if>
       <if test="parentDeploymentIdLike != null">
-        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike}
+        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike, jdbcType=VARCHAR}
       </if>
       <if test="parentDeploymentIds != null &amp;&amp; !parentDeploymentIds.empty">
         and RES.PARENT_DEPLOYMENT_ID_ IN
         <foreach item="parentDeploymentId" index="index" collection="parentDeploymentIds" 
                  open="(" separator="," close=")">
-          #{parentDeploymentId}
+          #{parentDeploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="latest">
         and RES.DEPLOY_TIME_ = (select max(DEPLOY_TIME_) from ${prefix}ACT_CMMN_DEPLOYMENT where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
              </if>
         )
       </if>
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnResource.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnResource.xml
index cba2c267122..095ad6e2cde 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnResource.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CmmnResource.xml
@@ -13,24 +13,24 @@
 
   <insert id="bulkInsertCmmnResource" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE(ID_, NAME_, RESOURCE_BYTES_, DEPLOYMENT_ID_, GENERATED_) VALUES 
-      <foreach collection="list" item="resource" index="index" separator=","> 
-        (#{resource.id, jdbcType=VARCHAR},
-         #{resource.name, jdbcType=VARCHAR},
-         #{resource.bytes, jdbcType=${blobType}},
-         #{resource.deploymentId, jdbcType=VARCHAR},
-         #{resource.generated, jdbcType=BOOLEAN})
+      <foreach collection="list" item="cmmnResource" index="index" separator=","> 
+        (#{cmmnResource.id, jdbcType=VARCHAR},
+         #{cmmnResource.name, jdbcType=VARCHAR},
+         #{cmmnResource.bytes, jdbcType=${blobType}},
+         #{cmmnResource.deploymentId, jdbcType=VARCHAR},
+         #{cmmnResource.generated, jdbcType=BOOLEAN})
       </foreach>
   </insert>
 
   <insert id="bulkInsertCmmnResource" databaseId="oracle" parameterType="java.util.List">
     INSERT ALL
-      <foreach collection="list" item="resource" index="index"> 
+      <foreach collection="list" item="cmmnResource" index="index"> 
         INTO ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE(ID_, NAME_, RESOURCE_BYTES_, DEPLOYMENT_ID_, GENERATED_) VALUES 
-        (#{resource.id, jdbcType=VARCHAR},
-         #{resource.name, jdbcType=VARCHAR},
-         #{resource.bytes, jdbcType=${blobType}},
-         #{resource.deploymentId, jdbcType=VARCHAR},
-         #{resource.generated, jdbcType=BOOLEAN})
+        (#{cmmnResource.id, jdbcType=VARCHAR},
+         #{cmmnResource.name, jdbcType=VARCHAR},
+         #{cmmnResource.bytes, jdbcType=${blobType}},
+         #{cmmnResource.deploymentId, jdbcType=VARCHAR},
+         #{cmmnResource.generated, jdbcType=BOOLEAN})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -38,7 +38,7 @@
   <!-- RESOURCE DELETE -->
 
   <delete id="deleteCmmnResourcesByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id}
+    delete from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id, jdbcType=VARCHAR}
   </delete>
   
   <!-- RESOURCE RESULTMAP -->
@@ -53,17 +53,17 @@
   <!-- RESOURCE SELECT -->
 
   <select id="selectCmmnResourceNamesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
-    select NAME_ from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select NAME_ from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <select id="selectCmmnResourceByDeploymentIdAndResourceName" parameterType="map" resultMap="cmmnResourceResultMap">
     select * from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-          AND NAME_ = #{resourceName}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+          AND NAME_ = #{name, jdbcType=VARCHAR}
   </select>
 
   <select id="selectCmmnResourcesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="cmmnResourceResultMap">
-    select * from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select * from ${prefix}ACT_CMMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <update id="updateCmmnResource" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.CmmnResourceEntityImpl">
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
index d6c02f0cf0d..1bee6a23ab3 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
@@ -7,23 +7,23 @@
     <insert id="insertHistoricCaseInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntityImpl">
         insert into ${prefix}ACT_CMMN_HI_CASE_INST (ID_, REV_, NAME_, PARENT_ID_, CASE_DEF_ID_, BUSINESS_KEY_, STATE_, START_TIME_, END_TIME_, START_USER_ID_, LAST_REACTIVATION_TIME_, LAST_REACTIVATION_USER_ID_, CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, TENANT_ID_, BUSINESS_STATUS_)
         values (
-            #{id ,jdbcType=VARCHAR},
-            1, #{name ,jdbcType=VARCHAR},
-            #{parentId ,jdbcType=VARCHAR},
-            #{caseDefinitionId ,jdbcType=VARCHAR},
-            #{businessKey ,jdbcType=VARCHAR},
-            #{state ,jdbcType=VARCHAR},
-            #{startTime ,jdbcType=TIMESTAMP},
-            #{endTime ,jdbcType=TIMESTAMP},
-            #{startUserId ,jdbcType=VARCHAR},
-            #{lastReactivationTime ,jdbcType=TIMESTAMP},
-            #{lastReactivationUserId ,jdbcType=VARCHAR},
+            #{id, jdbcType=VARCHAR},
+            1, #{name, jdbcType=VARCHAR},
+            #{parentId, jdbcType=VARCHAR},
+            #{caseDefinitionId, jdbcType=VARCHAR},
+            #{businessKey, jdbcType=VARCHAR},
+            #{state, jdbcType=VARCHAR},
+            #{startTime, jdbcType=TIMESTAMP},
+            #{endTime, jdbcType=TIMESTAMP},
+            #{startUserId, jdbcType=VARCHAR},
+            #{lastReactivationTime, jdbcType=TIMESTAMP},
+            #{lastReactivationUserId, jdbcType=VARCHAR},
             #{callbackId, jdbcType=VARCHAR},
             #{callbackType, jdbcType=VARCHAR},
             #{referenceId, jdbcType=VARCHAR},
             #{referenceType, jdbcType=VARCHAR},
-            #{tenantId ,jdbcType=VARCHAR},
-            #{businessStatus ,jdbcType=VARCHAR}
+            #{tenantId, jdbcType=VARCHAR},
+            #{businessStatus, jdbcType=VARCHAR}
         )
     </insert>
 
@@ -32,23 +32,23 @@
         values
         <foreach collection="list" item="historicCaseInstance" index="index" separator=",">
             (
-                #{historicCaseInstance.id ,jdbcType=VARCHAR},
-                1, #{historicCaseInstance.name ,jdbcType=VARCHAR},
-                #{historicCaseInstance.parentId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.businessKey ,jdbcType=VARCHAR},
-                #{historicCaseInstance.state,jdbcType=VARCHAR},
-                #{historicCaseInstance.startTime ,jdbcType=TIMESTAMP},
-                #{historicCaseInstance.endTime ,jdbcType=TIMESTAMP},
-                #{historicCaseInstance.startUserId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.lastReactivationTime ,jdbcType=TIMESTAMP},
-                #{historicCaseInstance.lastReactivationUserId ,jdbcType=VARCHAR},
+                #{historicCaseInstance.id, jdbcType=VARCHAR},
+                1, #{historicCaseInstance.name, jdbcType=VARCHAR},
+                #{historicCaseInstance.parentId, jdbcType=VARCHAR},
+                #{historicCaseInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{historicCaseInstance.businessKey, jdbcType=VARCHAR},
+                #{historicCaseInstance.state, jdbcType=VARCHAR},
+                #{historicCaseInstance.startTime, jdbcType=TIMESTAMP},
+                #{historicCaseInstance.endTime, jdbcType=TIMESTAMP},
+                #{historicCaseInstance.startUserId, jdbcType=VARCHAR},
+                #{historicCaseInstance.lastReactivationTime, jdbcType=TIMESTAMP},
+                #{historicCaseInstance.lastReactivationUserId, jdbcType=VARCHAR},
                 #{historicCaseInstance.callbackId, jdbcType=VARCHAR},
                 #{historicCaseInstance.callbackType, jdbcType=VARCHAR},
                 #{historicCaseInstance.referenceId, jdbcType=VARCHAR},
                 #{historicCaseInstance.referenceType, jdbcType=VARCHAR},
-                #{historicCaseInstance.tenantId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.businessStatus ,jdbcType=VARCHAR}
+                #{historicCaseInstance.tenantId, jdbcType=VARCHAR},
+                #{historicCaseInstance.businessStatus, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
@@ -58,23 +58,23 @@
         <foreach collection="list" item="historicCaseInstance" index="index">
             into ${prefix}ACT_CMMN_HI_CASE_INST (ID_, REV_, NAME_, PARENT_ID_, CASE_DEF_ID_, BUSINESS_KEY_, STATE_, START_TIME_, END_TIME_, START_USER_ID_, LAST_REACTIVATION_TIME_, LAST_REACTIVATION_USER_ID_, CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, TENANT_ID_, BUSINESS_STATUS_) VALUES
             (
-                #{historicCaseInstance.id ,jdbcType=VARCHAR},
-                1, #{historicCaseInstance.name ,jdbcType=VARCHAR},
-                #{historicCaseInstance.parentId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.businessKey ,jdbcType=VARCHAR},
-                #{historicCaseInstance.state ,jdbcType=VARCHAR},
-                #{historicCaseInstance.startTime ,jdbcType=TIMESTAMP},
-                #{historicCaseInstance.endTime ,jdbcType=TIMESTAMP},
-                #{historicCaseInstance.startUserId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.lastReactivationTime ,jdbcType=TIMESTAMP},
-                #{historicCaseInstance.lastReactivationUserId ,jdbcType=VARCHAR},
+                #{historicCaseInstance.id, jdbcType=VARCHAR},
+                1, #{historicCaseInstance.name, jdbcType=VARCHAR},
+                #{historicCaseInstance.parentId, jdbcType=VARCHAR},
+                #{historicCaseInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{historicCaseInstance.businessKey, jdbcType=VARCHAR},
+                #{historicCaseInstance.state, jdbcType=VARCHAR},
+                #{historicCaseInstance.startTime, jdbcType=TIMESTAMP},
+                #{historicCaseInstance.endTime, jdbcType=TIMESTAMP},
+                #{historicCaseInstance.startUserId, jdbcType=VARCHAR},
+                #{historicCaseInstance.lastReactivationTime, jdbcType=TIMESTAMP},
+                #{historicCaseInstance.lastReactivationUserId, jdbcType=VARCHAR},
                 #{historicCaseInstance.callbackId, jdbcType=VARCHAR},
                 #{historicCaseInstance.callbackType, jdbcType=VARCHAR},
                 #{historicCaseInstance.referenceId, jdbcType=VARCHAR},
                 #{historicCaseInstance.referenceType, jdbcType=VARCHAR},
-                #{historicCaseInstance.tenantId ,jdbcType=VARCHAR},
-                #{historicCaseInstance.businessStatus ,jdbcType=VARCHAR}
+                #{historicCaseInstance.tenantId, jdbcType=VARCHAR},
+                #{historicCaseInstance.businessStatus, jdbcType=VARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -137,11 +137,11 @@
     </update>
 
     <delete id="deleteHistoricCaseInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.HistoricCaseInstanceEntityImpl">
-        delete from ${prefix}ACT_CMMN_HI_CASE_INST where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_CMMN_HI_CASE_INST where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="deleteHistoricCaseInstanceByCaseDefinitionId" parameterType="string">
-        delete from ${prefix}ACT_CMMN_HI_CASE_INST where CASE_DEF_ID_ = #{value}
+        delete from ${prefix}ACT_CMMN_HI_CASE_INST where CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
     </delete>
     
     <delete id="bulkDeleteHistoricCaseInstancesByIds" parameterType="java.util.Collection">
@@ -151,8 +151,8 @@
             or
             </if>
             ID_ in
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="id" index="index" collection="listItem" open="(" separator="," close=")">
+              #{id, jdbcType=VARCHAR}
             </foreach>
         </foreach>
     </delete>
@@ -188,22 +188,21 @@
                extends="historicCaseInstanceResultMap">
         <collection property="queryVariables" column="SCOPE_ID_" javaType="ArrayList"
                     ofType="org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityImpl">
-            <id property="id" column="VAR_ID_"/>
-            <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR"/>
-            <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType"
-                    jdbcType="VARCHAR"/>
+            <id property="id" column="VAR_ID_" jdbcType="NVARCHAR"/>
+            <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR"/>
+            <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR"/>
             <result property="revision" column="VAR_REV_" jdbcType="INTEGER"/>
-            <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR"/>
-            <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR"/>
-            <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR"/>
-            <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="VARCHAR"/>
-            <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-            <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="VARCHAR"/>
-            <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+            <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR"/>
+            <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR"/>
+            <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR"/>
+            <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="NVARCHAR"/>
+            <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+            <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+            <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
             <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
             <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE"/>
-            <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR"/>
-            <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR"/>
+            <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR"/>
+            <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR"/>
             <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT"/>
         </collection>
     </resultMap>
@@ -226,8 +225,8 @@
             or
             </if>
             PARENT_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="parentId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{parentId, jdbcType=VARCHAR}
             </foreach>
         </foreach>
     </select>
@@ -334,37 +333,37 @@
                 <property name="queryTablePrefix" value="RES."/>
             </include>
             <if test="caseDefinitionKey != null">
-                and CASE_DEF.KEY_ = #{caseDefinitionKey}
+                and CASE_DEF.KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionKeys != null">
                 and CASE_DEF.KEY_ IN
                 <foreach item="caseDefinitionKey" index="index" collection="caseDefinitionKeys" open="(" separator="," close=")">
-                    #{caseDefinitionKey}
+                    #{caseDefinitionKey, jdbcType=VARCHAR}
                 </foreach>
             </if>
             <if test="caseDefinitionCategory != null">
-                and CASE_DEF.CATEGORY_ = #{caseDefinitionCategory}
+                and CASE_DEF.CATEGORY_ = #{caseDefinitionCategory, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionName != null">
-                and CASE_DEF.NAME_ = #{caseDefinitionName}
+                and CASE_DEF.NAME_ = #{caseDefinitionName, jdbcType=VARCHAR}
             </if>
             <if test="deploymentId != null">
-                and CASE_DEF.DEPLOYMENT_ID_ = #{deploymentId}
+                and CASE_DEF.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
             </if>
             <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
                 and CASE_DEF.DEPLOYMENT_ID_ IN
                 <foreach item="deploymentId" index="index" collection="deploymentIds"
                          open="(" separator="," close=")">
-                  #{deploymentId}
+                  #{deploymentId, jdbcType=VARCHAR}
                 </foreach>
             </if>
             <foreach collection="queryVariableValues" index="index" item="queryVariableValue">
                 <choose>
                     <when test="queryVariableValue.operator.equals('EXISTS')">
-                      and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
+                      and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                     </when>
                     <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
-                      and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
+                      and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                     </when>
                     <otherwise>
                         and exists (
@@ -377,10 +376,10 @@
 
                                 <if test="queryVariableValue.name != null">
                                     <!-- Match-all variable-names when name is null -->
-                                    and V.NAME_= #{queryVariableValue.name}
+                                    and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                                 </if>
                                 <if test="queryVariableValue.needsTypeCheck()">
-                                    and V.VAR_TYPE_ = #{queryVariableValue.type}
+                                    and V.VAR_TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                                 </if>
                                 <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                                     <choose>
@@ -395,7 +394,7 @@
                                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                         <otherwise><include refid="variableOperator" /></otherwise>
                                     </choose>
-                                    #{queryVariableValue.textValue}
+                                    #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                                     <choose>
                                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                                     </choose>
@@ -410,7 +409,7 @@
                                         <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                         <otherwise><include refid="variableOperator" /></otherwise>
                                     </choose>
-                                    #{queryVariableValue.textValue2}
+                                    #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                                     <choose>
                                         <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                     </choose>
@@ -418,7 +417,7 @@
                                 <if test="queryVariableValue.longValue != null">
                                     and (V.LONG_
                                     <include refid="variableOperator" />
-                                    #{queryVariableValue.longValue}
+                                    #{queryVariableValue.longValue, jdbcType=BIGINT}
                                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                         or V.LONG_ is null
                                     </if>
@@ -427,7 +426,7 @@
                                 <if test="queryVariableValue.doubleValue != null">
                                     and (V.DOUBLE_
                                     <include refid="variableOperator" />
-                                    #{queryVariableValue.doubleValue}
+                                    #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                         or V.DOUBLE_ is null
                                     </if>
@@ -458,31 +457,31 @@
                         <property name="queryTablePrefix" value="RES."/>
                     </include>
                     <if test="orQueryObject.caseDefinitionKey != null">
-                        or CASE_DEF.KEY_ = #{orQueryObject.caseDefinitionKey}
+                        or CASE_DEF.KEY_ = #{orQueryObject.caseDefinitionKey, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionKeys != null &amp;&amp; !orQueryObject.caseDefinitionKeys.empty">
                         or CASE_DEF.KEY_ IN
                         <foreach item="caseDefinitionKey" index="index" collection="orQueryObject.caseDefinitionKeys" open="(" separator="," close=")">
-                            #{caseDefinitionKey}
+                            #{caseDefinitionKey, jdbcType=VARCHAR}
                         </foreach>
                     </if>
                     <if test="orQueryObject.caseDefinitionCategory != null">
-                        or CASE_DEF.CATEGORY_ = #{orQueryObject.caseDefinitionCategory}
+                        or CASE_DEF.CATEGORY_ = #{orQueryObject.caseDefinitionCategory, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionName != null">
-                        or CASE_DEF.NAME_ = #{orQueryObject.caseDefinitionName}
+                        or CASE_DEF.NAME_ = #{orQueryObject.caseDefinitionName, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.caseDefinitionVersion != null">
-                        or CASE_DEF.VERSION_ = #{orQueryObject.caseDefinitionVersion}
+                        or CASE_DEF.VERSION_ = #{orQueryObject.caseDefinitionVersion, jdbcType=INTEGER}
                     </if>
                     <if test="orQueryObject.deploymentId != null">
-                        or CASE_DEF.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId}
+                        or CASE_DEF.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId, jdbcType=VARCHAR}
                     </if>
                     <if test="orQueryObject.deploymentIds != null &amp;&amp; !orQueryObject.deploymentIds.empty">
                         or CASE_DEF.DEPLOYMENT_ID_ IN
                         <foreach item="deploymentId" index="index" collection="orQueryObject.deploymentIds"
                                  open="(" separator="," close=")">
-                            #{deploymentId}
+                            #{deploymentId, jdbcType=VARCHAR}
                         </foreach>
                     </if>
                     <foreach collection="orQueryObject.queryVariableValues" index="index" item="queryVariableValue">
@@ -490,11 +489,11 @@
                         <trim prefix="(" prefixOverrides="AND" suffix=")">
                         <choose>
                             <when test="queryVariableValue.operator.equals('EXISTS')">
-                                and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and
+                                and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and
                                 SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                             </when>
                             <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
-                                and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.ID_ = SCOPE_ID_ and
+                                and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.ID_ = SCOPE_ID_ and
                                 SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn')
                             </when>
                             <otherwise>
@@ -507,10 +506,10 @@
                                          and V.SCOPE_TYPE_ = 'cmmn'
                                         <if test="queryVariableValue.name != null">
                                             <!-- Match-all variable-names when name is null -->
-                                            and V.NAME_= #{queryVariableValue.name}
+                                            and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                                         </if>
                                         <if test="queryVariableValue.needsTypeCheck()">
-                                            and V.VAR_TYPE_ = #{queryVariableValue.type}
+                                            and V.VAR_TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                                         </if>
                                         <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                                             <choose>
@@ -527,7 +526,7 @@
                                                     <include refid="variableOperator"/>
                                                 </otherwise>
                                             </choose>
-                                            #{queryVariableValue.textValue}
+                                            #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                                             <choose>
                                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                                             </choose>
@@ -542,7 +541,7 @@
                                                 <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                                 <otherwise><include refid="variableOperator" /></otherwise>
                                             </choose>
-                                            #{queryVariableValue.textValue2}
+                                            #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                                             <choose>
                                                 <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                             </choose>
@@ -550,7 +549,7 @@
                                         <if test="queryVariableValue.longValue != null">
                                             and (V.LONG_
                                             <include refid="variableOperator" />
-                                            #{queryVariableValue.longValue}
+                                            #{queryVariableValue.longValue, jdbcType=BIGINT}
                                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                                 or V.LONG_ is null
                                             </if>
@@ -559,7 +558,7 @@
                                         <if test="queryVariableValue.doubleValue != null">
                                             and (V.DOUBLE_
                                             <include refid="variableOperator" />
-                                            #{queryVariableValue.doubleValue}
+                                            #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                                 or V.DOUBLE_ is null
                                             </if>
@@ -590,42 +589,42 @@
 
     <sql id="commonCaseInstanceQuerySql">
         <if test="caseInstanceId != null">
-            ${queryTablePrefix}ID_ = #{caseInstanceId}
+            ${queryTablePrefix}ID_ = #{caseInstanceId, jdbcType=VARCHAR}
         </if>
         <if test="caseInstanceIds != null &amp;&amp; !caseInstanceIds.empty">
             and ${queryTablePrefix}ID_ IN
             <foreach item="caseInstanceId" index="index" collection="caseInstanceIds"
                      open="(" separator="," close=")">
-              #{caseInstanceId}
+              #{caseInstanceId, jdbcType=VARCHAR}
             </foreach>
         </if>
         <if test="caseDefinitionId != null">
-            and ${queryTablePrefix}CASE_DEF_ID_ = #{caseDefinitionId}
+            and ${queryTablePrefix}CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
         </if>
         <if test="caseDefinitionIds != null">
             and ${queryTablePrefix}CASE_DEF_ID_ IN
             <foreach item="caseDefinitionId" index="index" collection="caseDefinitionIds" open="(" separator="," close=")">
-                #{caseDefinitionId}
+                #{caseDefinitionId, jdbcType=VARCHAR}
             </foreach>
         </if>
         <if test="caseInstanceParentId != null">
-            and ${queryTablePrefix}PARENT_ID_ = #{caseInstanceParentId}
+            and ${queryTablePrefix}PARENT_ID_ = #{caseInstanceParentId, jdbcType=VARCHAR}
         </if>
         <if test="withoutCaseInstanceParentId">
             and ${queryTablePrefix}PARENT_ID_ is null
         </if>
         <if test="caseInstanceName != null">
-            and ${queryTablePrefix}NAME_ = #{caseInstanceName}
+            and ${queryTablePrefix}NAME_ = #{caseInstanceName, jdbcType=VARCHAR}
         </if>
         <if test="caseInstanceNameLike != null">
-            and ${queryTablePrefix}NAME_ like #{caseInstanceNameLike}${wildcardEscapeClause}
+            and ${queryTablePrefix}NAME_ like #{caseInstanceNameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
         </if>
         <if test="caseInstanceNameLikeIgnoreCase != null">
-            and lower(${queryTablePrefix}NAME_) LIKE lower(#{caseInstanceNameLikeIgnoreCase})${wildcardEscapeClause}
+            and lower(${queryTablePrefix}NAME_) LIKE lower(#{caseInstanceNameLikeIgnoreCase, jdbcType=VARCHAR})${wildcardEscapeClause}
         </if>
         <if test="parentScopeId != null">
             and EXISTS(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
-                LINK.SCOPE_ID_ = #{parentScopeId}
+                LINK.SCOPE_ID_ = #{parentScopeId, jdbcType=NVARCHAR}
                 and LINK.REF_SCOPE_ID_ = RES.ID_
                 and LINK.HIERARCHY_TYPE_ = 'parent'
             )
@@ -633,14 +632,14 @@
         <if test="rootScopeId != null">
             and exists(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
             LINK.REF_SCOPE_ID_ = RES.ID_
-            and LINK.ROOT_SCOPE_ID_ = #{rootScopeId}
+            and LINK.ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR}
             )
         </if>
         <if test="businessKey != null">
-            and ${queryTablePrefix}BUSINESS_KEY_ = #{businessKey}
+            and ${queryTablePrefix}BUSINESS_KEY_ = #{businessKey, jdbcType=VARCHAR}
         </if>
         <if test="businessStatus != null">
-            and ${queryTablePrefix}BUSINESS_STATUS_ = #{businessStatus}
+            and ${queryTablePrefix}BUSINESS_STATUS_ = #{businessStatus, jdbcType=VARCHAR}
         </if>
         <if test="finished">
             and ${queryTablePrefix}END_TIME_ is not null
@@ -649,69 +648,69 @@
             and ${queryTablePrefix}END_TIME_ is null
         </if>
         <if test="startedBefore != null">
-            and ${queryTablePrefix}START_TIME_ &lt;= #{startedBefore}
+            and ${queryTablePrefix}START_TIME_ &lt;= #{startedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="startedAfter != null">
-            and ${queryTablePrefix}START_TIME_ &gt;= #{startedAfter}
+            and ${queryTablePrefix}START_TIME_ &gt;= #{startedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="finishedBefore != null">
-            and ${queryTablePrefix}END_TIME_ &lt;= #{finishedBefore}
+            and ${queryTablePrefix}END_TIME_ &lt;= #{finishedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="finishedAfter != null">
-            and ${queryTablePrefix}END_TIME_ &gt;= #{finishedAfter}
+            and ${queryTablePrefix}END_TIME_ &gt;= #{finishedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="startedBy != null">
-            and ${queryTablePrefix}START_USER_ID_ = #{startedBy}
+            and ${queryTablePrefix}START_USER_ID_ = #{startedBy, jdbcType=VARCHAR}
         </if>
         <if test="state != null">
-            and ${queryTablePrefix}STATE_ = #{state}
+            and ${queryTablePrefix}STATE_ = #{state, jdbcType=VARCHAR}
         </if>
         <if test="lastReactivatedBefore != null">
-            and ${queryTablePrefix}LAST_REACTIVATION_TIME_ &lt;= #{lastReactivatedBefore}
+            and ${queryTablePrefix}LAST_REACTIVATION_TIME_ &lt;= #{lastReactivatedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastReactivatedAfter != null">
-            and ${queryTablePrefix}LAST_REACTIVATION_TIME_ &gt;= #{lastReactivatedAfter}
+            and ${queryTablePrefix}LAST_REACTIVATION_TIME_ &gt;= #{lastReactivatedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastReactivatedBy != null">
-            and ${queryTablePrefix}LAST_REACTIVATION_USER_ID_ = #{lastReactivatedBy}
+            and ${queryTablePrefix}LAST_REACTIVATION_USER_ID_ = #{lastReactivatedBy, jdbcType=VARCHAR}
         </if>
         <if test="callbackId != null">
-            and ${queryTablePrefix}CALLBACK_ID_ = #{callbackId}
+            and ${queryTablePrefix}CALLBACK_ID_ = #{callbackId, jdbcType=VARCHAR}
         </if>
         <if test="callbackType != null">
-            and ${queryTablePrefix}CALLBACK_TYPE_ = #{callbackType}
+            and ${queryTablePrefix}CALLBACK_TYPE_ = #{callbackType, jdbcType=VARCHAR}
         </if>
         <if test="withoutCallbackId">
             and ${queryTablePrefix}CALLBACK_ID_ is null
         </if>
         <if test="referenceId != null">
-            and ${queryTablePrefix}REFERENCE_ID_ = #{referenceId}
+            and ${queryTablePrefix}REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR}
         </if>
         <if test="referenceType != null">
-            and ${queryTablePrefix}REFERENCE_TYPE_ = #{referenceType}
+            and ${queryTablePrefix}REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR}
         </if>
         <if test="tenantId != null">
-            and ${queryTablePrefix}TENANT_ID_ = #{tenantId}
+            and ${queryTablePrefix}TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
         </if>
         <if test="withoutTenantId">
             and (${queryTablePrefix}TENANT_ID_ is null or ${queryTablePrefix}TENANT_ID_ = '')
         </if>
         <if test="activePlanItemDefinitionId != null">
-            and EXISTS(select ID_ from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST P where P.CASE_INST_ID_ = ${queryTablePrefix}ID_ and P.ITEM_DEFINITION_ID_ = #{activePlanItemDefinitionId} and P.STATE_ = 'active')
+            and EXISTS(select ID_ from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST P where P.CASE_INST_ID_ = ${queryTablePrefix}ID_ and P.ITEM_DEFINITION_ID_ = #{activePlanItemDefinitionId, jdbcType=VARCHAR} and P.STATE_ = 'active')
         </if>
         <if test="activePlanItemDefinitionIds != null">
             and EXISTS(select ID_ from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST P where P.CASE_INST_ID_ = ${queryTablePrefix}ID_ and P.ITEM_DEFINITION_ID_ in
             <foreach item="activePlanItemDefinitionId" index="index" collection="activePlanItemDefinitionIds" open="(" separator="," close=")">
-                #{activePlanItemDefinitionId}
+                #{activePlanItemDefinitionId, jdbcType=VARCHAR}
             </foreach>
             and P.STATE_ = 'active')
         </if>
         <if test="involvedUser != null">
-            and EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and I.USER_ID_ = #{involvedUser})
+            and EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and I.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR})
         </if>
         <if test="involvedUserIdentityLink != null">
             and EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-            I.USER_ID_ = #{involvedUserIdentityLink.userId} and I.TYPE_ = #{involvedUserIdentityLink.type})
+            I.USER_ID_ = #{involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedUserIdentityLink.type, jdbcType=NVARCHAR})
         </if>
         <if test="involvedGroups != null">
             and EXISTS(
@@ -722,9 +721,9 @@
                     or
                     </if>
                     I.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="involvedGroupListItem"
+                    <foreach item="involvedGroup" index="index" collection="involvedGroupListItem"
                           open="(" separator="," close=")">
-                      #{group}
+                      #{involvedGroup, jdbcType=NVARCHAR}
                     </foreach>
                 </foreach>
                 )
@@ -732,50 +731,50 @@
         </if>
         <if test="involvedGroupIdentityLink != null">
             and EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-            I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId} and I.TYPE_ = #{involvedGroupIdentityLink.type})
+            I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
         </if>
     </sql>
     
     <sql id="commonCaseInstanceOrQuerySql">
         <if test="orQueryObject.caseInstanceId != null">
-            ${queryTablePrefix}ID_ = #{orQueryObject.caseInstanceId}
+            ${queryTablePrefix}ID_ = #{orQueryObject.caseInstanceId, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.caseInstanceIds != null &amp;&amp; !orQueryObject.caseInstanceIds.empty">
             or ${queryTablePrefix}ID_ IN
             <foreach item="caseInstanceId" index="index" collection="orQueryObject.caseInstanceIds"
                      open="(" separator="," close=")">
-                #{caseInstanceId}
+                #{caseInstanceId, jdbcType=VARCHAR}
             </foreach>
         </if>
         <if test="orQueryObject.caseDefinitionId != null">
-            or ${queryTablePrefix}CASE_DEF_ID_ = #{orQueryObject.caseDefinitionId}
+            or ${queryTablePrefix}CASE_DEF_ID_ = #{orQueryObject.caseDefinitionId, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.caseDefinitionIds != null">
             or ${queryTablePrefix}CASE_DEF_ID_ IN
             <foreach item="caseDefinitionId" index="index" collection="orQueryObject.caseDefinitionIds" open="(" separator="," close=")">
-                #{caseDefinitionId}
+                #{caseDefinitionId, jdbcType=VARCHAR}
             </foreach>
         </if>
         <if test="orQueryObject.caseInstanceParentId != null">
-            or ${queryTablePrefix}PARENT_ID_ = #{orQueryObject.caseInstanceParentId}
+            or ${queryTablePrefix}PARENT_ID_ = #{orQueryObject.caseInstanceParentId, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.withoutCaseInstanceParentId">
             or ${queryTablePrefix}PARENT_ID_ is null
         </if>
         <if test="orQueryObject.caseInstanceName != null">
-            or ${queryTablePrefix}NAME_ = #{orQueryObject.caseInstanceName}
+            or ${queryTablePrefix}NAME_ = #{orQueryObject.caseInstanceName, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.caseInstanceNameLike != null">
-            or ${queryTablePrefix}NAME_ like #{orQueryObject.caseInstanceNameLike}${wildcardEscapeClause}
+            or ${queryTablePrefix}NAME_ like #{orQueryObject.caseInstanceNameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
         </if>
         <if test="orQueryObject.caseInstanceNameLikeIgnoreCase != null">
-            or lower(${queryTablePrefix}NAME_) LIKE lower(#{orQueryObject.caseInstanceNameLikeIgnoreCase})${wildcardEscapeClause}
+            or lower(${queryTablePrefix}NAME_) LIKE lower(#{orQueryObject.caseInstanceNameLikeIgnoreCase, jdbcType=VARCHAR})${wildcardEscapeClause}
         </if>
         <if test="orQueryObject.businessKey != null">
-            or ${queryTablePrefix}BUSINESS_KEY_ = #{orQueryObject.businessKey}
+            or ${queryTablePrefix}BUSINESS_KEY_ = #{orQueryObject.businessKey, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.businessStatus != null">
-            or ${queryTablePrefix}BUSINESS_STATUS_ = #{orQueryObject.businessStatus}
+            or ${queryTablePrefix}BUSINESS_STATUS_ = #{orQueryObject.businessStatus, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.finished">
             or ${queryTablePrefix}END_TIME_ is not null
@@ -784,70 +783,70 @@
             or ${queryTablePrefix}END_TIME_ is null
         </if>
         <if test="orQueryObject.startedBefore != null">
-            or ${queryTablePrefix}START_TIME_ &lt;= #{orQueryObject.startedBefore}
+            or ${queryTablePrefix}START_TIME_ &lt;= #{orQueryObject.startedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="orQueryObject.startedAfter != null">
-            or ${queryTablePrefix}START_TIME_ &gt;= #{orQueryObject.startedAfter}
+            or ${queryTablePrefix}START_TIME_ &gt;= #{orQueryObject.startedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="orQueryObject.finishedBefore != null">
-            or ${queryTablePrefix}END_TIME_ &lt;= #{orQueryObject.finishedBefore}
+            or ${queryTablePrefix}END_TIME_ &lt;= #{orQueryObject.finishedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="orQueryObject.finishedAfter != null">
-            or ${queryTablePrefix}END_TIME_ &gt;= #{orQueryObject.finishedAfter}
+            or ${queryTablePrefix}END_TIME_ &gt;= #{orQueryObject.finishedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="orQueryObject.startedBy != null">
-            or ${queryTablePrefix}START_USER_ID_ = #{orQueryObject.startedBy}
+            or ${queryTablePrefix}START_USER_ID_ = #{orQueryObject.startedBy, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.state != null">
-            or ${queryTablePrefix}STATE_ = #{orQueryObject.state}
+            or ${queryTablePrefix}STATE_ = #{orQueryObject.state, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.lastReactivatedBefore != null">
-            or ${queryTablePrefix}LAST_REACTIVATION_TIME_ &lt;= #{lastReactivatedBefore}
+            or ${queryTablePrefix}LAST_REACTIVATION_TIME_ &lt;= #{lastReactivatedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="orQueryObject.lastReactivatedAfter != null">
-            or ${queryTablePrefix}LAST_REACTIVATION_TIME_ &gt;= #{lastReactivatedAfter}
+            or ${queryTablePrefix}LAST_REACTIVATION_TIME_ &gt;= #{lastReactivatedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="orQueryObject.lastReactivatedBy != null">
-            or ${queryTablePrefix}LAST_REACTIVATION_USER_ID_ = #{lastReactivatedBy}
+            or ${queryTablePrefix}LAST_REACTIVATION_USER_ID_ = #{lastReactivatedBy, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.callbackId != null">
-            or ${queryTablePrefix}CALLBACK_ID_ = #{orQueryObject.callbackId}
+            or ${queryTablePrefix}CALLBACK_ID_ = #{orQueryObject.callbackId, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.callbackType != null">
-            or ${queryTablePrefix}CALLBACK_TYPE_ = #{orQueryObject.callbackType}
+            or ${queryTablePrefix}CALLBACK_TYPE_ = #{orQueryObject.callbackType, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.withoutCallbackId">
             or ${queryTablePrefix}CALLBACK_ID_ is null
         </if>
         <if test="orQueryObject.referenceId != null">
-            or ${queryTablePrefix}REFERENCE_ID_ = #{orQueryObject.referenceId}
+            or ${queryTablePrefix}REFERENCE_ID_ = #{orQueryObject.referenceId, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.referenceType != null">
-            or ${queryTablePrefix}REFERENCE_TYPE_ = #{orQueryObject.referenceType}
+            or ${queryTablePrefix}REFERENCE_TYPE_ = #{orQueryObject.referenceType, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.tenantId != null">
-            or ${queryTablePrefix}TENANT_ID_ = #{orQueryObject.tenantId}
+            or ${queryTablePrefix}TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=VARCHAR}
         </if>
         <if test="orQueryObject.withoutTenantId">
             or (${queryTablePrefix}TENANT_ID_ is null or ${queryTablePrefix}TENANT_ID_ = '')
         </if>
         <if test="activePlanItemDefinitionId != null">
-            or EXISTS(select ID_ from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST P where P.CASE_INST_ID_ = ${queryTablePrefix}ID_ and P.ITEM_DEFINITION_ID_ = #{activePlanItemDefinitionId} and P.STATE_ = 'active')
+            or EXISTS(select ID_ from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST P where P.CASE_INST_ID_ = ${queryTablePrefix}ID_ and P.ITEM_DEFINITION_ID_ = #{activePlanItemDefinitionId, jdbcType=VARCHAR} and P.STATE_ = 'active')
         </if>
         <if test="activePlanItemDefinitionIds != null">
             or EXISTS(select ID_ from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST P where P.CASE_INST_ID_ = ${queryTablePrefix}ID_ and P.ITEM_DEFINITION_ID_ in
             <foreach item="activePlanItemDefinitionId" index="index" collection="activePlanItemDefinitionIds" open="(" separator="," close=")">
-                #{activePlanItemDefinitionId}
+                #{activePlanItemDefinitionId, jdbcType=VARCHAR}
             </foreach>
             and P.STATE_ = 'active')
         </if>
         <if test="orQueryObject.involvedUser != null">
             or EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and I.USER_ID_ =
-            #{orQueryObject.involvedUser})
+            #{orQueryObject.involvedUser, jdbcType=NVARCHAR})
         </if>
         <if test="orQueryObject.involvedUserIdentityLink != null">
             or EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-            I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type})
+            I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type, jdbcType=NVARCHAR})
         </if>
         <if test="orQueryObject.involvedGroups != null">
             or EXISTS(
@@ -858,9 +857,9 @@
                     or
                     </if>
                     I.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="involvedGroupListItem"
+                    <foreach item="involvedGroup" index="index" collection="involvedGroupListItem"
                           open="(" separator="," close=")">
-                      #{group}
+                      #{involvedGroup, jdbcType=NVARCHAR}
                     </foreach>
                 </foreach>
                 )
@@ -868,11 +867,11 @@
         </if>
         <if test="orQueryObject.involvedGroupIdentityLink != null">
             or EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.SCOPE_ID_ = ${queryTablePrefix}ID_ and I.SCOPE_TYPE_ = 'cmmn' and 
-            I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type})
+            I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
         </if>
         <if test="orQueryObject.parentScopeId != null">
             or EXISTS(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
-                LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId}
+                LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId, jdbcType=NVARCHAR}
                 and LINK.REF_SCOPE_ID_ = RES.ID_
                 and LINK.HIERARCHY_TYPE_ = 'parent'
             )
@@ -880,13 +879,13 @@
         <if test="orQueryObject.rootScopeId != null">
             or exists(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
                 LINK.REF_SCOPE_ID_ = RES.ID_
-                and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId}
+                and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId, jdbcType=NVARCHAR}
             )
         </if>
     </sql>
 
     <select id="selectHistoricCaseInstancesByCaseDefinitionId" resultMap="historicCaseInstanceResultMap">
-        select * from ${prefix}ACT_CMMN_HI_CASE_INST where CASE_DEF_ID_ = #{parameter}
+        select * from ${prefix}ACT_CMMN_HI_CASE_INST where CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
     </select>
 
     <sql id="variableOperator">
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricMilestoneInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricMilestoneInstance.xml
index 6699076651c..e020ae3fe67 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricMilestoneInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricMilestoneInstance.xml
@@ -7,11 +7,11 @@
     <insert id="insertHistoricMilestoneInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.HistoricMilestoneInstanceEntityImpl">
         insert into ${prefix}ACT_CMMN_HI_MIL_INST (ID_, REV_, NAME_, TIME_STAMP_, CASE_INST_ID_, CASE_DEF_ID_, ELEMENT_ID_, TENANT_ID_) 
         values (
-            #{id ,jdbcType=VARCHAR},
-            1, #{name ,jdbcType=VARCHAR},
-            #{timeStamp ,jdbcType=TIMESTAMP},
-            #{caseInstanceId ,jdbcType=VARCHAR},
-            #{caseDefinitionId ,jdbcType=VARCHAR},
+            #{id, jdbcType=VARCHAR},
+            1, #{name, jdbcType=VARCHAR},
+            #{timeStamp, jdbcType=TIMESTAMP},
+            #{caseInstanceId, jdbcType=VARCHAR},
+            #{caseDefinitionId, jdbcType=VARCHAR},
             #{elementId, jdbcType=VARCHAR},
             #{tenantId, jdbcType=VARCHAR}
         )
@@ -21,31 +21,31 @@
   <insert id="bulkInsertHistoricMilestoneInstance" parameterType="java.util.List">
     insert into ${prefix}ACT_CMMN_HI_MIL_INST (ID_, REV_, NAME_, TIME_STAMP_, CASE_INST_ID_, CASE_DEF_ID_, ELEMENT_ID_, TENANT_ID_) 
     values 
-      <foreach collection="list" item="milestone" index="index" separator=",">
+      <foreach collection="list" item="historicMilestoneInstance" index="index" separator=",">
         (
-            #{milestone.id ,jdbcType=VARCHAR},
-            1, #{milestone.name ,jdbcType=VARCHAR},
-            #{milestone.timeStamp ,jdbcType=TIMESTAMP},
-            #{milestone.caseInstanceId ,jdbcType=VARCHAR},
-            #{milestone.caseDefinitionId ,jdbcType=VARCHAR},
-            #{milestone.elementId, jdbcType=VARCHAR},
-            #{milestone.tenantId, jdbcType=VARCHAR}
+            #{historicMilestoneInstance.id, jdbcType=VARCHAR},
+            1, #{historicMilestoneInstance.name, jdbcType=VARCHAR},
+            #{historicMilestoneInstance.timeStamp, jdbcType=TIMESTAMP},
+            #{historicMilestoneInstance.caseInstanceId, jdbcType=VARCHAR},
+            #{historicMilestoneInstance.caseDefinitionId, jdbcType=VARCHAR},
+            #{historicMilestoneInstance.elementId, jdbcType=VARCHAR},
+            #{historicMilestoneInstance.tenantId, jdbcType=VARCHAR}
         )
       </foreach>
   </insert>
 
   <insert id="bulkInsertHistoricMilestoneInstance" databaseId="oracle" parameterType="java.util.List">
     INSERT ALL 
-      <foreach collection="list" item="milestone" index="index">
+      <foreach collection="list" item="historicMilestoneInstance" index="index">
         into ${prefix}ACT_CMMN_HI_MIL_INST (ID_, REV_, NAME_, TIME_STAMP_, CASE_INST_ID_, CASE_DEF_ID_, ELEMENT_ID_, TENANT_ID_) VALUES
             (
-                #{milestone.id ,jdbcType=VARCHAR},
-                1, #{milestone.name ,jdbcType=VARCHAR},
-                #{milestone.timeStamp ,jdbcType=TIMESTAMP},
-                #{milestone.caseInstanceId ,jdbcType=VARCHAR},
-                #{milestone.caseDefinitionId ,jdbcType=VARCHAR},
-                #{milestone.elementId, jdbcType=VARCHAR},
-                #{milestone.tenantId, jdbcType=VARCHAR}
+                #{historicMilestoneInstance.id, jdbcType=VARCHAR},
+                1, #{historicMilestoneInstance.name, jdbcType=VARCHAR},
+                #{historicMilestoneInstance.timeStamp, jdbcType=TIMESTAMP},
+                #{historicMilestoneInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{historicMilestoneInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{historicMilestoneInstance.elementId, jdbcType=VARCHAR},
+                #{historicMilestoneInstance.tenantId, jdbcType=VARCHAR}
             )
       </foreach>
     SELECT * FROM dual
@@ -69,11 +69,11 @@
   </update>
   
   <delete id="deleteHistoricMilestoneInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.HistoricMilestoneInstanceEntityImpl">
-    delete from ${prefix}ACT_CMMN_HI_MIL_INST where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_CMMN_HI_MIL_INST where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <delete id="deleteHistoricMilestoneInstanceByCaseDefinitionId" parameterType="string">
-    delete from ${prefix}ACT_CMMN_HI_MIL_INST where CASE_DEF_ID_ = #{value}
+    delete from ${prefix}ACT_CMMN_HI_MIL_INST where CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricMilestoneInstancesByCaseInstanceIds" parameterType="java.util.Collection">
@@ -83,8 +83,8 @@
         or
         </if>
         CASE_INST_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="caseInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{caseInstanceId, jdbcType=VARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -136,28 +136,28 @@
     from ${prefix}ACT_CMMN_HI_MIL_INST RES
     <where>
         <if test="id != null">
-            RES.ID_ = #{id}
+            RES.ID_ = #{id, jdbcType=VARCHAR}
         </if>
         <if test="name != null">
-            RES.NAME_ = #{name}
+            RES.NAME_ = #{name, jdbcType=VARCHAR}
         </if>
         <if test="caseInstanceId != null">
-            and RES.CASE_INST_ID_ = #{caseInstanceId}
+            and RES.CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
         </if>
         <if test="caseDefinitionId != null">
-            and RES.CASE_DEF_ID_ = #{caseDefinitionId}
+            and RES.CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
         </if>
         <if test="reachedBefore != null">
-            and RES.TIME_STAMP_ &lt;= #{reachedBefore}
+            and RES.TIME_STAMP_ &lt;= #{reachedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="reachedAfter != null">
-            and RES.TIME_STAMP_ &gt;= #{reachedAfter}
+            and RES.TIME_STAMP_ &gt;= #{reachedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="tenantId != null">
-            and RES.TENANT_ID_ = #{tenantId}
+            and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
         </if>
         <if test="tenantIdLike != null">
-            and RES.TENANT_ID_ like #{tenantIdLike}
+            and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
         </if>
         <if test="withoutTenantId">
             and (RES.TENANT_ID_ is null or RES.TENANT_ID_ = '')
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricPlanItemInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricPlanItemInstance.xml
index d15913fc3b8..1ae1a3b21c9 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricPlanItemInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricPlanItemInstance.xml
@@ -10,38 +10,38 @@
             LAST_STARTED_TIME_, LAST_SUSPENDED_TIME_, COMPLETED_TIME_, OCCURRED_TIME_, TERMINATED_TIME_, EXIT_TIME_, ENDED_TIME_, LAST_UPDATED_TIME_,
             START_USER_ID_, REFERENCE_ID_, REFERENCE_TYPE_, ENTRY_CRITERION_ID_, EXIT_CRITERION_ID_, SHOW_IN_OVERVIEW_, EXTRA_VALUE_, TENANT_ID_)
         values (
-            #{id ,jdbcType=VARCHAR},
-            1, #{name ,jdbcType=VARCHAR},
-            #{state ,jdbcType=VARCHAR},
-            #{caseDefinitionId ,jdbcType=VARCHAR},
-            #{derivedCaseDefinitionId ,jdbcType=VARCHAR},
-            #{caseInstanceId ,jdbcType=VARCHAR},
-            #{stageInstanceId ,jdbcType=VARCHAR},
-            #{isStage ,jdbcType=BOOLEAN},
-            #{elementId ,jdbcType=VARCHAR},
-            #{planItemDefinitionId ,jdbcType=VARCHAR},
-            #{planItemDefinitionType ,jdbcType=VARCHAR},
-            #{createTime ,jdbcType=TIMESTAMP},
-            #{lastAvailableTime ,jdbcType=TIMESTAMP},
-            #{lastUnavailableTime ,jdbcType=TIMESTAMP},
-            #{lastEnabledTime ,jdbcType=TIMESTAMP},
-            #{lastDisabledTime ,jdbcType=TIMESTAMP},
-            #{lastStartedTime ,jdbcType=TIMESTAMP},
-            #{lastSuspendedTime ,jdbcType=TIMESTAMP},
-            #{completedTime ,jdbcType=TIMESTAMP},
-            #{occurredTime ,jdbcType=TIMESTAMP},
-            #{terminatedTime ,jdbcType=TIMESTAMP},
-            #{exitTime ,jdbcType=TIMESTAMP},
-            #{endedTime ,jdbcType=TIMESTAMP},
+            #{id, jdbcType=VARCHAR},
+            1, #{name, jdbcType=VARCHAR},
+            #{state, jdbcType=VARCHAR},
+            #{caseDefinitionId, jdbcType=VARCHAR},
+            #{derivedCaseDefinitionId, jdbcType=VARCHAR},
+            #{caseInstanceId, jdbcType=VARCHAR},
+            #{stageInstanceId, jdbcType=VARCHAR},
+            #{isStage, jdbcType=BOOLEAN},
+            #{elementId, jdbcType=VARCHAR},
+            #{planItemDefinitionId, jdbcType=VARCHAR},
+            #{planItemDefinitionType, jdbcType=VARCHAR},
+            #{createTime, jdbcType=TIMESTAMP},
+            #{lastAvailableTime, jdbcType=TIMESTAMP},
+            #{lastUnavailableTime, jdbcType=TIMESTAMP},
+            #{lastEnabledTime, jdbcType=TIMESTAMP},
+            #{lastDisabledTime, jdbcType=TIMESTAMP},
+            #{lastStartedTime, jdbcType=TIMESTAMP},
+            #{lastSuspendedTime, jdbcType=TIMESTAMP},
+            #{completedTime, jdbcType=TIMESTAMP},
+            #{occurredTime, jdbcType=TIMESTAMP},
+            #{terminatedTime, jdbcType=TIMESTAMP},
+            #{exitTime, jdbcType=TIMESTAMP},
+            #{endedTime, jdbcType=TIMESTAMP},
             #{lastUpdatedTime, jdbcType=TIMESTAMP},
-            #{startUserId ,jdbcType=VARCHAR},
-            #{referenceId ,jdbcType=VARCHAR},
-            #{referenceType ,jdbcType=VARCHAR},
+            #{startUserId, jdbcType=VARCHAR},
+            #{referenceId, jdbcType=VARCHAR},
+            #{referenceType, jdbcType=VARCHAR},
             #{entryCriterionId, jdbcType=VARCHAR},
             #{exitCriterionId, jdbcType=VARCHAR},
             #{showInOverview, jdbcType=BOOLEAN},
             #{extraValue, jdbcType=VARCHAR},
-            #{tenantId ,jdbcType=VARCHAR}
+            #{tenantId, jdbcType=VARCHAR}
         )
     </insert>
 
@@ -53,38 +53,38 @@
         values
         <foreach collection="list" item="historicPlanItemInstance" index="index" separator=",">
             (
-            #{historicPlanItemInstance.id ,jdbcType=VARCHAR},
-            1, #{historicPlanItemInstance.name ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.state ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.caseDefinitionId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.derivedCaseDefinitionId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.caseInstanceId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.stageInstanceId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.isStage ,jdbcType=BOOLEAN},
-            #{historicPlanItemInstance.elementId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.planItemDefinitionId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.planItemDefinitionType ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.createTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastAvailableTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastUnavailableTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastEnabledTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastDisabledTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastStartedTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastSuspendedTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.completedTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.occurredTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.terminatedTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.exitTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.endedTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.lastUpdatedTime ,jdbcType=TIMESTAMP},
-            #{historicPlanItemInstance.startUserId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.referenceId ,jdbcType=VARCHAR},
-            #{historicPlanItemInstance.referenceType ,jdbcType=VARCHAR},
+            #{historicPlanItemInstance.id, jdbcType=VARCHAR},
+            1, #{historicPlanItemInstance.name, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.state, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.caseDefinitionId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.derivedCaseDefinitionId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.caseInstanceId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.stageInstanceId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.isStage, jdbcType=BOOLEAN},
+            #{historicPlanItemInstance.elementId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.planItemDefinitionId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.planItemDefinitionType, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.createTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastAvailableTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastUnavailableTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastEnabledTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastDisabledTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastStartedTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastSuspendedTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.completedTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.occurredTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.terminatedTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.exitTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.endedTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.lastUpdatedTime, jdbcType=TIMESTAMP},
+            #{historicPlanItemInstance.startUserId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.referenceId, jdbcType=VARCHAR},
+            #{historicPlanItemInstance.referenceType, jdbcType=VARCHAR},
             #{historicPlanItemInstance.entryCriterionId, jdbcType=VARCHAR},
             #{historicPlanItemInstance.exitCriterionId, jdbcType=VARCHAR},
             #{historicPlanItemInstance.showInOverview, jdbcType=BOOLEAN},
             #{historicPlanItemInstance.extraValue, jdbcType=VARCHAR},
-            #{historicPlanItemInstance.tenantId ,jdbcType=VARCHAR}
+            #{historicPlanItemInstance.tenantId, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
@@ -97,38 +97,38 @@
             LAST_STARTED_TIME_, LAST_SUSPENDED_TIME_, COMPLETED_TIME_, OCCURRED_TIME_, TERMINATED_TIME_, EXIT_TIME_, ENDED_TIME_, LAST_UPDATED_TIME_,
             START_USER_ID_, REFERENCE_ID_, REFERENCE_TYPE_, ENTRY_CRITERION_ID_, EXIT_CRITERION_ID_, SHOW_IN_OVERVIEW_, EXTRA_VALUE_, TENANT_ID_)
             VALUES (
-                #{historicPlanItemInstance.id ,jdbcType=VARCHAR},
-                1, #{historicPlanItemInstance.name ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.state ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.derivedCaseDefinitionId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.caseInstanceId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.stageInstanceId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.isStage ,jdbcType=BOOLEAN},
-                #{historicPlanItemInstance.elementId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.planItemDefinitionId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.planItemDefinitionType ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.createTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastAvailableTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastUnavailableTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastEnabledTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastDisabledTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastStartedTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastSuspendedTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.completedTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.occurredTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.terminatedTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.exitTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.endedTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.lastUpdatedTime ,jdbcType=TIMESTAMP},
-                #{historicPlanItemInstance.startUserId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.referenceId ,jdbcType=VARCHAR},
-                #{historicPlanItemInstance.referenceType ,jdbcType=VARCHAR},
+                #{historicPlanItemInstance.id, jdbcType=VARCHAR},
+                1, #{historicPlanItemInstance.name, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.state, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.derivedCaseDefinitionId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.stageInstanceId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.isStage, jdbcType=BOOLEAN},
+                #{historicPlanItemInstance.elementId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.planItemDefinitionId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.planItemDefinitionType, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.createTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastAvailableTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastUnavailableTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastEnabledTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastDisabledTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastStartedTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastSuspendedTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.completedTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.occurredTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.terminatedTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.exitTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.endedTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.lastUpdatedTime, jdbcType=TIMESTAMP},
+                #{historicPlanItemInstance.startUserId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.referenceId, jdbcType=VARCHAR},
+                #{historicPlanItemInstance.referenceType, jdbcType=VARCHAR},
                 #{historicPlanItemInstance.entryCriterionId, jdbcType=VARCHAR},
                 #{historicPlanItemInstance.exitCriterionId, jdbcType=VARCHAR},
                 #{historicPlanItemInstance.showInOverview, jdbcType=BOOLEAN},
                 #{historicPlanItemInstance.extraValue, jdbcType=VARCHAR},
-                #{historicPlanItemInstance.tenantId ,jdbcType=VARCHAR}
+                #{historicPlanItemInstance.tenantId, jdbcType=VARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -224,7 +224,7 @@
                 EXIT_CRITERION_ID_ = #{exitCriterionId, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.showInOverview != showInOverview">
-                SHOW_IN_OVERVIEW_ = #{showInOverview, jdbcType=VARCHAR},
+                SHOW_IN_OVERVIEW_ = #{showInOverview, jdbcType=BOOLEAN},
             </if>
             <if test="originalPersistentState.extraValue != extraValue">
                 EXTRA_VALUE_ = #{extraValue, jdbcType=VARCHAR},
@@ -238,11 +238,11 @@
 
     <delete id="deleteHistoricPlanItemInstance"
             parameterType="org.flowable.cmmn.engine.impl.persistence.entity.HistoricPlanItemInstanceEntityImpl">
-        delete from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="deleteHistoricPlanItemInstanceByCaseDefinitionId" parameterType="string">
-        delete from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST where CASE_DEF_ID_ = #{value}
+        delete from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST where CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
     </delete>
     
     <delete id="bulkDeleteHistoricPlanItemInstancesByCaseInstanceIds" parameterType="java.util.Collection">
@@ -252,8 +252,8 @@
         or
         </if>
         CASE_INST_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="caseInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{caseInstanceId, jdbcType=VARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -327,116 +327,116 @@
     </select>
 
     <select id="selectHistoricPlanItemInstancesByCaseDefinitionId" resultMap="historicPlanItemInstanceResultMap">
-        select * from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST where CASE_DEF_ID_ = #{parameter}
+        select * from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST where CASE_DEF_ID_ = #{parameter, jdbcType=VARCHAR}
     </select>
 
     <sql id="selectHistoricPlanItemInstancesByQueryCriteriaSql">
         from ${prefix}ACT_CMMN_HI_PLAN_ITEM_INST RES
         <where>
             <if test="planItemInstanceId != null">
-                RES.ID_ = #{planItemInstanceId}
+                RES.ID_ = #{planItemInstanceId, jdbcType=VARCHAR}
             </if>
             <if test="planItemInstanceName != null">
-                RES.NAME_ = #{planItemInstanceName}
+                RES.NAME_ = #{planItemInstanceName, jdbcType=VARCHAR}
             </if>
             <if test="state != null">
-                and RES.STATE_ = #{state}
+                and RES.STATE_ = #{state, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionId != null">
-                and RES.CASE_DEF_ID_ = #{caseDefinitionId}
+                and RES.CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
             </if>
             <if test="derivedCaseDefinitionId != null">
-                and RES.DERIVED_CASE_DEF_ID_ = #{derivedCaseDefinitionId}
+                and RES.DERIVED_CASE_DEF_ID_ = #{derivedCaseDefinitionId, jdbcType=VARCHAR}
             </if>
             <if test="caseInstanceId != null">
-                and RES.CASE_INST_ID_ = #{caseInstanceId}
+                and RES.CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
             </if>
             <if test="stageInstanceId != null">
-                and RES.STAGE_INST_ID_ = #{stageInstanceId}
+                and RES.STAGE_INST_ID_ = #{stageInstanceId, jdbcType=VARCHAR}
             </if>
             <if test="elementId != null">
-                and RES.ELEMENT_ID_ = #{elementId}
+                and RES.ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR}
             </if>
             <if test="planItemDefinitionId != null">
-                and RES.ITEM_DEFINITION_ID_ = #{planItemDefinitionId}
+                and RES.ITEM_DEFINITION_ID_ = #{planItemDefinitionId, jdbcType=VARCHAR}
             </if>
             <if test="planItemDefinitionType != null">
-                and RES.ITEM_DEFINITION_TYPE_ = #{planItemDefinitionType}
+                and RES.ITEM_DEFINITION_TYPE_ = #{planItemDefinitionType, jdbcType=VARCHAR}
             </if>
             <if test="planItemDefinitionTypes != null">
-                and RES.ITEM_DEFINITION_TYPE_ in <foreach item="type" index="index" collection="planItemDefinitionTypes" open="(" separator="," close=")">#{type}</foreach>
+                and RES.ITEM_DEFINITION_TYPE_ in <foreach item="planItemDefinitionType" index="index" collection="planItemDefinitionTypes" open="(" separator="," close=")">#{planItemDefinitionType, jdbcType=VARCHAR}</foreach>
             </if>
             <if test="createdBefore != null">
-                and RES.CREATE_TIME_ &lt;= #{createdBefore}
+                and RES.CREATE_TIME_ &lt;= #{createdBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="createdAfter != null">
-                and RES.CREATE_TIME_ &gt;= #{createdAfter}
+                and RES.CREATE_TIME_ &gt;= #{createdAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastAvailableBefore != null">
-                and RES.LAST_AVAILABLE_TIME_ &lt;= #{lastAvailableBefore}
+                and RES.LAST_AVAILABLE_TIME_ &lt;= #{lastAvailableBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastAvailableAfter != null">
-                and RES.LAST_AVAILABLE_TIME_ &gt;= #{lastAvailableAfter}
+                and RES.LAST_AVAILABLE_TIME_ &gt;= #{lastAvailableAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastUnavailableBefore != null">
-                and RES.LAST_UNAVAILABLE_TIME_ &lt;= #{lastUnavailableBefore}
+                and RES.LAST_UNAVAILABLE_TIME_ &lt;= #{lastUnavailableBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastUnavailableAfter != null">
-                and RES.LAST_UNAVAILABLE_TIME_ &gt;= #{lastUnavailableAfter}
+                and RES.LAST_UNAVAILABLE_TIME_ &gt;= #{lastUnavailableAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastEnabledBefore != null">
-                and RES.LAST_ENABLED_TIME_ &lt;= #{lastEnabledBefore}
+                and RES.LAST_ENABLED_TIME_ &lt;= #{lastEnabledBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastEnabledAfter != null">
-                and RES.LAST_ENABLED_TIME_ &gt;= #{lastEnabledAfter}
+                and RES.LAST_ENABLED_TIME_ &gt;= #{lastEnabledAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastDisabledBefore != null">
-                and RES.LAST_DISABLED_TIME_ &lt;= #{lastDisabledBefore}
+                and RES.LAST_DISABLED_TIME_ &lt;= #{lastDisabledBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastDisabledAfter != null">
-                and RES.LAST_DISABLED_TIME_ &gt;= #{lastDisabledAfter}
+                and RES.LAST_DISABLED_TIME_ &gt;= #{lastDisabledAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastStartedBefore != null">
-                and RES.LAST_STARTED_TIME_ &lt;= #{lastStartedBefore}
+                and RES.LAST_STARTED_TIME_ &lt;= #{lastStartedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastStartedAfter != null">
-                and RES.LAST_STARTED_TIME_ &gt;= #{lastStartedAfter}
+                and RES.LAST_STARTED_TIME_ &gt;= #{lastStartedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="lastSuspendedBefore != null">
-                and RES.LAST_SUSPENDED_TIME_ &lt;= #{lastSuspendedBefore}
+                and RES.LAST_SUSPENDED_TIME_ &lt;= #{lastSuspendedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="lastSuspendedAfter != null">
-                and RES.LAST_SUSPENDED_TIME_ &gt;= #{lastSuspendedAfter}
+                and RES.LAST_SUSPENDED_TIME_ &gt;= #{lastSuspendedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="completedBefore != null">
-                and RES.COMPLETED_TIME_ &lt;= #{completedBefore}
+                and RES.COMPLETED_TIME_ &lt;= #{completedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="completedAfter != null">
-                and RES.COMPLETED_TIME_ &gt;= #{completedAfter}
+                and RES.COMPLETED_TIME_ &gt;= #{completedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="occurredBefore != null">
-                and RES.OCCURRED_TIME_ &lt;= #{occurredBefore}
+                and RES.OCCURRED_TIME_ &lt;= #{occurredBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="occurredAfter != null">
-                and RES.OCCURRED_TIME_ &gt;= #{occurredAfter}
+                and RES.OCCURRED_TIME_ &gt;= #{occurredAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="terminatedBefore != null">
-                and RES.TERMINATED_TIME_ &lt;= #{terminatedBefore}
+                and RES.TERMINATED_TIME_ &lt;= #{terminatedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="terminatedAfter != null">
-                and RES.TERMINATED_TIME_ &gt;= #{terminatedAfter}
+                and RES.TERMINATED_TIME_ &gt;= #{terminatedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="exitBefore != null">
-                and RES.EXIT_TIME_ &lt;= #{exitBefore}
+                and RES.EXIT_TIME_ &lt;= #{exitBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="exitAfter != null">
-                and RES.EXIT_TIME_ &gt;= #{exitAfter}
+                and RES.EXIT_TIME_ &gt;= #{exitAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="endedBefore != null">
-                and RES.ENDED_TIME_ &lt;= #{endedBefore}
+                and RES.ENDED_TIME_ &lt;= #{endedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="endedAfter != null">
-                and RES.ENDED_TIME_ &gt;= #{endedAfter}
+                and RES.ENDED_TIME_ &gt;= #{endedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="ended">
                 and RES.ENDED_TIME_ is not null
@@ -445,13 +445,13 @@
                 and RES.ENDED_TIME_ is null
             </if>
             <if test="startUserId != null">
-                and RES.START_USER_ID_ = #{startUserId}
+                and RES.START_USER_ID_ = #{startUserId, jdbcType=VARCHAR}
             </if>
             <if test="referenceId != null">
-                and RES.REFERENCE_ID_ = #{referenceId}
+                and RES.REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR}
             </if>
             <if test="referenceType != null">
-                and RES.REFERENCE_TYPE_ = #{referenceType}
+                and RES.REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR}
             </if>
             <if test="entryCriterionId != null">
                 and RES.ENTRY_CRITERION_ID_ = #{entryCriterionId, jdbcType=VARCHAR}
@@ -473,7 +473,7 @@
                     and
                     (
                       <if test="involvedUser != null">
-                        I.USER_ID_ = #{involvedUser}
+                        I.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR}
                       </if>
                       <if test="involvedUser != null &amp;&amp; involvedGroups != null &amp;&amp; !involvedGroups.empty">
                         or
@@ -485,9 +485,9 @@
                             or
                             </if>
                             I.GROUP_ID_ IN
-                            <foreach item="group" index="index" collection="involvedGroupListItem"
+                            <foreach item="involvedGroup" index="index" collection="involvedGroupListItem"
                                   open="(" separator="," close=")">
-                              #{group}
+                              #{involvedGroup, jdbcType=NVARCHAR}
                             </foreach>
                         </foreach>
                         )
@@ -496,10 +496,10 @@
                 )
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ is null or RES.TENANT_ID_ = '')
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/MilestoneInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/MilestoneInstance.xml
index b17fb03645d..2177ef6a19e 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/MilestoneInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/MilestoneInstance.xml
@@ -7,11 +7,11 @@
     <insert id="insertMilestoneInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.MilestoneInstanceEntityImpl">
         insert into ${prefix}ACT_CMMN_RU_MIL_INST (ID_, NAME_, TIME_STAMP_, CASE_INST_ID_, CASE_DEF_ID_, ELEMENT_ID_, TENANT_ID_)
         values (
-            #{id ,jdbcType=VARCHAR},
-            #{name ,jdbcType=VARCHAR},
-            #{timeStamp ,jdbcType=TIMESTAMP},
-            #{caseInstanceId ,jdbcType=VARCHAR},
-            #{caseDefinitionId ,jdbcType=VARCHAR},
+            #{id, jdbcType=VARCHAR},
+            #{name, jdbcType=VARCHAR},
+            #{timeStamp, jdbcType=TIMESTAMP},
+            #{caseInstanceId, jdbcType=VARCHAR},
+            #{caseDefinitionId, jdbcType=VARCHAR},
             #{elementId, jdbcType=VARCHAR},
             #{tenantId, jdbcType=VARCHAR}
         )
@@ -21,31 +21,31 @@
     <insert id="bulkInsertMilestoneInstance" parameterType="java.util.List">
         insert into ${prefix}ACT_CMMN_RU_MIL_INST (ID_, NAME_, TIME_STAMP_, CASE_INST_ID_, CASE_DEF_ID_, ELEMENT_ID_, TENANT_ID_)
         values
-        <foreach collection="list" item="milestone" index="index" separator=",">
+        <foreach collection="list" item="milestoneInstance" index="index" separator=",">
             (
-                #{milestone.id ,jdbcType=VARCHAR},
-                #{milestone.name ,jdbcType=VARCHAR},
-                #{milestone.timeStamp ,jdbcType=TIMESTAMP},
-                #{milestone.caseInstanceId ,jdbcType=VARCHAR},
-                #{milestone.caseDefinitionId ,jdbcType=VARCHAR},
-                #{milestone.elementId, jdbcType=VARCHAR},
-                #{milestone.tenantId, jdbcType=VARCHAR}
+                #{milestoneInstance.id, jdbcType=VARCHAR},
+                #{milestoneInstance.name, jdbcType=VARCHAR},
+                #{milestoneInstance.timeStamp, jdbcType=TIMESTAMP},
+                #{milestoneInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{milestoneInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{milestoneInstance.elementId, jdbcType=VARCHAR},
+                #{milestoneInstance.tenantId, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
 
     <insert id="bulkInsertMilestoneInstance" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="milestone" index="index">
+        <foreach collection="list" item="milestoneInstance" index="index">
             into ${prefix}ACT_CMMN_RU_MIL_INST (ID_, NAME_, TIME_STAMP_, CASE_INST_ID_, CASE_DEF_ID_, ELEMENT_ID_, TENANT_ID_) VALUES
             (
-                #{milestone.id ,jdbcType=VARCHAR},
-                #{milestone.name ,jdbcType=VARCHAR},
-                #{milestone.timeStamp ,jdbcType=TIMESTAMP},
-                #{milestone.caseInstanceId ,jdbcType=VARCHAR},
-                #{milestone.caseDefinitionId ,jdbcType=VARCHAR},
-                #{milestone.elementId, jdbcType=VARCHAR},
-                #{milestone.tenantId, jdbcType=VARCHAR}
+                #{milestoneInstance.id, jdbcType=VARCHAR},
+                #{milestoneInstance.name, jdbcType=VARCHAR},
+                #{milestoneInstance.timeStamp, jdbcType=TIMESTAMP},
+                #{milestoneInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{milestoneInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{milestoneInstance.elementId, jdbcType=VARCHAR},
+                #{milestoneInstance.tenantId, jdbcType=VARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -68,11 +68,11 @@
     </update>
 
     <delete id="deleteMilestoneInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.MilestoneInstanceEntityImpl">
-        delete from ${prefix}ACT_CMMN_RU_MIL_INST where ID_ = #{id}
+        delete from ${prefix}ACT_CMMN_RU_MIL_INST where ID_ = #{id, jdbcType=VARCHAR}
     </delete>
 
     <delete id="deleteMilestoneInstanceByCaseInstanceId" parameterType="string">
-        delete from ${prefix}ACT_CMMN_RU_MIL_INST where CASE_INST_ID_ = #{value}
+        delete from ${prefix}ACT_CMMN_RU_MIL_INST where CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
     </delete>
 
     <resultMap id="milestoneInstanceResultMap" type="org.flowable.cmmn.engine.impl.persistence.entity.MilestoneInstanceEntityImpl">
@@ -106,28 +106,28 @@
         from ${prefix}ACT_CMMN_RU_MIL_INST RES
         <where>
             <if test="milestoneInstanceId != null">
-                RES.ID_ = #{milestoneInstanceId}
+                RES.ID_ = #{milestoneInstanceId, jdbcType=VARCHAR}
             </if>
             <if test="name != null">
-                RES.NAME_ = #{name}
+                RES.NAME_ = #{name, jdbcType=VARCHAR}
             </if>
             <if test="caseInstanceId != null">
-                and RES.CASE_INST_ID_ = #{caseInstanceId}
+                and RES.CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
             </if>
             <if test="caseDefinitionId != null">
-                and RES.CASE_DEF_ID_ = #{caseDefinitionId}
+                and RES.CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
             </if>
             <if test="reachedBefore != null">
-                and RES.TIME_STAMP_ &lt;= #{reachedBefore}
+                and RES.TIME_STAMP_ &lt;= #{reachedBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="reachedAfter != null">
-                and RES.TIME_STAMP_ &gt;= #{reachedAfter}
+                and RES.TIME_STAMP_ &gt;= #{reachedAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ is null or RES.TENANT_ID_ = '')
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/PlanItemInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/PlanItemInstance.xml
index 0e933f3c123..0b95bb75bfb 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/PlanItemInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/PlanItemInstance.xml
@@ -11,40 +11,40 @@
               START_USER_ID_, REFERENCE_ID_, REFERENCE_TYPE_, IS_COMPLETEABLE_, ENTRY_CRITERION_ID_, EXIT_CRITERION_ID_, EXTRA_VALUE_, IS_COUNT_ENABLED_, 
               VAR_COUNT_, SENTRY_PART_INST_COUNT_, TENANT_ID_)
         values (
-            #{id ,jdbcType=VARCHAR},
-            1, #{caseDefinitionId ,jdbcType=VARCHAR},
-            #{derivedCaseDefinitionId ,jdbcType=VARCHAR},
-            #{caseInstanceId ,jdbcType=VARCHAR},
-            #{stageInstanceId ,jdbcType=VARCHAR},
+            #{id, jdbcType=VARCHAR},
+            1, #{caseDefinitionId, jdbcType=VARCHAR},
+            #{derivedCaseDefinitionId, jdbcType=VARCHAR},
+            #{caseInstanceId, jdbcType=VARCHAR},
+            #{stageInstanceId, jdbcType=VARCHAR},
             #{isStage, jdbcType=BOOLEAN},
-            #{elementId ,jdbcType=VARCHAR},
+            #{elementId, jdbcType=VARCHAR},
             #{planItemDefinitionId, jdbcType=VARCHAR},
             #{planItemDefinitionType, jdbcType=VARCHAR},
-            #{name ,jdbcType=VARCHAR},
-            #{state ,jdbcType=VARCHAR},
-            #{createTime ,jdbcType=TIMESTAMP},
-            #{lastAvailableTime ,jdbcType=TIMESTAMP},
-            #{lastUnavailableTime ,jdbcType=TIMESTAMP},
-            #{lastEnabledTime ,jdbcType=TIMESTAMP},
-            #{lastDisabledTime ,jdbcType=TIMESTAMP},
-            #{lastStartedTime ,jdbcType=TIMESTAMP},
-            #{lastSuspendedTime ,jdbcType=TIMESTAMP},
-            #{completedTime ,jdbcType=TIMESTAMP},
-            #{occurredTime ,jdbcType=TIMESTAMP},
-            #{terminatedTime ,jdbcType=TIMESTAMP},
-            #{exitTime ,jdbcType=TIMESTAMP},
-            #{endedTime ,jdbcType=TIMESTAMP},
-            #{startUserId ,jdbcType=VARCHAR},
-            #{referenceId ,jdbcType=VARCHAR},
-            #{referenceType ,jdbcType=VARCHAR},
-            #{completable ,jdbcType=BOOLEAN},
+            #{name, jdbcType=VARCHAR},
+            #{state, jdbcType=VARCHAR},
+            #{createTime, jdbcType=TIMESTAMP},
+            #{lastAvailableTime, jdbcType=TIMESTAMP},
+            #{lastUnavailableTime, jdbcType=TIMESTAMP},
+            #{lastEnabledTime, jdbcType=TIMESTAMP},
+            #{lastDisabledTime, jdbcType=TIMESTAMP},
+            #{lastStartedTime, jdbcType=TIMESTAMP},
+            #{lastSuspendedTime, jdbcType=TIMESTAMP},
+            #{completedTime, jdbcType=TIMESTAMP},
+            #{occurredTime, jdbcType=TIMESTAMP},
+            #{terminatedTime, jdbcType=TIMESTAMP},
+            #{exitTime, jdbcType=TIMESTAMP},
+            #{endedTime, jdbcType=TIMESTAMP},
+            #{startUserId, jdbcType=VARCHAR},
+            #{referenceId, jdbcType=VARCHAR},
+            #{referenceType, jdbcType=VARCHAR},
+            #{completable, jdbcType=BOOLEAN},
             #{entryCriterionId, jdbcType=VARCHAR},
             #{exitCriterionId, jdbcType=VARCHAR},
             #{extraValue, jdbcType=VARCHAR},
             #{countEnabled, jdbcType=BOOLEAN},
             #{variableCount, jdbcType=INTEGER},
             #{sentryPartInstanceCount, jdbcType=INTEGER},
-            #{tenantId ,jdbcType=VARCHAR}
+            #{tenantId, jdbcType=VARCHAR}
         )
     </insert>
 
@@ -57,30 +57,30 @@
     values
       <foreach collection="list" item="planItemInstance" index="index" separator=",">
         (
-        	#{planItemInstance.id ,jdbcType=VARCHAR},
-            1, #{planItemInstance.caseDefinitionId ,jdbcType=VARCHAR},
-            #{planItemInstance.derivedCaseDefinitionId ,jdbcType=VARCHAR},
-            #{planItemInstance.caseInstanceId ,jdbcType=VARCHAR},
-            #{planItemInstance.stageInstanceId ,jdbcType=VARCHAR},
+        	#{planItemInstance.id, jdbcType=VARCHAR},
+            1, #{planItemInstance.caseDefinitionId, jdbcType=VARCHAR},
+            #{planItemInstance.derivedCaseDefinitionId, jdbcType=VARCHAR},
+            #{planItemInstance.caseInstanceId, jdbcType=VARCHAR},
+            #{planItemInstance.stageInstanceId, jdbcType=VARCHAR},
             #{planItemInstance.isStage, jdbcType=BOOLEAN},
-            #{planItemInstance.elementId ,jdbcType=VARCHAR},
+            #{planItemInstance.elementId, jdbcType=VARCHAR},
             #{planItemInstance.planItemDefinitionId, jdbcType=VARCHAR},
             #{planItemInstance.planItemDefinitionType, jdbcType=VARCHAR},
-            #{planItemInstance.name ,jdbcType=VARCHAR},
-            #{planItemInstance.state ,jdbcType=VARCHAR},
-            #{planItemInstance.createTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.lastAvailableTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.lastUnavailableTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.lastEnabledTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.lastDisabledTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.lastStartedTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.lastSuspendedTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.completedTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.occurredTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.terminatedTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.exitTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.endedTime ,jdbcType=TIMESTAMP},
-            #{planItemInstance.startUserId ,jdbcType=VARCHAR},
+            #{planItemInstance.name, jdbcType=VARCHAR},
+            #{planItemInstance.state, jdbcType=VARCHAR},
+            #{planItemInstance.createTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.lastAvailableTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.lastUnavailableTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.lastEnabledTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.lastDisabledTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.lastStartedTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.lastSuspendedTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.completedTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.occurredTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.terminatedTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.exitTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.endedTime, jdbcType=TIMESTAMP},
+            #{planItemInstance.startUserId, jdbcType=VARCHAR},
             #{planItemInstance.referenceId, jdbcType=VARCHAR},
             #{planItemInstance.referenceType, jdbcType=VARCHAR},
             #{planItemInstance.completable, jdbcType=BOOLEAN},
@@ -90,7 +90,7 @@
             #{planItemInstance.countEnabled, jdbcType=BOOLEAN},
             #{planItemInstance.variableCount, jdbcType=INTEGER},
             #{planItemInstance.sentryPartInstanceCount, jdbcType=INTEGER},
-            #{planItemInstance.tenantId ,jdbcType=VARCHAR}
+            #{planItemInstance.tenantId, jdbcType=VARCHAR}
         )
       </foreach>
   </insert>
@@ -104,30 +104,30 @@
                                                       START_USER_ID_, REFERENCE_ID_, REFERENCE_TYPE_, IS_COMPLETEABLE_, ENTRY_CRITERION_ID_, EXIT_CRITERION_ID_,
                                                       EXTRA_VALUE_, IS_COUNT_ENABLED_, VAR_COUNT_, SENTRY_PART_INST_COUNT_, TENANT_ID_) VALUES
             (
-                #{planItemInstance.id ,jdbcType=VARCHAR},
-                1, #{planItemInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{planItemInstance.derivedCaseDefinitionId ,jdbcType=VARCHAR},
-                #{planItemInstance.caseInstanceId ,jdbcType=VARCHAR},
-                #{planItemInstance.stageInstanceId ,jdbcType=VARCHAR},
-                #{planItemInstance.isStage ,jdbcType=VARCHAR},
-                #{planItemInstance.elementId ,jdbcType=VARCHAR},
+                #{planItemInstance.id, jdbcType=VARCHAR},
+                1, #{planItemInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{planItemInstance.derivedCaseDefinitionId, jdbcType=VARCHAR},
+                #{planItemInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{planItemInstance.stageInstanceId, jdbcType=VARCHAR},
+                #{planItemInstance.isStage, jdbcType=BOOLEAN},
+                #{planItemInstance.elementId, jdbcType=VARCHAR},
                 #{planItemInstance.planItemDefinitionId, jdbcType=VARCHAR},
                 #{planItemInstance.planItemDefinitionType, jdbcType=VARCHAR},
-                #{planItemInstance.name ,jdbcType=VARCHAR},
-                #{planItemInstance.state ,jdbcType=VARCHAR},
-                #{planItemInstance.createTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.lastAvailableTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.lastUnavailableTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.lastEnabledTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.lastDisabledTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.lastStartedTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.lastSuspendedTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.completedTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.occurredTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.terminatedTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.exitTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.endedTime ,jdbcType=TIMESTAMP},
-                #{planItemInstance.startUserId ,jdbcType=VARCHAR},
+                #{planItemInstance.name, jdbcType=VARCHAR},
+                #{planItemInstance.state, jdbcType=VARCHAR},
+                #{planItemInstance.createTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.lastAvailableTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.lastUnavailableTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.lastEnabledTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.lastDisabledTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.lastStartedTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.lastSuspendedTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.completedTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.occurredTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.terminatedTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.exitTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.endedTime, jdbcType=TIMESTAMP},
+                #{planItemInstance.startUserId, jdbcType=VARCHAR},
                 #{planItemInstance.referenceId, jdbcType=VARCHAR},
                 #{planItemInstance.referenceType, jdbcType=VARCHAR},
                 #{planItemInstance.completable, jdbcType=BOOLEAN},
@@ -137,7 +137,7 @@
                 #{planItemInstance.countEnabled, jdbcType=BOOLEAN},
                 #{planItemInstance.variableCount, jdbcType=INTEGER},
                 #{planItemInstance.sentryPartInstanceCount, jdbcType=INTEGER},
-                #{planItemInstance.tenantId ,jdbcType=VARCHAR}
+                #{planItemInstance.tenantId, jdbcType=VARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -251,19 +251,19 @@
 </update>
 
   <delete id="deletePlanItemInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.PlanItemInstanceEntityImpl">
-    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <delete id="deletePlanItemInstancesByCaseDefinitionId" parameterType="string">
-    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where CASE_DEF_ID_ = #{value}
+    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
   </delete>
 
   <delete id="deletePlanItemInstancesByStageInstanceId" parameterType="string">
-    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where STAGE_INST_ID_ = #{value}
+    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where STAGE_INST_ID_ = #{stageInstanceId, jdbcType=VARCHAR}
   </delete>
 
   <delete id="deletePlanItemInstancesByCaseInstanceId" parameterType="string">
-    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where CASE_INST_ID_ = #{value}
+    delete from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST where CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
   </delete>
 
   <!--
@@ -314,22 +314,22 @@
   
   <select id="selectPlanItemInstancesByCaseInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="planItemInstanceResultMap">
       select * from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST RES
-      where CASE_INST_ID_ = #{parameter}
+      where CASE_INST_ID_ = #{parameter, jdbcType=VARCHAR}
   </select>
 
   <select id="selectPlanItemInstancesByCaseInstanceIdAndPlanItemId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="planItemInstanceResultMap">
       select * from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST RES
-      where CASE_INST_ID_ = #{parameter.caseInstanceId} and ELEMENT_ID_ = #{parameter.planItemId}
+      where CASE_INST_ID_ = #{parameter.caseInstanceId, jdbcType=VARCHAR} and ELEMENT_ID_ = #{parameter.planItemId, jdbcType=VARCHAR}
   </select>
 
     <select id="selectPlanItemInstancesByStageInstanceIdAndPlanItemId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="planItemInstanceResultMap">
         select * from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST RES
-        where STAGE_INST_ID_ = #{parameter.stageInstanceId} and ELEMENT_ID_ = #{parameter.planItemId}
+        where STAGE_INST_ID_ = #{parameter.stageInstanceId, jdbcType=VARCHAR} and ELEMENT_ID_ = #{parameter.planItemId, jdbcType=VARCHAR}
     </select>
 
   <select id="selectPlanItemInstancesByStagePlanItemInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="planItemInstanceResultMap">
       select * from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST RES
-      where STAGE_INST_ID_ = #{parameter}
+      where STAGE_INST_ID_ = #{parameter, jdbcType=VARCHAR}
   </select>
 
    <select id="selectPlanItemInstancesByQueryCriteria" parameterType="org.flowable.cmmn.engine.impl.runtime.PlanItemInstanceQueryImpl" resultMap="planItemInstanceResultMap">
@@ -349,109 +349,109 @@
     from ${prefix}ACT_CMMN_RU_PLAN_ITEM_INST RES
     <where>
         <if test="caseDefinitionId != null">
-            RES.CASE_DEF_ID_ = #{caseDefinitionId}
+            RES.CASE_DEF_ID_ = #{caseDefinitionId, jdbcType=VARCHAR}
         </if>
         <if test="derivedCaseDefinitionId != null">
-            RES.DERIVED_CASE_DEF_ID_ = #{derivedCaseDefinitionId}
+            RES.DERIVED_CASE_DEF_ID_ = #{derivedCaseDefinitionId, jdbcType=VARCHAR}
         </if>
         <if test="caseInstanceId != null">
-            and RES.CASE_INST_ID_ = #{caseInstanceId}
+            and RES.CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
         </if>
         <if test="stageInstanceId != null">
-            and RES.STAGE_INST_ID_ = #{stageInstanceId}
+            and RES.STAGE_INST_ID_ = #{stageInstanceId, jdbcType=VARCHAR}
         </if>
         <if test="planItemInstanceId != null">
-            and RES.ID_ = #{planItemInstanceId}
+            and RES.ID_ = #{planItemInstanceId, jdbcType=VARCHAR}
         </if>
         <if test="elementId != null">
-            and RES.ELEMENT_ID_ = #{elementId}
+            and RES.ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR}
         </if>
         <if test="planItemDefinitionId != null">
-            and RES.ITEM_DEFINITION_ID_ = #{planItemDefinitionId}
+            and RES.ITEM_DEFINITION_ID_ = #{planItemDefinitionId, jdbcType=VARCHAR}
         </if>
         <if test="planItemDefinitionType != null">
-            and RES.ITEM_DEFINITION_TYPE_ = #{planItemDefinitionType}
+            and RES.ITEM_DEFINITION_TYPE_ = #{planItemDefinitionType, jdbcType=VARCHAR}
         </if>
         <if test="planItemDefinitionTypes != null">
-             and RES.ITEM_DEFINITION_TYPE_ in <foreach item="type" index="index" collection="planItemDefinitionTypes" open="(" separator="," close=")">#{type}</foreach>
+             and RES.ITEM_DEFINITION_TYPE_ in <foreach item="planItemDefinitionType" index="index" collection="planItemDefinitionTypes" open="(" separator="," close=")">#{planItemDefinitionType, jdbcType=VARCHAR}</foreach>
         </if>
         <if test="name != null">
-            and RES.NAME_ = #{name}
+            and RES.NAME_ = #{name, jdbcType=VARCHAR}
         </if>
         <if test="state != null">
-            and RES.STATE_ = #{state}
+            and RES.STATE_ = #{state, jdbcType=VARCHAR}
         </if>
         <if test="createdBefore != null">
-            and RES.CREATE_TIME_ &lt;= #{createdBefore}
+            and RES.CREATE_TIME_ &lt;= #{createdBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="createdAfter != null">
-            and RES.CREATE_TIME_ &gt;= #{createdAfter}
+            and RES.CREATE_TIME_ &gt;= #{createdAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastAvailableBefore != null">
-            and RES.LAST_AVAILABLE_TIME_ &lt;= #{lastAvailableBefore}
+            and RES.LAST_AVAILABLE_TIME_ &lt;= #{lastAvailableBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastAvailableAfter != null">
-            and RES.LAST_AVAILABLE_TIME_ &gt;= #{lastAvailableAfter}
+            and RES.LAST_AVAILABLE_TIME_ &gt;= #{lastAvailableAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastUnavailableBefore != null">
-            and RES.LAST_UNAVAILABLE_TIME_ &lt;= #{lastUnavailableBefore}
+            and RES.LAST_UNAVAILABLE_TIME_ &lt;= #{lastUnavailableBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastUnavailableAfter != null">
-            and RES.LAST_UNAVAILABLE_TIME_ &gt;= #{lastUnavailableAfter}
+            and RES.LAST_UNAVAILABLE_TIME_ &gt;= #{lastUnavailableAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastEnabledBefore != null">
-            and RES.LAST_ENABLED_TIME_ &lt;= #{lastEnabledBefore}
+            and RES.LAST_ENABLED_TIME_ &lt;= #{lastEnabledBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastEnabledAfter != null">
-            and RES.LAST_ENABLED_TIME_ &gt;= #{lastEnabledAfter}
+            and RES.LAST_ENABLED_TIME_ &gt;= #{lastEnabledAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastDisabledBefore != null">
-            and RES.LAST_DISABLED_TIME_ &lt;= #{lastDisabledBefore}
+            and RES.LAST_DISABLED_TIME_ &lt;= #{lastDisabledBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastDisabledAfter != null">
-            and RES.LAST_DISABLED_TIME_ &gt;= #{lastDisabledAfter}
+            and RES.LAST_DISABLED_TIME_ &gt;= #{lastDisabledAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastStartedBefore != null">
-            and RES.LAST_STARTED_TIME_ &lt;= #{lastStartedBefore}
+            and RES.LAST_STARTED_TIME_ &lt;= #{lastStartedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastStartedAfter != null">
-            and RES.LAST_STARTED_TIME_ &gt;= #{lastStartedAfter}
+            and RES.LAST_STARTED_TIME_ &gt;= #{lastStartedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="lastSuspendedBefore != null">
-            and RES.LAST_SUSPENDED_TIME_ &lt;= #{lastSuspendedBefore}
+            and RES.LAST_SUSPENDED_TIME_ &lt;= #{lastSuspendedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="lastSuspendedAfter != null">
-            and RES.LAST_SUSPENDED_TIME_ &gt;= #{lastSuspendedAfter}
+            and RES.LAST_SUSPENDED_TIME_ &gt;= #{lastSuspendedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="completedBefore != null">
-            and RES.COMPLETED_TIME_ &lt;= #{completedBefore}
+            and RES.COMPLETED_TIME_ &lt;= #{completedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="completedAfter != null">
-            and RES.COMPLETED_TIME_ &gt;= #{completedAfter}
+            and RES.COMPLETED_TIME_ &gt;= #{completedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="occurredBefore != null">
-            and RES.OCCURRED_TIME_ &lt;= #{occurredBefore}
+            and RES.OCCURRED_TIME_ &lt;= #{occurredBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="occurredAfter != null">
-            and RES.OCCURRED_TIME_ &gt;= #{occurredAfter}
+            and RES.OCCURRED_TIME_ &gt;= #{occurredAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="terminatedBefore != null">
-            and RES.TERMINATED_TIME_ &lt;= #{terminatedBefore}
+            and RES.TERMINATED_TIME_ &lt;= #{terminatedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="terminatedAfter != null">
-            and RES.TERMINATED_TIME_ &gt;= #{terminatedAfter}
+            and RES.TERMINATED_TIME_ &gt;= #{terminatedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="exitBefore != null">
-            and RES.EXIT_TIME_ &lt;= #{exitBefore}
+            and RES.EXIT_TIME_ &lt;= #{exitBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="exitAfter != null">
-            and RES.EXIT_TIME_ &gt;= #{exitAfter}
+            and RES.EXIT_TIME_ &gt;= #{exitAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="endedBefore != null">
-            and RES.ENDED_TIME_ &lt;= #{endedBefore}
+            and RES.ENDED_TIME_ &lt;= #{endedBefore, jdbcType=TIMESTAMP}
         </if>
         <if test="endedAfter != null">
-            and RES.ENDED_TIME_ &gt;= #{endedAfter}
+            and RES.ENDED_TIME_ &gt;= #{endedAfter, jdbcType=TIMESTAMP}
         </if>
         <if test="ended">
             and RES.ENDED_TIME_ is not null
@@ -463,13 +463,13 @@
             and RES.ENDED_TIME_ is null
         </if>
         <if test="startUserId != null">
-            and RES.START_USER_ID_ = #{startUserId}
+            and RES.START_USER_ID_ = #{startUserId, jdbcType=VARCHAR}
         </if>
         <if test="referenceId != null">
-            and RES.REFERENCE_ID_ = #{referenceId}
+            and RES.REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR}
         </if>
         <if test="referenceType != null">
-            and RES.REFERENCE_TYPE_ = #{referenceType}
+            and RES.REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR}
         </if>
         <if test="completable">
             and RES.IS_COMPLETEABLE_ = #{completable, jdbcType=BOOLEAN}
@@ -490,7 +490,7 @@
             and RES.EXTRA_VALUE_ = #{extraValue, jdbcType=VARCHAR}
         </if>
         <if test="tenantId != null">
-            and RES.TENANT_ID_ = #{tenantId}
+            and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
         </if>
         <if test="withoutTenantId">
             and (RES.TENANT_ID_ is null or RES.TENANT_ID_ = '')
@@ -500,7 +500,7 @@
                 and
                 (
                   <if test="involvedUser != null">
-                    I.USER_ID_ = #{involvedUser}
+                    I.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR}
                   </if>
                   <if test="involvedUser != null &amp;&amp; involvedGroups != null &amp;&amp; !involvedGroups.empty">
                     or
@@ -512,9 +512,9 @@
                         or
                         </if>
                         I.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="involvedGroupListItem"
+                        <foreach item="involvedGroup" index="index" collection="involvedGroupListItem"
                               open="(" separator="," close=")">
-                          #{group}
+                          #{involvedGroup, jdbcType=NVARCHAR}
                         </foreach>
                     </foreach>
                     )
@@ -526,7 +526,7 @@
           <choose>
             <when test="queryVariableValue.operator.equals('EXISTS')">
               and EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name}
+                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR}
                 <if test="!queryVariableValue.local">
                     and RES.CASE_INST_ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn'
                 </if>
@@ -537,7 +537,7 @@
             </when>
             <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
               and NOT EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name}
+                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR}
                 <if test="!queryVariableValue.local">
                     and RES.CASE_INST_ID_ = SCOPE_ID_ and SUB_SCOPE_ID_ is null and SCOPE_TYPE_ = 'cmmn'
                 </if>
@@ -562,10 +562,10 @@
                         </if>
                         <if test="queryVariableValue.name != null">
                             <!-- Match-all variable-names when name is null -->
-                            and V.NAME_= #{queryVariableValue.name}
+                            and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                         </if>
                         <if test="queryVariableValue.needsTypeCheck()">
-                            and V.TYPE_ = #{queryVariableValue.type}
+                            and V.TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                         </if>
                         <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                             <choose>
@@ -580,7 +580,7 @@
                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                 <otherwise><include refid="variableOperator" /></otherwise>
                             </choose>
-                            #{queryVariableValue.textValue}
+                            #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -595,7 +595,7 @@
                                 <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                 <otherwise><include refid="variableOperator" /></otherwise>
                             </choose>
-                            #{queryVariableValue.textValue2}
+                            #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -603,7 +603,7 @@
                         <if test="queryVariableValue.longValue != null">
                             and (V.LONG_
                             <include refid="variableOperator" />
-                            #{queryVariableValue.longValue}
+                            #{queryVariableValue.longValue, jdbcType=BIGINT}
                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.LONG_ is null
                             </if>
@@ -612,7 +612,7 @@
                         <if test="queryVariableValue.doubleValue != null">
                             and (V.DOUBLE_
                             <include refid="variableOperator" />
-                            #{queryVariableValue.doubleValue}
+                            #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.DOUBLE_ is null
                             </if>
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/SentryPartInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/SentryPartInstance.xml
index e2bf6b6a395..c3aa18c9d72 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/SentryPartInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/SentryPartInstance.xml
@@ -7,13 +7,13 @@
     <insert id="insertSentryPartInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.SentryPartInstanceEntityImpl">
         insert into ${prefix}ACT_CMMN_RU_SENTRY_PART_INST (ID_, REV_, CASE_DEF_ID_, CASE_INST_ID_, PLAN_ITEM_INST_ID_, ON_PART_ID_, IF_PART_ID_, TIME_STAMP_)
         values (
-            #{id ,jdbcType=VARCHAR},
-            1, #{caseDefinitionId ,jdbcType=VARCHAR},
-            #{caseInstanceId ,jdbcType=VARCHAR},
-            #{planItemInstanceId ,jdbcType=VARCHAR},
-            #{onPartId ,jdbcType=VARCHAR},
-            #{ifPartId ,jdbcType=VARCHAR},
-            #{timeStamp ,jdbcType=TIMESTAMP}
+            #{id, jdbcType=VARCHAR},
+            1, #{caseDefinitionId, jdbcType=VARCHAR},
+            #{caseInstanceId, jdbcType=VARCHAR},
+            #{planItemInstanceId, jdbcType=VARCHAR},
+            #{onPartId, jdbcType=VARCHAR},
+            #{ifPartId, jdbcType=VARCHAR},
+            #{timeStamp, jdbcType=TIMESTAMP}
         )
     </insert>
 
@@ -23,13 +23,13 @@
         values
         <foreach collection="list" item="sentryPartInstance" index="index" separator=",">
             (
-                #{sentryPartInstance.id ,jdbcType=VARCHAR},
-                1, #{sentryPartInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.caseInstanceId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.planItemInstanceId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.onPartId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.ifPartId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.timeStamp,jdbcType=TIMESTAMP}
+                #{sentryPartInstance.id, jdbcType=VARCHAR},
+                1, #{sentryPartInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{sentryPartInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{sentryPartInstance.planItemInstanceId, jdbcType=VARCHAR},
+                #{sentryPartInstance.onPartId, jdbcType=VARCHAR},
+                #{sentryPartInstance.ifPartId, jdbcType=VARCHAR},
+                #{sentryPartInstance.timeStamp, jdbcType=TIMESTAMP}
             )
         </foreach>
     </insert>
@@ -39,13 +39,13 @@
         <foreach collection="list" item="sentryPartInstance" index="index">
             into ${prefix}ACT_CMMN_RU_SENTRY_PART_INST (ID_, REV_, CASE_DEF_ID_, CASE_INST_ID_, PLAN_ITEM_INST_ID_, ON_PART_ID_, IF_PART_ID_, TIME_STAMP_) VALUES
             (
-                #{sentryPartInstance.id ,jdbcType=VARCHAR},
-                1, #{sentryPartInstance.caseDefinitionId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.caseInstanceId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.planItemInstanceId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.onPartId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.ifPartId ,jdbcType=VARCHAR},
-                #{sentryPartInstance.timeStamp ,jdbcType=TIMESTAMP}
+                #{sentryPartInstance.id, jdbcType=VARCHAR},
+                1, #{sentryPartInstance.caseDefinitionId, jdbcType=VARCHAR},
+                #{sentryPartInstance.caseInstanceId, jdbcType=VARCHAR},
+                #{sentryPartInstance.planItemInstanceId, jdbcType=VARCHAR},
+                #{sentryPartInstance.onPartId, jdbcType=VARCHAR},
+                #{sentryPartInstance.ifPartId, jdbcType=VARCHAR},
+                #{sentryPartInstance.timeStamp, jdbcType=TIMESTAMP}
             )
         </foreach>
         SELECT * FROM dual
@@ -78,11 +78,11 @@
     </update>
 
     <delete id="deleteSentryPartInstance" parameterType="org.flowable.cmmn.engine.impl.persistence.entity.SentryPartInstanceEntityImpl">
-        delete from ${prefix}ACT_CMMN_RU_SENTRY_PART_INST where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_CMMN_RU_SENTRY_PART_INST where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
     
      <delete id="deleteSentryPartInstancesByCaseInstanceId" parameterType="String">
-        delete from ${prefix}ACT_CMMN_RU_SENTRY_PART_INST where CASE_INST_ID_ = #{id}
+        delete from ${prefix}ACT_CMMN_RU_SENTRY_PART_INST where CASE_INST_ID_ = #{caseInstanceId, jdbcType=VARCHAR}
     </delete>
     
 
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/Decision.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/Decision.xml
index 75736fddfd8..bcd540d8d07 100644
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/Decision.xml
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/Decision.xml
@@ -78,15 +78,15 @@
   <!-- DECISION TABLE DELETE -->
 
   <delete id="deleteDecisionsByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_DMN_DECISION where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}ACT_DMN_DECISION where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
   </delete>
   
   <!-- DECISION TABLE RESULTMAP -->
 
   <resultMap id="decisionResultMap" type="org.flowable.dmn.engine.impl.persistence.entity.DecisionEntityImpl">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
+    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" jdbcType="VARCHAR" />
     <result property="key" column="KEY_" jdbcType="VARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
     <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR"/>
@@ -103,7 +103,7 @@
   </select>
 
   <select id="selectDecisionById" parameterType="string" resultMap="decisionResultMap">
-    select * from ${prefix}ACT_DMN_DECISION where ID_ = #{decisionId}
+    select * from ${prefix}ACT_DMN_DECISION where ID_ = #{decisionId, jdbcType=VARCHAR}
   </select>
 
   <select id="selectDecisionsByQueryCriteria" parameterType="org.flowable.dmn.engine.impl.DecisionQueryImpl" resultMap="decisionResultMap">
@@ -123,75 +123,75 @@
     from ${prefix}ACT_DMN_DECISION RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}
+        and RES.KEY_ like #{keyLike, jdbcType=VARCHAR}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=VARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=VARCHAR}
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="parentDeploymentId != null">
-        and EXISTS (select 1 from ${prefix}ACT_DMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = RES.DEPLOYMENT_ID_)
+        and EXISTS (select 1 from ${prefix}ACT_DMN_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR} and D.ID_ = RES.DEPLOYMENT_ID_)
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}ACT_DMN_DECISION where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-	           and TENANT_ID_ = #{tenantId}
+	           and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
 	         </if>
 	         <if test="tenantIdLike != null">
-	           and TENANT_ID_ like #{tenantIdLike}
+	           and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
 	         </if>
 	         <if test="withoutTenantId">
 	           and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -202,19 +202,19 @@
         )
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="decisionType != null">
-        and RES.DECISION_TYPE_ = #{decisionType}
+        and RES.DECISION_TYPE_ = #{decisionType, jdbcType=VARCHAR}
       </if>
       <if test="decisionTypeLike != null">
-        and RES.DECISION_TYPE_ like #{decisionTypeLike}
+        and RES.DECISION_TYPE_ like #{decisionTypeLike, jdbcType=VARCHAR}
       </if>
     </where>
   </sql>
@@ -222,46 +222,46 @@
   <select id="selectDecisionByDeploymentAndKey" parameterType="map" resultMap="decisionResultMap">
     select * 
     from ${prefix}ACT_DMN_DECISION 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{decisionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{decisionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
   <select id="selectDecisionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="decisionResultMap">
     select * 
     from ${prefix}ACT_DMN_DECISION 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{decisionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{decisionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
   
   <select id="selectDecisionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="decisionResultMap">
     select *
     from ${prefix}ACT_DMN_DECISION 
-    where KEY_ = #{parameter.decisionKey} and VERSION_ = #{parameter.decisionVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.decisionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.decisionVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
     
   
   <select id="selectDecisionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="decisionResultMap">
     select *
     from ${prefix}ACT_DMN_DECISION 
-    where KEY_ = #{parameter.decisionKey} and VERSION_ = #{parameter.decisionVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.decisionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.decisionVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectLatestDecisionByKey" parameterType="string" resultMap="decisionResultMap">
     select *
     from ${prefix}ACT_DMN_DECISION 
-    where KEY_ = #{key} and
+    where KEY_ = #{key, jdbcType=VARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_DMN_DECISION where KEY_ = #{decisionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_DMN_DECISION where KEY_ = #{decisionKey, jdbcType=VARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
   
   <select id="selectLatestDecisionByKeyAndTenantId" parameterType="map" resultMap="decisionResultMap">
     select *
     from ${prefix}ACT_DMN_DECISION 
-    where KEY_ = #{decisionKey} and
-          TENANT_ID_ = #{tenantId} and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_DMN_DECISION where KEY_ = #{decisionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{decisionKey, jdbcType=VARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=VARCHAR} and
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_DMN_DECISION where KEY_ = #{decisionKey, jdbcType=VARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR})
   </select>
   
   <select id="selectDecisionByNativeQuery" parameterType="java.util.Map" resultMap="decisionResultMap">
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnDeployment.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnDeployment.xml
index 87ab78ab9a7..f3ef7cc4512 100644
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnDeployment.xml
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnDeployment.xml
@@ -64,7 +64,7 @@
   <!-- DEPLOYMENT DELETE -->
   
   <delete id="deleteDmnDeployment" parameterType="string">
-    delete from ${prefix}ACT_DMN_DEPLOYMENT where ID_ = #{id}
+    delete from ${prefix}ACT_DMN_DEPLOYMENT where ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <!-- DEPLOYMENT RESULTMAP -->
@@ -97,42 +97,42 @@
     from ${prefix}ACT_DMN_DEPLOYMENT RES
     <where>
       <if test="deploymentId != null">
-        RES.ID_ = #{deploymentId}
+        RES.ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="parentDeploymentId != null">
-        and RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId}
+        and RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR}
       </if>
       <if test="parentDeploymentIdLike != null">
-        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike}
+        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike, jdbcType=VARCHAR}
       </if>
       <if test="decisionKey != null || decisionKeyLike != null">
         and exists(select 1 from ${prefix}ACT_DMN_DECISION DECISION where RES.ID_ = DECISION.DEPLOYMENT_ID_
         <if test="decisionKey != null">
-          and DECISION.KEY_ = #{decisionKey}
+          and DECISION.KEY_ = #{decisionKey, jdbcType=VARCHAR}
         </if>
         <if test="decisionKeyLike != null">
-          and DECISION.KEY_ like #{decisionKeyLike}
+          and DECISION.KEY_ like #{decisionKeyLike, jdbcType=VARCHAR}
         </if>
         )
       </if>
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnResource.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnResource.xml
index a2fb6a19bc6..15a5e638e0e 100644
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnResource.xml
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/DmnResource.xml
@@ -13,11 +13,11 @@
 
   <insert id="bulkInsertDmnResource" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE(ID_, NAME_, RESOURCE_BYTES_, DEPLOYMENT_ID_) VALUES 
-      <foreach collection="list" item="byteArr" index="index" separator=","> 
-        (#{byteArr.id, jdbcType=VARCHAR},
-         #{byteArr.name, jdbcType=VARCHAR},
-         #{byteArr.bytes, jdbcType=${blobType}},
-         #{byteArr.deploymentId, jdbcType=VARCHAR})
+      <foreach collection="list" item="resource" index="index" separator=",">
+        (#{resource.id, jdbcType=VARCHAR},
+         #{resource.name, jdbcType=VARCHAR},
+         #{resource.bytes, jdbcType=${blobType}},
+         #{resource.deploymentId, jdbcType=VARCHAR})
       </foreach>
   </insert>
 
@@ -46,7 +46,7 @@
   <!-- RESOURCE DELETE -->
 
   <delete id="deleteDmnResourcesByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id}
+    delete from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id, jdbcType=VARCHAR}
   </delete>
   
   <!-- RESOURCE RESULTMAP -->
@@ -60,17 +60,17 @@
   <!-- RESOURCE SELECT -->
 
   <select id="selectDmnResourceNamesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
-    select NAME_ from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select NAME_ from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <select id="selectDmnResourceByDeploymentIdAndResourceName" parameterType="map" resultMap="dmnResourceResultMap">
     select * from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-          AND NAME_ = #{resourceName}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+          AND NAME_ = #{resourceName, jdbcType=VARCHAR}
   </select>
 
   <select id="selectDmnResourcesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="dmnResourceResultMap">
-    select * from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select * from ${prefix}ACT_DMN_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>  
   
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/HistoricDecisionExecution.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/HistoricDecisionExecution.xml
index 92a2926b98d..8793fb3b4c3 100644
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/HistoricDecisionExecution.xml
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/entity/HistoricDecisionExecution.xml
@@ -77,7 +77,7 @@
   <!-- HISTORIC DECISION EXECUTION DELETE -->
 
   <delete id="deleteHistoricDecisionExecutionsByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_DMN_HI_DECISION_EXECUTION where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}ACT_DMN_HI_DECISION_EXECUTION where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricDecisionExecutionsByInstanceIdsAndScopeType" parameterType="map">
@@ -87,8 +87,8 @@
         or
         </if>
         INSTANCE_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="instanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{instanceId, jdbcType=VARCHAR}
         </foreach>
     </foreach>)
     <choose>
@@ -96,7 +96,7 @@
           and SCOPE_TYPE_ is null
         </when>
         <otherwise>
-          and SCOPE_TYPE_ = #{scopeType}
+          and SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
         </otherwise>
     </choose>
   </delete>
@@ -161,56 +161,56 @@
         inner join ${prefix}ACT_DMN_DECISION DEF on RES.DECISION_DEFINITION_ID_ = DEF.ID_
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="decisionDefinitionId != null">
-        and RES.DECISION_DEFINITION_ID_ = #{decisionDefinitionId}
+        and RES.DECISION_DEFINITION_ID_ = #{decisionDefinitionId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="decisionKey != null">
-        and DEF.KEY_ = #{decisionKey}
+        and DEF.KEY_ = #{decisionKey, jdbcType=VARCHAR}
       </if>
       <if test="instanceId != null">
-        and RES.INSTANCE_ID_ = #{instanceId}
+        and RES.INSTANCE_ID_ = #{instanceId, jdbcType=VARCHAR}
       </if>
       <if test="executionId != null">
-        and RES.EXECUTION_ID_ = #{executionId}
+        and RES.EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR}
       </if>
       <if test="activityId != null">
-        and RES.ACTIVITY_ID_ = #{activityId}
+        and RES.ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR}
       </if>
       <if test="scopeType != null">
-        and RES.SCOPE_TYPE_ = #{scopeType}
+        and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
       </if>
       <if test="withoutScopeType">
         and RES.SCOPE_TYPE_ is null
       </if>
       <if test="processInstanceIdWithChildren != null">
-        and (RES.INSTANCE_ID_ = #{processInstanceIdWithChildren} or exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and 
-            ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'bpmn' and 
+        and (RES.INSTANCE_ID_ = #{processInstanceIdWithChildren, jdbcType=VARCHAR} or exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
+            ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren, jdbcType=VARCHAR} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
             ELINK.REF_SCOPE_ID_ = RES.INSTANCE_ID_))
       </if>
       <if test="caseInstanceIdWithChildren != null">
-        and (RES.INSTANCE_ID_ = #{caseInstanceIdWithChildren} or exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and 
-            ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'cmmn' and 
+        and (RES.INSTANCE_ID_ = #{caseInstanceIdWithChildren, jdbcType=VARCHAR} or exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
+            ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren, jdbcType=VARCHAR} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
             ELINK.REF_SCOPE_ID_ = RES.INSTANCE_ID_))
       </if>
       <if test="failed != null">
-        and RES.FAILED_ = #{failed}
+        and RES.FAILED_ = #{failed, jdbcType=BOOLEAN}
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
index 2a01c310245..18fe91b33a0 100755
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
@@ -932,9 +932,23 @@ public void initMybatisTypeHandlers(Configuration configuration) {
 
         handlerRegistry.register(Object.class, JdbcType.CHAR, new StringTypeHandler());
         handlerRegistry.register(Object.class, JdbcType.CLOB, new ClobTypeHandler());
-        handlerRegistry.register(Object.class, JdbcType.VARCHAR, new StringTypeHandler());
+
+        // For SQL server, the performance difference between using varchar or nvarchar is big.
+        // Using the correct jdbcType is thus very important for SQL server, but in many mappings the type was not set,
+        // which led to defaulting to the regular 'varchar' jdbcType.
+        // Up to the point where the following if was added, none of the MyBatis mappings would use 'nvarchar' as jdbcType.
+        // Together with this check, all mappings were reviewed and the correct type was added.
+        if (databaseType.equals(DATABASE_TYPE_MSSQL)) {
+            handlerRegistry.register(Object.class, JdbcType.VARCHAR, new StringTypeHandler());
+            handlerRegistry.register(Object.class, JdbcType.NVARCHAR, new NStringTypeHandler()); // Notice the 'N' prefix here
+        } else {
+            // However, for other databases, we want to keep the old behavior of always using 'varchar',
+            // thus the same handler is used for both types.
+            handlerRegistry.register(Object.class, JdbcType.VARCHAR, new StringTypeHandler());
+            handlerRegistry.register(Object.class, JdbcType.NVARCHAR, new StringTypeHandler()); // Notice: no 'N' prefix here
+        }
+
         handlerRegistry.register(Object.class, JdbcType.LONGVARCHAR, new StringTypeHandler());
-        handlerRegistry.register(Object.class, JdbcType.NVARCHAR, new NStringTypeHandler());
         handlerRegistry.register(Object.class, JdbcType.NCHAR, new NStringTypeHandler());
         handlerRegistry.register(Object.class, JdbcType.NCLOB, new NClobTypeHandler());
 
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ByteArray.xml b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ByteArray.xml
index f6bd935227c..4196853a18f 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ByteArray.xml
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ByteArray.xml
@@ -9,11 +9,11 @@
   <insert id="insertByteArray" parameterType="org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityImpl">
     insert into ${prefix}ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_)
     values (
-      #{id, jdbcType=VARCHAR},
+      #{id, jdbcType=NVARCHAR},
       1, 
-      #{name, jdbcType=VARCHAR}, 
+      #{name, jdbcType=NVARCHAR}, 
       #{bytes, jdbcType=${blobType}}, 
-      #{deploymentId, jdbcType=VARCHAR}
+      #{deploymentId, jdbcType=NVARCHAR}
     )  
   </insert>
 
@@ -21,11 +21,11 @@
     insert into ${prefix}ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_)
     values
       <foreach collection="list" item="byteArray" index="index" separator=","> 
-         (#{byteArray.id, jdbcType=VARCHAR},
+         (#{byteArray.id, jdbcType=NVARCHAR},
           1, 
-          #{byteArray.name, jdbcType=VARCHAR}, 
+          #{byteArray.name, jdbcType=NVARCHAR}, 
           #{byteArray.bytes, jdbcType=${blobType}}, 
-          #{byteArray.deploymentId, jdbcType=VARCHAR})
+          #{byteArray.deploymentId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -33,11 +33,11 @@
     INSERT ALL 
       <foreach collection="list" item="byteArray" index="index">
         into ${prefix}ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) VALUES 
-         (#{byteArray.id, jdbcType=VARCHAR},
+         (#{byteArray.id, jdbcType=NVARCHAR},
           1, 
-          #{byteArray.name, jdbcType=VARCHAR}, 
+          #{byteArray.name, jdbcType=NVARCHAR}, 
           #{byteArray.bytes, jdbcType=${blobType}}, 
-          #{byteArray.deploymentId, jdbcType=VARCHAR})
+          #{byteArray.deploymentId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -50,26 +50,26 @@
       REV_ = #{revisionNext, jdbcType=INTEGER},
       BYTES_ = #{bytes, jdbcType=${blobType}},
     </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
   <!-- BYTE ARRAY DELETE -->
 
   <select id="selectBytesOfByteArray" parameterType="string" resultType="hashmap">
-    select BYTES_ from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id} and REV_ = #{revision}
+    select BYTES_ from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </select>
 
   <delete id="deleteByteArraysForDeployment" parameterType="org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityImpl">
-    delete from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <delete id="deleteByteArray" parameterType="org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityImpl">
-    delete from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <delete id="deleteByteArrayNoRevisionCheck" parameterType="string">
-    delete from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id}
+    delete from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteByteArraysNoRevisionCheck" parameterType="java.util.List">
@@ -79,8 +79,8 @@
           or
         </if>
         ID_ in
-        <foreach item="byteArrayId" index="index" collection="byteArrayItem" open="(" separator="," close=")">
-          #{byteArrayId}
+        <foreach item="id" index="index" collection="byteArrayItem" open="(" separator="," close=")">
+          #{id, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -88,11 +88,11 @@
   <!-- BYTE ARRAY RESULTMAP -->
   
   <resultMap id="byteArrayResultMap" type="org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="NVARCHAR"/>
     <result property="bytes" column="BYTES_" jdbcType="${blobType}"/>  
-    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR" />
+    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- BYTE ARRAY SELECT -->
@@ -102,7 +102,7 @@
   </select>
   
   <select id="selectByteArray" parameterType="string" resultMap="byteArrayResultMap">
-   select * from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id, jdbcType=VARCHAR}
+   select * from ${prefix}ACT_GE_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
 
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml
index 00a6102aaf3..2c598d5d3c9 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml
@@ -12,8 +12,8 @@
         VALUE_,
         REV_
       ) values (
-        #{name ,jdbcType=VARCHAR},
-        #{value, jdbcType=VARCHAR},
+        #{name, jdbcType=NVARCHAR},
+        #{value, jdbcType=NVARCHAR},
         1
       )
   </insert>
@@ -21,8 +21,8 @@
   <insert id="bulkInsertProperty" parameterType="java.util.List">
       INSERT INTO ${prefix}ACT_GE_PROPERTY (NAME_, VALUE_, REV_) VALUES 
       <foreach collection="list" item="property" index="index" separator=","> 
-        (#{property.name ,jdbcType=VARCHAR},
-         #{property.value, jdbcType=VARCHAR},
+        (#{property.name, jdbcType=NVARCHAR},
+         #{property.value, jdbcType=NVARCHAR},
          1)
       </foreach>
   </insert>
@@ -31,8 +31,8 @@
     INSERT ALL 
     <foreach collection="list" item="property" index="index">
       INTO ${prefix}ACT_GE_PROPERTY (NAME_, VALUE_, REV_) VALUES
-      (#{property.name ,jdbcType=VARCHAR},
-       #{property.value, jdbcType=VARCHAR},
+      (#{property.name, jdbcType=NVARCHAR},
+       #{property.value, jdbcType=NVARCHAR},
        1)
     </foreach>
     SELECT * FROM dual
@@ -44,8 +44,8 @@
         VALUE_,
         REV_
       ) values (
-        #{name ,jdbcType=VARCHAR},
-        #{value, jdbcType=VARCHAR},
+        #{name, jdbcType=NVARCHAR},
+        #{value, jdbcType=NVARCHAR},
         1
       )
   </insert>
@@ -56,24 +56,24 @@
     update ${prefix}ACT_GE_PROPERTY
     <set>
       REV_ = #{revisionNext, jdbcType=INTEGER},
-      VALUE_ = #{value, jdbcType=VARCHAR},
+      VALUE_ = #{value, jdbcType=NVARCHAR},
     </set>
-    where NAME_ = #{name, jdbcType=VARCHAR}
+    where NAME_ = #{name, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <!-- PROPERTY DELETE -->
   
   <delete id="deleteProperty" parameterType="org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl">
-    delete from ${prefix}ACT_GE_PROPERTY where NAME_ = #{name} and REV_ = #{revision}
+    delete from ${prefix}ACT_GE_PROPERTY where NAME_ = #{name, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
 
   <!-- PROPERTY SELECT -->
   
   <resultMap id="propertyResultMap" type="org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl">
-    <id property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="value" column="VALUE_" jdbcType="VARCHAR" />
+    <id property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="value" column="VALUE_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
   </resultMap>
   
@@ -82,7 +82,7 @@
   </select>
 
   <select id="selectProperty" parameterType="string" resultMap="propertyResultMap">
-    select * from ${prefix}ACT_GE_PROPERTY where NAME_ = #{name, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_GE_PROPERTY where NAME_ = #{name, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectProperties" resultMap="propertyResultMap">
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ActivityInstance.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ActivityInstance.xml
index c0797516b56..63b123b7cf2 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ActivityInstance.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ActivityInstance.xml
@@ -40,22 +40,22 @@
         DELETE_REASON_,
         TENANT_ID_
       ) values (
-        #{id ,jdbcType=VARCHAR},
-        1, #{processDefinitionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{executionId, jdbcType=VARCHAR},
-        #{activityId ,jdbcType=VARCHAR},
-        #{taskId ,jdbcType=VARCHAR},
-        #{calledProcessInstanceId ,jdbcType=VARCHAR},
-        #{activityName ,jdbcType=VARCHAR},
-        #{activityType ,jdbcType=VARCHAR},
-        #{assignee ,jdbcType=VARCHAR},
+        #{id, jdbcType=NVARCHAR},
+        1, #{processDefinitionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{activityId, jdbcType=NVARCHAR},
+        #{taskId, jdbcType=NVARCHAR},
+        #{calledProcessInstanceId, jdbcType=NVARCHAR},
+        #{activityName, jdbcType=NVARCHAR},
+        #{activityType, jdbcType=NVARCHAR},
+        #{assignee, jdbcType=NVARCHAR},
         #{startTime, jdbcType=TIMESTAMP},
         #{endTime, jdbcType=TIMESTAMP},
-        #{transactionOrder ,jdbcType=INTEGER},
-        #{durationInMillis ,jdbcType=BIGINT},
-        #{deleteReason, jdbcType=VARCHAR},
-        #{tenantId, jdbcType=VARCHAR}
+        #{transactionOrder, jdbcType=INTEGER},
+        #{durationInMillis, jdbcType=BIGINT},
+        #{deleteReason, jdbcType=NVARCHAR},
+        #{tenantId, jdbcType=NVARCHAR}
       )
   </insert>
   
@@ -80,22 +80,22 @@
         TENANT_ID_
       ) values 
       <foreach collection="list" item="activityInstance" index="index" separator=",">
-         (#{activityInstance.id ,jdbcType=VARCHAR},
-          1, #{activityInstance.processDefinitionId, jdbcType=VARCHAR},
-          #{activityInstance.processInstanceId, jdbcType=VARCHAR},
-          #{activityInstance.executionId, jdbcType=VARCHAR},
-          #{activityInstance.activityId ,jdbcType=VARCHAR},
-          #{activityInstance.taskId ,jdbcType=VARCHAR},
-          #{activityInstance.calledProcessInstanceId ,jdbcType=VARCHAR},
-          #{activityInstance.activityName ,jdbcType=VARCHAR},
-          #{activityInstance.activityType ,jdbcType=VARCHAR},
-          #{activityInstance.assignee ,jdbcType=VARCHAR},
+         (#{activityInstance.id, jdbcType=NVARCHAR},
+          1, #{activityInstance.processDefinitionId, jdbcType=NVARCHAR},
+          #{activityInstance.processInstanceId, jdbcType=NVARCHAR},
+          #{activityInstance.executionId, jdbcType=NVARCHAR},
+          #{activityInstance.activityId, jdbcType=NVARCHAR},
+          #{activityInstance.taskId, jdbcType=NVARCHAR},
+          #{activityInstance.calledProcessInstanceId, jdbcType=NVARCHAR},
+          #{activityInstance.activityName, jdbcType=NVARCHAR},
+          #{activityInstance.activityType, jdbcType=NVARCHAR},
+          #{activityInstance.assignee, jdbcType=NVARCHAR},
           #{activityInstance.startTime, jdbcType=TIMESTAMP},
           #{activityInstance.endTime, jdbcType=TIMESTAMP},
           #{activityInstance.transactionOrder, jdbcType=INTEGER},
-          #{activityInstance.durationInMillis ,jdbcType=BIGINT},
-          #{activityInstance.deleteReason ,jdbcType=VARCHAR},
-          #{activityInstance.tenantId, jdbcType=VARCHAR})
+          #{activityInstance.durationInMillis, jdbcType=BIGINT},
+          #{activityInstance.deleteReason, jdbcType=NVARCHAR},
+          #{activityInstance.tenantId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
   
@@ -121,22 +121,22 @@
           DELETE_REASON_,
           TENANT_ID_
         ) VALUES 
-           (#{activityInstance.id ,jdbcType=VARCHAR},
-            1, #{activityInstance.processDefinitionId, jdbcType=VARCHAR},
-            #{activityInstance.processInstanceId, jdbcType=VARCHAR},
-            #{activityInstance.executionId, jdbcType=VARCHAR},
-            #{activityInstance.activityId ,jdbcType=VARCHAR},
-            #{activityInstance.taskId ,jdbcType=VARCHAR},
-            #{activityInstance.calledProcessInstanceId ,jdbcType=VARCHAR},
-            #{activityInstance.activityName ,jdbcType=VARCHAR},
-            #{activityInstance.activityType ,jdbcType=VARCHAR},
-            #{activityInstance.assignee ,jdbcType=VARCHAR},
+           (#{activityInstance.id, jdbcType=NVARCHAR},
+            1, #{activityInstance.processDefinitionId, jdbcType=NVARCHAR},
+            #{activityInstance.processInstanceId, jdbcType=NVARCHAR},
+            #{activityInstance.executionId, jdbcType=NVARCHAR},
+            #{activityInstance.activityId, jdbcType=NVARCHAR},
+            #{activityInstance.taskId, jdbcType=NVARCHAR},
+            #{activityInstance.calledProcessInstanceId, jdbcType=NVARCHAR},
+            #{activityInstance.activityName, jdbcType=NVARCHAR},
+            #{activityInstance.activityType, jdbcType=NVARCHAR},
+            #{activityInstance.assignee, jdbcType=NVARCHAR},
             #{activityInstance.startTime, jdbcType=TIMESTAMP},
             #{activityInstance.endTime, jdbcType=TIMESTAMP},
             #{activityInstance.transactionOrder, jdbcType=INTEGER},
-            #{activityInstance.durationInMillis ,jdbcType=BIGINT},
-            #{activityInstance.deleteReason ,jdbcType=VARCHAR},
-            #{activityInstance.tenantId, jdbcType=VARCHAR})
+            #{activityInstance.durationInMillis, jdbcType=BIGINT},
+            #{activityInstance.deleteReason, jdbcType=NVARCHAR},
+            #{activityInstance.tenantId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -148,90 +148,90 @@
     <set>
         REV_ = #{revisionNext, jdbcType=INTEGER},
         <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-            PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+            PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.executionId != executionId">
-            EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+            EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.taskId != taskId">
-            TASK_ID_ = #{taskId, jdbcType=VARCHAR},
+            TASK_ID_ = #{taskId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.assignee != assignee">
-            ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
+            ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.endTime != endTime">
-            END_TIME_ = #{endTime, jdbcType=VARCHAR},
+            END_TIME_ = #{endTime, jdbcType=TIMESTAMP},
         </if>
         <if test="originalPersistentState.transactionOrder != transactionOrder">
         	TRANSACTION_ORDER_ = #{transactionOrder, jdbcType=INTEGER}, 
         </if>
         <if test="originalPersistentState.durationInMillis != durationInMillis">
-            DURATION_ = #{durationInMillis, jdbcType=VARCHAR},
+            DURATION_ = #{durationInMillis, jdbcType=BIGINT},
         </if>
         <if test="originalPersistentState.deleteReason != deleteReason">
-            DELETE_REASON_ = #{deleteReason, jdbcType=VARCHAR},
+            DELETE_REASON_ = #{deleteReason, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.calledProcessInstanceId != calledProcessInstanceId">
-            CALL_PROC_INST_ID_ = #{calledProcessInstanceId, jdbcType=VARCHAR},
+            CALL_PROC_INST_ID_ = #{calledProcessInstanceId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.activityId != activityId">
-            ACT_ID_ = #{activityId, jdbcType=VARCHAR},
+            ACT_ID_ = #{activityId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.activityName != activityName">
-            ACT_NAME_ = #{activityName, jdbcType=VARCHAR},
+            ACT_NAME_ = #{activityName, jdbcType=NVARCHAR},
         </if>
     </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
     and REV_ = #{revision, jdbcType=INTEGER}
 </update>
 
   <!-- ACTIVITY INSTANCE DELETE -->
   
   <delete id="deleteActivityInstancesByProcessInstanceId">
-    delete from ${prefix}ACT_RU_ACTINST where PROC_INST_ID_ = #{processInstanceId}
+    delete from ${prefix}ACT_RU_ACTINST where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteActivityInstancesByProcessDefinitionId">
-    delete from ${prefix}ACT_RU_ACTINST where PROC_DEF_ID_ = #{processDefinitionId}
+    delete from ${prefix}ACT_RU_ACTINST where PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteActivityInstance">
-    delete from ${prefix}ACT_RU_ACTINST where ID_ = #{id}
+    delete from ${prefix}ACT_RU_ACTINST where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="bulkDeleteActivityInstance" parameterType="java.util.Collection">
     delete from ${prefix}ACT_RU_ACTINST where
     <foreach item="activityInstance" collection="list" index="index" separator=" or ">
-      ID_ = #{activityInstance.id, jdbcType=VARCHAR}
+      ID_ = #{activityInstance.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
 
   <!-- ACTIVITY INSTANCE RESULT MAP -->
 
   <resultMap id="ActivityInstanceResultMap" type="org.flowable.engine.impl.persistence.entity.ActivityInstanceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="activityId" column="ACT_ID_" jdbcType="VARCHAR" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-    <result property="calledProcessInstanceId" column="CALL_PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="activityName" column="ACT_NAME_" jdbcType="VARCHAR" />
-    <result property="activityType" column="ACT_TYPE_" jdbcType="VARCHAR" />
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="activityId" column="ACT_ID_" jdbcType="NVARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="calledProcessInstanceId" column="CALL_PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="activityName" column="ACT_NAME_" jdbcType="NVARCHAR" />
+    <result property="activityType" column="ACT_TYPE_" jdbcType="NVARCHAR" />
+    <result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
     <result property="endTime" column="END_TIME_" jdbcType="TIMESTAMP" />
     <result property="transactionOrder" column="TRANSACTION_ORDER_" jdbcType="INTEGER" />
     <result property="durationInMillis" column="DURATION_" jdbcType="BIGINT" />
-    <result property="deleteReason" column="DELETE_REASON_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <result property="deleteReason" column="DELETE_REASON_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- ACTIVITY INSTANCE SELECT -->
   
   <select id="selectActivityInstance" resultMap="ActivityInstanceResultMap">
-    select * from ${prefix}ACT_RU_ACTINST where ID_ = #{id}
+    select * from ${prefix}ACT_RU_ACTINST where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectActivityInstancesByQueryCriteria" parameterType="org.flowable.engine.impl.HistoricActivityInstanceQueryImpl" resultMap="ActivityInstanceResultMap">
@@ -251,34 +251,34 @@
     from ${prefix}ACT_RU_ACTINST RES
     <where>
       <if test="processInstanceId != null">
-        RES.PROC_INST_ID_ = #{processInstanceId}
+        RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="activityInstanceId != null">
-        and RES.ID_ = #{activityInstanceId}
+        and RES.ID_ = #{activityInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="executionId != null">
-        and RES.EXECUTION_ID_ = #{executionId}
+        and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionId != null">
-        and RES.PROC_DEF_ID_ = #{processDefinitionId}
+        and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="activityId != null">
-        and RES.ACT_ID_ = #{activityId}
+        and RES.ACT_ID_ = #{activityId, jdbcType=NVARCHAR}
       </if>
       <if test="activityName != null">
-        and RES.ACT_NAME_ = #{activityName}
+        and RES.ACT_NAME_ = #{activityName, jdbcType=NVARCHAR}
       </if>
       <if test="activityType != null">
-        and RES.ACT_TYPE_ = #{activityType}
+        and RES.ACT_TYPE_ = #{activityType, jdbcType=NVARCHAR}
       </if>
       <if test="assignee != null">
-        and RES.ASSIGNEE_ = #{assignee}
+        and RES.ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR}
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -290,10 +290,10 @@
        and RES.END_TIME_ is not null
       </if>
       <if test="deleteReason != null">
-        and RES.DELETE_REASON_ = #{deleteReason}
+        and RES.DELETE_REASON_ = #{deleteReason, jdbcType=NVARCHAR}
       </if>
       <if test="deleteReasonLike != null">
-        and RES.DELETE_REASON_ like #{deleteReasonLike}${wildcardEscapeClause}
+        and RES.DELETE_REASON_ like #{deleteReasonLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
     </where>
   </sql>
@@ -308,28 +308,28 @@
   
   <select id="selectUnfinishedActivityInstanceExecutionIdAndActivityId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="ActivityInstanceResultMap">
     select * from ${prefix}ACT_RU_ACTINST RES
-    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=VARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=VARCHAR} and END_TIME_ is null
+    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=NVARCHAR} and END_TIME_ is null
   </select>
   
   <select id="selectActivityInstanceExecutionIdAndActivityId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="ActivityInstanceResultMap">
     select * from ${prefix}ACT_RU_ACTINST RES
-    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=VARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=VARCHAR}
+    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectUnfinishedActivityInstanceByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="ActivityInstanceResultMap">
     select * from ${prefix}ACT_RU_ACTINST RES
-    where PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=VARCHAR} and END_TIME_ is null
+    where PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR} and END_TIME_ is null
   </select>
   
   <select id="selectActivityInstancesByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="ActivityInstanceResultMap">
     select * from ${prefix}ACT_RU_ACTINST RES
-    where PROC_INST_ID_ = #{parameter}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectActivityInstanceByTaskId" parameterType="string" resultMap="ActivityInstanceResultMap">
     select *
     from ${prefix}ACT_RU_ACTINST RES
-    where TASK_ID_ = #{taskId, jdbcType=VARCHAR}
+    where TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
   </select>
   
 </mapper>
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Attachment.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Attachment.xml
index 63c7db110a0..e8650b4a54c 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Attachment.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Attachment.xml
@@ -23,16 +23,16 @@
   <insert id="insertAttachment" parameterType="org.flowable.engine.impl.persistence.entity.AttachmentEntityImpl">
     insert into ${prefix}ACT_HI_ATTACHMENT (ID_, REV_, USER_ID_, NAME_, DESCRIPTION_, TYPE_, TASK_ID_, PROC_INST_ID_, URL_, CONTENT_ID_, TIME_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      1, #{userId ,jdbcType=VARCHAR},
-      #{name ,jdbcType=VARCHAR},
-      #{description ,jdbcType=VARCHAR},
-      #{type ,jdbcType=VARCHAR},
-      #{taskId ,jdbcType=VARCHAR},
-      #{processInstanceId ,jdbcType=VARCHAR},
-      #{url ,jdbcType=VARCHAR},
-      #{contentId ,jdbcType=VARCHAR},
-      #{time ,jdbcType=TIMESTAMP}
+      #{id, jdbcType=NVARCHAR},
+      1, #{userId, jdbcType=NVARCHAR},
+      #{name, jdbcType=NVARCHAR},
+      #{description, jdbcType=NVARCHAR},
+      #{type, jdbcType=NVARCHAR},
+      #{taskId, jdbcType=NVARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{url, jdbcType=NVARCHAR},
+      #{contentId, jdbcType=NVARCHAR},
+      #{time, jdbcType=TIMESTAMP}
     )
   </insert>
 
@@ -40,16 +40,16 @@
     insert into ${prefix}ACT_HI_ATTACHMENT (ID_, REV_, USER_ID_, NAME_, DESCRIPTION_, TYPE_, TASK_ID_, PROC_INST_ID_, URL_, CONTENT_ID_, TIME_)
     values 
       <foreach collection="list" item="attachment" index="index" separator=","> 
-        (#{attachment.id ,jdbcType=VARCHAR},
-         1, #{attachment.userId ,jdbcType=VARCHAR},
-         #{attachment.name ,jdbcType=VARCHAR},
-         #{attachment.description ,jdbcType=VARCHAR},
-         #{attachment.type ,jdbcType=VARCHAR},
-         #{attachment.taskId ,jdbcType=VARCHAR},
-         #{attachment.processInstanceId ,jdbcType=VARCHAR},
-         #{attachment.url ,jdbcType=VARCHAR},
-         #{attachment.contentId ,jdbcType=VARCHAR},
-         #{attachment.time ,jdbcType=TIMESTAMP})
+        (#{attachment.id, jdbcType=NVARCHAR},
+         1, #{attachment.userId, jdbcType=NVARCHAR},
+         #{attachment.name, jdbcType=NVARCHAR},
+         #{attachment.description, jdbcType=NVARCHAR},
+         #{attachment.type, jdbcType=NVARCHAR},
+         #{attachment.taskId, jdbcType=NVARCHAR},
+         #{attachment.processInstanceId, jdbcType=NVARCHAR},
+         #{attachment.url, jdbcType=NVARCHAR},
+         #{attachment.contentId, jdbcType=NVARCHAR},
+         #{attachment.time, jdbcType=TIMESTAMP})
       </foreach>
   </insert>
 
@@ -57,16 +57,16 @@
     INSERT ALL 
       <foreach collection="list" item="attachment" index="index"> 
         INTO ${prefix}ACT_HI_ATTACHMENT (ID_, REV_, USER_ID_, NAME_, DESCRIPTION_, TYPE_, TASK_ID_, PROC_INST_ID_, URL_, CONTENT_ID_, TIME_) VALUES 
-          (#{attachment.id ,jdbcType=VARCHAR},
-           1, #{attachment.userId ,jdbcType=VARCHAR},
-           #{attachment.name ,jdbcType=VARCHAR},
-           #{attachment.description ,jdbcType=VARCHAR},
-           #{attachment.type ,jdbcType=VARCHAR},
-           #{attachment.taskId ,jdbcType=VARCHAR},
-           #{attachment.processInstanceId ,jdbcType=VARCHAR},
-           #{attachment.url ,jdbcType=VARCHAR},
-           #{attachment.contentId ,jdbcType=VARCHAR},
-           #{attachment.time ,jdbcType=TIMESTAMP})
+          (#{attachment.id, jdbcType=NVARCHAR},
+           1, #{attachment.userId, jdbcType=NVARCHAR},
+           #{attachment.name, jdbcType=NVARCHAR},
+           #{attachment.description, jdbcType=NVARCHAR},
+           #{attachment.type, jdbcType=NVARCHAR},
+           #{attachment.taskId, jdbcType=NVARCHAR},
+           #{attachment.processInstanceId, jdbcType=NVARCHAR},
+           #{attachment.url, jdbcType=NVARCHAR},
+           #{attachment.contentId, jdbcType=NVARCHAR},
+           #{attachment.time, jdbcType=TIMESTAMP})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -78,13 +78,13 @@
     <set>
         REV_ = #{revisionNext, jdbcType=INTEGER},
         <if test="originalPersistentState.name != name">
-          NAME_ = #{name, jdbcType=VARCHAR},
+          NAME_ = #{name, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.description != description">
-          DESCRIPTION_ = #{description, jdbcType=TIMESTAMP},
+          DESCRIPTION_ = #{description, jdbcType=NVARCHAR},
         </if>
     </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
@@ -92,22 +92,22 @@
 
   <delete id="deleteAttachment" parameterType="org.flowable.engine.impl.persistence.entity.AttachmentEntityImpl">
     delete from ${prefix}ACT_HI_ATTACHMENT 
-    where ID_ = #{id} and REV_ = #{revision} 
+    where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <!-- ATTACHMENT RESULTMAP -->
 
   <resultMap id="attachmentResultMap" type="org.flowable.engine.impl.persistence.entity.AttachmentEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="url" column="URL_" jdbcType="VARCHAR" />
-    <result property="contentId" column="CONTENT_ID_" jdbcType="VARCHAR" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="description" column="DESCRIPTION_" jdbcType="NVARCHAR" />
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="url" column="URL_" jdbcType="NVARCHAR" />
+    <result property="contentId" column="CONTENT_ID_" jdbcType="NVARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
     <result property="time" column="TIME_" jdbcType="TIMESTAMP" />
   </resultMap>
   
@@ -116,20 +116,20 @@
   <select id="selectAttachment" parameterType="string" resultMap="attachmentResultMap">
     select *
     from ${prefix}ACT_HI_ATTACHMENT
-    where ID_ = #{id,jdbcType=VARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectAttachmentsByTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="attachmentResultMap">
     select *
     from ${prefix}ACT_HI_ATTACHMENT
-    where TASK_ID_ = #{parameter,jdbcType=VARCHAR}
+    where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
     order by TIME_ desc
   </select>
   
   <select id="selectAttachmentsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="attachmentResultMap">
     select *
     from ${prefix}ACT_HI_ATTACHMENT
-    where PROC_INST_ID_ = #{parameter,jdbcType=VARCHAR}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
     order by TIME_ desc
   </select>
 
@@ -144,8 +144,8 @@
             or
             </if>
             ATTACHMENT_.TASK_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{taskId, jdbcType=NVARCHAR}
             </foreach>
         </foreach>
     )
@@ -158,8 +158,8 @@
         or
         </if>
         TASK_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{taskId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Comment.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Comment.xml
index 184f68cc5c1..d9a6fa463a9 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Comment.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Comment.xml
@@ -22,30 +22,30 @@
 
   <insert id="insertComment" parameterType="org.flowable.engine.impl.persistence.entity.CommentEntityImpl">
     insert into ${prefix}ACT_HI_COMMENT (ID_, TYPE_, TIME_, USER_ID_, TASK_ID_, PROC_INST_ID_, ACTION_, MESSAGE_, FULL_MSG_)
-    values (#{id ,jdbcType=VARCHAR},
-      #{type ,jdbcType=VARCHAR},
-      #{time ,jdbcType=TIMESTAMP},
-      #{userId ,jdbcType=VARCHAR},
-      #{taskId ,jdbcType=VARCHAR},
-      #{processInstanceId ,jdbcType=VARCHAR},
-      #{action ,jdbcType=VARCHAR},
-      #{message ,jdbcType=VARCHAR},
-      #{fullMessageBytes ,jdbcType=${blobType}})
+    values (#{id, jdbcType=NVARCHAR},
+      #{type, jdbcType=NVARCHAR},
+      #{time, jdbcType=TIMESTAMP},
+      #{userId, jdbcType=NVARCHAR},
+      #{taskId, jdbcType=NVARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{action, jdbcType=NVARCHAR},
+      #{message, jdbcType=NVARCHAR},
+      #{fullMessageBytes, jdbcType=${blobType}})
   </insert>
 
   <insert id="bulkInsertComment" parameterType="java.util.List">
     insert into ${prefix}ACT_HI_COMMENT (ID_, TYPE_, TIME_, USER_ID_, TASK_ID_, PROC_INST_ID_, ACTION_, MESSAGE_, FULL_MSG_)
     values 
       <foreach collection="list" item="comment" index="index" separator=",">
-        (#{comment.id ,jdbcType=VARCHAR},
-         #{comment.type ,jdbcType=VARCHAR},
-         #{comment.time ,jdbcType=TIMESTAMP},
-         #{comment.userId ,jdbcType=VARCHAR},
-         #{comment.taskId ,jdbcType=VARCHAR},
-         #{comment.processInstanceId ,jdbcType=VARCHAR},
-         #{comment.action ,jdbcType=VARCHAR},
-         #{comment.message ,jdbcType=VARCHAR},
-         #{comment.fullMessageBytes ,jdbcType=${blobType}})
+        (#{comment.id, jdbcType=NVARCHAR},
+         #{comment.type, jdbcType=NVARCHAR},
+         #{comment.time, jdbcType=TIMESTAMP},
+         #{comment.userId, jdbcType=NVARCHAR},
+         #{comment.taskId, jdbcType=NVARCHAR},
+         #{comment.processInstanceId, jdbcType=NVARCHAR},
+         #{comment.action, jdbcType=NVARCHAR},
+         #{comment.message, jdbcType=NVARCHAR},
+         #{comment.fullMessageBytes, jdbcType=${blobType}})
       </foreach>
   </insert>
 
@@ -53,15 +53,15 @@
     INSERT ALL 
       <foreach collection="list" item="comment" index="index">
         into ${prefix}ACT_HI_COMMENT (ID_, TYPE_, TIME_, USER_ID_, TASK_ID_, PROC_INST_ID_, ACTION_, MESSAGE_, FULL_MSG_) VALUES 
-          (#{comment.id ,jdbcType=VARCHAR},
-           #{comment.type ,jdbcType=VARCHAR},
-           #{comment.time ,jdbcType=TIMESTAMP},
-           #{comment.userId ,jdbcType=VARCHAR},
-           #{comment.taskId ,jdbcType=VARCHAR},
-           #{comment.processInstanceId ,jdbcType=VARCHAR},
-           #{comment.action ,jdbcType=VARCHAR},
-           #{comment.message ,jdbcType=VARCHAR},
-           #{comment.fullMessageBytes ,jdbcType=${blobType}})
+          (#{comment.id, jdbcType=NVARCHAR},
+           #{comment.type, jdbcType=NVARCHAR},
+           #{comment.time, jdbcType=TIMESTAMP},
+           #{comment.userId, jdbcType=NVARCHAR},
+           #{comment.taskId, jdbcType=NVARCHAR},
+           #{comment.processInstanceId, jdbcType=NVARCHAR},
+           #{comment.action, jdbcType=NVARCHAR},
+           #{comment.message, jdbcType=NVARCHAR},
+           #{comment.fullMessageBytes, jdbcType=${blobType}})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -71,29 +71,29 @@
   <update id="updateComment" parameterType="org.flowable.engine.impl.persistence.entity.CommentEntityImpl">
     update ${prefix}ACT_HI_COMMENT 
     <set>
-      TYPE_ = #{type, jdbcType=VARCHAR},
+      TYPE_ = #{type, jdbcType=NVARCHAR},
       TIME_ = #{time, jdbcType=TIMESTAMP},
-      USER_ID_ = #{userId, jdbcType=VARCHAR},
-      TASK_ID_ = #{taskId, jdbcType=VARCHAR},
-      PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR},
-      MESSAGE_ = #{message, jdbcType=VARCHAR},
+      USER_ID_ = #{userId, jdbcType=NVARCHAR},
+      TASK_ID_ = #{taskId, jdbcType=NVARCHAR},
+      PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR},
+      MESSAGE_ = #{message, jdbcType=NVARCHAR},
       FULL_MSG_ = #{fullMessageBytes, jdbcType=${blobType}},
     </set>
-    where ID_ = #{id, jdbcType=VARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
   </update>
 
   <!-- COMMENT DELETE -->
 
   <delete id="deleteComment" parameterType="string">
-    delete from ${prefix}ACT_HI_COMMENT where ID_ = #{id}
+    delete from ${prefix}ACT_HI_COMMENT where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteCommentsByTaskId" parameterType="string">
-    delete from ${prefix}ACT_HI_COMMENT where TASK_ID_ = #{taskId} 
+    delete from ${prefix}ACT_HI_COMMENT where TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteCommentsByProcessInstanceId" parameterType="string">
-    delete from ${prefix}ACT_HI_COMMENT where PROC_INST_ID_ = #{processInstanceId} 
+    delete from ${prefix}ACT_HI_COMMENT where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteCommentsForTaskIds" parameterType="java.util.Collection">
@@ -103,8 +103,8 @@
         or
         </if>
         TASK_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{taskId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -116,8 +116,8 @@
         or
         </if>
         PROC_INST_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -125,14 +125,14 @@
   <!-- COMMENT RESULTMAP -->
 
   <resultMap id="commentResultMap" type="org.flowable.engine.impl.persistence.entity.CommentEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
     <result property="time" column="TIME_" jdbcType="TIMESTAMP" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="action" column="ACTION_" jdbcType="VARCHAR" />
-    <result property="message" column="MESSAGE_" jdbcType="VARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="action" column="ACTION_" jdbcType="NVARCHAR" />
+    <result property="message" column="MESSAGE_" jdbcType="NVARCHAR" />
     <result property="fullMessageBytes" column="FULL_MSG_" jdbcType="${blobType}" />
   </resultMap>
 
@@ -141,13 +141,13 @@
   <select id="selectComment" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
     select * 
     from ${prefix}ACT_HI_COMMENT 
-    where ID_ = #{parameter,jdbcType=VARCHAR}
+    where ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectCommentsByTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
     select * 
     from ${prefix}ACT_HI_COMMENT 
-    where TASK_ID_ = #{parameter,jdbcType=VARCHAR}
+    where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
       and TYPE_ = 'comment'
     order by TIME_ desc
   </select>
@@ -155,44 +155,44 @@
   <select id="selectCommentsByTaskIdAndType" parameterType="java.util.Map" resultMap="commentResultMap">
   	select *
   	from ${prefix}ACT_HI_COMMENT
-  	where TASK_ID_ = #{taskId,jdbcType=VARCHAR}
-  		and TYPE_ = #{type,jdbcType=VARCHAR}
+  	where TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
+  		and TYPE_ = #{type, jdbcType=NVARCHAR}
   	order by TIME_ desc
   </select>
   
   <select id="selectCommentsByType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
   	select *
   	from ${prefix}ACT_HI_COMMENT
-  	where TYPE_ = #{parameter,jdbcType=VARCHAR}
+  	where TYPE_ = #{parameter, jdbcType=NVARCHAR}
   	order by TIME_ desc
   </select>
   
   <select id="selectEventsByTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
     select * 
     from ${prefix}ACT_HI_COMMENT 
-    where TASK_ID_ = #{parameter,jdbcType=VARCHAR}
+    where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
     order by TIME_ desc
   </select>
   
   <select id="selectEventsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
     select * 
     from ${prefix}ACT_HI_COMMENT 
-    where PROC_INST_ID_ = #{parameter,jdbcType=VARCHAR}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
     order by TIME_ desc
   </select>
 
   <select id="selectCommentsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
     select * 
     from ${prefix}ACT_HI_COMMENT 
-    where PROC_INST_ID_ = #{parameter,jdbcType=VARCHAR}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
     order by TIME_ desc
   </select>
 
   <select id="selectCommentsByProcessInstanceIdAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="commentResultMap">
     select *
     from ${prefix}ACT_HI_COMMENT
-    where PROC_INST_ID_ = #{processInstanceId,jdbcType=VARCHAR}
-    and TYPE_ = #{type,jdbcType=VARCHAR}
+    where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
+    and TYPE_ = #{type, jdbcType=NVARCHAR}
     order by TIME_ desc
   </select>
 
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Deployment.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Deployment.xml
index bdef5b53d7b..4cf8ca6af0f 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Deployment.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Deployment.xml
@@ -8,23 +8,23 @@
   
   <insert id="insertDeployment" parameterType="org.flowable.engine.impl.persistence.entity.DeploymentEntityImpl">
     insert into ${prefix}ACT_RE_DEPLOYMENT(ID_, NAME_, CATEGORY_, KEY_, TENANT_ID_, DEPLOY_TIME_, DERIVED_FROM_, DERIVED_FROM_ROOT_, PARENT_DEPLOYMENT_ID_, ENGINE_VERSION_)
-    values(#{id, jdbcType=VARCHAR}, #{name, jdbcType=VARCHAR}, #{category, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{tenantId, jdbcType=VARCHAR}, #{deploymentTime, jdbcType=TIMESTAMP}, #{derivedFrom, jdbcType=VARCHAR}, #{derivedFromRoot, jdbcType=VARCHAR}, #{parentDeploymentId, jdbcType=VARCHAR}, #{engineVersion, jdbcType=VARCHAR})
+    values(#{id, jdbcType=NVARCHAR}, #{name, jdbcType=NVARCHAR}, #{category, jdbcType=NVARCHAR}, #{key, jdbcType=NVARCHAR}, #{tenantId, jdbcType=NVARCHAR}, #{deploymentTime, jdbcType=TIMESTAMP}, #{derivedFrom, jdbcType=NVARCHAR}, #{derivedFromRoot, jdbcType=NVARCHAR}, #{parentDeploymentId, jdbcType=NVARCHAR}, #{engineVersion, jdbcType=NVARCHAR})
   </insert>
 
   <insert id="bulkInsertDeployment" parameterType="java.util.List">
     insert into ${prefix}ACT_RE_DEPLOYMENT(ID_, NAME_, CATEGORY_, KEY_, TENANT_ID_, DEPLOY_TIME_, DERIVED_FROM_, DERIVED_FROM_ROOT_, PARENT_DEPLOYMENT_ID_, ENGINE_VERSION_)
     values
       <foreach collection="list" item="deployment" index="index" separator=",">
-        (#{deployment.id, jdbcType=VARCHAR},
-         #{deployment.name, jdbcType=VARCHAR},
-         #{deployment.category, jdbcType=VARCHAR},
-         #{deployment.key, jdbcType=VARCHAR},
-         #{deployment.tenantId, jdbcType=VARCHAR},
+        (#{deployment.id, jdbcType=NVARCHAR},
+         #{deployment.name, jdbcType=NVARCHAR},
+         #{deployment.category, jdbcType=NVARCHAR},
+         #{deployment.key, jdbcType=NVARCHAR},
+         #{deployment.tenantId, jdbcType=NVARCHAR},
          #{deployment.deploymentTime, jdbcType=TIMESTAMP},
-         #{deployment.derivedFrom, jdbcType=VARCHAR},
-         #{deployment.derivedFromRoot, jdbcType=VARCHAR},
-         #{deployment.parentDeploymentId, jdbcType=VARCHAR},
-         #{deployment.engineVersion, jdbcType=VARCHAR})
+         #{deployment.derivedFrom, jdbcType=NVARCHAR},
+         #{deployment.derivedFromRoot, jdbcType=NVARCHAR},
+         #{deployment.parentDeploymentId, jdbcType=NVARCHAR},
+         #{deployment.engineVersion, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -32,16 +32,16 @@
     INSERT ALL 
       <foreach collection="list" item="deployment" index="index">
         into ${prefix}ACT_RE_DEPLOYMENT(ID_, NAME_, CATEGORY_, KEY_, TENANT_ID_, DEPLOY_TIME_, DERIVED_FROM_, DERIVED_FROM_ROOT_, PARENT_DEPLOYMENT_ID_, ENGINE_VERSION_) VALUES 
-          (#{deployment.id, jdbcType=VARCHAR},
-           #{deployment.name, jdbcType=VARCHAR},
-           #{deployment.category, jdbcType=VARCHAR},
-           #{deployment.key, jdbcType=VARCHAR},
-           #{deployment.tenantId, jdbcType=VARCHAR},
+          (#{deployment.id, jdbcType=NVARCHAR},
+           #{deployment.name, jdbcType=NVARCHAR},
+           #{deployment.category, jdbcType=NVARCHAR},
+           #{deployment.key, jdbcType=NVARCHAR},
+           #{deployment.tenantId, jdbcType=NVARCHAR},
            #{deployment.deploymentTime, jdbcType=TIMESTAMP},
-           #{deployment.derivedFrom, jdbcType=VARCHAR},
-           #{deployment.derivedFromRoot, jdbcType=VARCHAR},
-           #{deployment.parentDeploymentId, jdbcType=VARCHAR},
-           #{deployment.engineVersion, jdbcType=VARCHAR})
+           #{deployment.derivedFrom, jdbcType=NVARCHAR},
+           #{deployment.derivedFromRoot, jdbcType=NVARCHAR},
+           #{deployment.parentDeploymentId, jdbcType=NVARCHAR},
+           #{deployment.engineVersion, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -52,40 +52,40 @@
     update ${prefix}ACT_RE_DEPLOYMENT
       <set>
           <if test="originalPersistentState.category != category">
-              CATEGORY_ = #{category, jdbcType=VARCHAR},
+              CATEGORY_ = #{category, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.key != key">
-              KEY_ = #{key, jdbcType=VARCHAR},
+              KEY_ = #{key, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.tenantId != tenantId">
-              TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
+              TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.parentDeploymentId != parentDeploymentId">
-              PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR},
+              PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=NVARCHAR},
           </if>
       </set>
-    where ID_ = #{id, jdbcType=VARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
   </update>
   
   <!-- DEPLOYMENT DELETE -->
   
   <delete id="deleteDeployment" parameterType="string">
-    delete from ${prefix}ACT_RE_DEPLOYMENT where ID_ = #{id}
+    delete from ${prefix}ACT_RE_DEPLOYMENT where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <!-- DEPLOYMENT RESULTMAP -->
   
   <resultMap id="deploymentResultMap" type="org.flowable.engine.impl.persistence.entity.DeploymentEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-    <result property="key" column="KEY_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+    <result property="key" column="KEY_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
     <result property="deploymentTime" column="DEPLOY_TIME_" jdbcType="TIMESTAMP"/>
-    <result property="derivedFrom" column="DERIVED_FROM_" jdbcType="VARCHAR" />
-    <result property="derivedFromRoot" column="DERIVED_FROM_ROOT_" jdbcType="VARCHAR" />
-    <result property="parentDeploymentId" column="PARENT_DEPLOYMENT_ID_" jdbcType="VARCHAR" />
-    <result property="engineVersion" column="ENGINE_VERSION_" jdbcType="VARCHAR" />
+    <result property="derivedFrom" column="DERIVED_FROM_" jdbcType="NVARCHAR" />
+    <result property="derivedFromRoot" column="DERIVED_FROM_ROOT_" jdbcType="NVARCHAR" />
+    <result property="parentDeploymentId" column="PARENT_DEPLOYMENT_ID_" jdbcType="NVARCHAR" />
+    <result property="engineVersion" column="ENGINE_VERSION_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- DEPLOYMENT SELECT -->
@@ -107,87 +107,87 @@
     from ${prefix}ACT_RE_DEPLOYMENT RES
     <where>
       <if test="deploymentId != null">
-        RES.ID_ = #{deploymentId}
+        RES.ID_ = #{deploymentId, jdbcType=NVARCHAR}
       </if>
       <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
         and RES.ID_ IN
         <foreach item="deploymentId" index="index" collection="deploymentIds" 
                  open="(" separator="," close=")">
-          #{deploymentId}
+          #{deploymentId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=NVARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=NVARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}${wildcardEscapeClause}
+        and RES.KEY_ like #{keyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="derivedFrom != null">
-        and (RES.DERIVED_FROM_ = #{derivedFrom} or RES.DERIVED_FROM_ROOT_ = #{derivedFrom})
+        and (RES.DERIVED_FROM_ = #{derivedFrom, jdbcType=NVARCHAR} or RES.DERIVED_FROM_ROOT_ = #{derivedFrom, jdbcType=NVARCHAR})
       </if>
       <if test="parentDeploymentId != null">
-        and (RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId})
+        and (RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=NVARCHAR})
       </if>
       <if test="parentDeploymentIdLike != null">
-        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike}${wildcardEscapeClause}
+        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="parentDeploymentIds != null &amp;&amp; !parentDeploymentIds.empty">
         and RES.PARENT_DEPLOYMENT_ID_ IN
         <foreach item="parentDeploymentId" index="index" collection="parentDeploymentIds" 
                  open="(" separator="," close=")">
-          #{parentDeploymentId}
+          #{parentDeploymentId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="engineVersion != null">
-        and RES.ENGINE_VERSION_ = #{engineVersion}
+        and RES.ENGINE_VERSION_ = #{engineVersion, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionKey != null || processDefinitionKeyLike != null">
         and exists(select 1 from ${prefix}ACT_RE_PROCDEF PROCDEF where RES.ID_ = PROCDEF.DEPLOYMENT_ID_ 
             <if test="processDefinitionKey != null">
-              and PROCDEF.KEY_ = #{processDefinitionKey}
+              and PROCDEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
             </if>
             <if test="processDefinitionKeyLike != null">
-              and PROCDEF.KEY_ like #{processDefinitionKeyLike}${wildcardEscapeClause}
+              and PROCDEF.KEY_ like #{processDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
         )
       </if>
       <if test="latest">
         and RES.DEPLOY_TIME_ = (select max(DEPLOY_TIME_) from ${prefix}ACT_RE_DEPLOYMENT where KEY_ = RES.KEY_ 
              <if test="derivedFrom != null">
-                and (DERIVED_FROM_ = #{derivedFrom} or DERIVED_FROM_ROOT_ = #{derivedFrom})
+                and (DERIVED_FROM_ = #{derivedFrom, jdbcType=NVARCHAR} or DERIVED_FROM_ROOT_ = #{derivedFrom, jdbcType=NVARCHAR})
              </if>
              <if test="derivedFrom == null">
                 and DERIVED_FROM_ is null
              </if>
              <if test="tenantId != null">
-	           and TENANT_ID_ = #{tenantId}
+	           and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
 	         </if>
 	         <if test="tenantIdLike != null">
-	           and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+	           and TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
 	         </if>
 	         <if test="withoutTenantId">
 	           and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -201,7 +201,7 @@
   </sql>
     
   <select id="selectDeployment" parameterType="string" resultMap="deploymentResultMap">
-    select * from ${prefix}ACT_RE_DEPLOYMENT where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RE_DEPLOYMENT where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectDeploymentByNativeQuery" parameterType="java.util.Map" resultMap="deploymentResultMap">
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/EventLogEntry.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/EventLogEntry.xml
index aae6e971b58..572c77fb504 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/EventLogEntry.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/EventLogEntry.xml
@@ -9,33 +9,33 @@
   <insert id="insertEventLogEntry" parameterType="org.flowable.engine.impl.persistence.entity.EventLogEntryEntityImpl">
     insert into ${prefix}ACT_EVT_LOG(TYPE_, PROC_DEF_ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, TIME_STAMP_, USER_ID_, DATA_, LOCK_OWNER_, LOCK_TIME_, IS_PROCESSED_)
     values (
-      #{type, jdbcType=VARCHAR}, 
-      #{processDefinitionId, jdbcType=VARCHAR}, 
-      #{processInstanceId, jdbcType=VARCHAR},
-      #{executionId, jdbcType=VARCHAR},
-      #{taskId, jdbcType=VARCHAR},   
-      #{timeStamp, jdbcType=TIMESTAMP}, 
-      #{userId, jdbcType=VARCHAR},
+      #{type, jdbcType=NVARCHAR},
+      #{processDefinitionId, jdbcType=NVARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{executionId, jdbcType=NVARCHAR},
+      #{taskId, jdbcType=NVARCHAR},
+      #{timeStamp, jdbcType=TIMESTAMP},
+      #{userId, jdbcType=NVARCHAR},
       #{data, jdbcType=${blobType}},
-      #{lockOwner, jdbcType=VARCHAR},
+      #{lockOwner, jdbcType=NVARCHAR},
       #{lockTime, jdbcType=TIMESTAMP},
-      #{isProcessed, jdbcType=INTEGER} 
-    )  
+      #{isProcessed, jdbcType=INTEGER}
+    )
   </insert>
-  
+
   <insert id="bulkInsertEventLogEntry" parameterType="java.util.List">
     insert into ${prefix}ACT_EVT_LOG(TYPE_, PROC_DEF_ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, TIME_STAMP_, USER_ID_, DATA_, LOCK_OWNER_, LOCK_TIME_, IS_PROCESSED_)
-    values 
+    values
       <foreach collection="list" item="eventLogEntry" index="index" separator=",">
-        (#{eventLogEntry.type, jdbcType=VARCHAR}, 
-         #{eventLogEntry.processDefinitionId, jdbcType=VARCHAR}, 
-         #{eventLogEntry.processInstanceId, jdbcType=VARCHAR},
-         #{eventLogEntry.executionId, jdbcType=VARCHAR},
-         #{eventLogEntry.taskId, jdbcType=VARCHAR},   
-         #{eventLogEntry.timeStamp, jdbcType=TIMESTAMP}, 
-         #{eventLogEntry.userId, jdbcType=VARCHAR},
+        (#{eventLogEntry.type, jdbcType=NVARCHAR},
+         #{eventLogEntry.processDefinitionId, jdbcType=NVARCHAR},
+         #{eventLogEntry.processInstanceId, jdbcType=NVARCHAR},
+         #{eventLogEntry.executionId, jdbcType=NVARCHAR},
+         #{eventLogEntry.taskId, jdbcType=NVARCHAR},
+         #{eventLogEntry.timeStamp, jdbcType=TIMESTAMP},
+         #{eventLogEntry.userId, jdbcType=NVARCHAR},
          #{eventLogEntry.data, jdbcType=${blobType}},
-         #{eventLogEntry.lockOwner, jdbcType=VARCHAR},
+         #{eventLogEntry.lockOwner, jdbcType=NVARCHAR},
          #{eventLogEntry.lockTime, jdbcType=TIMESTAMP},
          #{eventLogEntry.isProcessed, jdbcType=INTEGER})
       </foreach>
@@ -45,35 +45,35 @@
     insert into ${prefix}ACT_EVT_LOG(LOG_NR_, TYPE_, PROC_DEF_ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, TIME_STAMP_, USER_ID_, DATA_, LOCK_OWNER_, LOCK_TIME_, IS_PROCESSED_)
     values (
       ${prefix}ACT_EVT_LOG_seq.nextVal,
-      #{type, jdbcType=VARCHAR}, 
-      #{processDefinitionId, jdbcType=VARCHAR}, 
-      #{processInstanceId, jdbcType=VARCHAR},
-      #{executionId, jdbcType=VARCHAR},
-      #{taskId, jdbcType=VARCHAR},   
-      #{timeStamp, jdbcType=TIMESTAMP}, 
-      #{userId, jdbcType=VARCHAR},
+      #{type, jdbcType=NVARCHAR},
+      #{processDefinitionId, jdbcType=NVARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{executionId, jdbcType=NVARCHAR},
+      #{taskId, jdbcType=NVARCHAR},
+      #{timeStamp, jdbcType=TIMESTAMP},
+      #{userId, jdbcType=NVARCHAR},
       #{data, jdbcType=${blobType}},
-      #{lockOwner, jdbcType=VARCHAR},
+      #{lockOwner, jdbcType=NVARCHAR},
       #{lockTime, jdbcType=TIMESTAMP},
-      #{isProcessed, jdbcType=INTEGER} 
-    )  
+      #{isProcessed, jdbcType=INTEGER}
+    )
   </insert>
 
   <insert id="bulkInsertEventLogEntry" databaseId="oracle" parameterType="java.util.List">
-    INSERT ALL 
+    INSERT ALL
       <foreach collection="list" item="eventLogEntry" index="index">
         into ${prefix}ACT_EVT_LOG(LOG_NR_, TYPE_, PROC_DEF_ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_,
-        TIME_STAMP_, USER_ID_, DATA_, LOCK_OWNER_, LOCK_TIME_, IS_PROCESSED_) VALUES 
+        TIME_STAMP_, USER_ID_, DATA_, LOCK_OWNER_, LOCK_TIME_, IS_PROCESSED_) VALUES
             (${prefix}ACT_EVT_LOG_seq.nextVal,
-             #{eventLogEntry.type, jdbcType=VARCHAR}, 
-             #{eventLogEntry.processDefinitionId, jdbcType=VARCHAR}, 
-             #{eventLogEntry.processInstanceId, jdbcType=VARCHAR},
-             #{eventLogEntry.executionId, jdbcType=VARCHAR},
-             #{eventLogEntry.taskId, jdbcType=VARCHAR},   
-             #{eventLogEntry.timeStamp, jdbcType=TIMESTAMP}, 
-             #{eventLogEntry.userId, jdbcType=VARCHAR},
+             #{eventLogEntry.type, jdbcType=NVARCHAR},
+             #{eventLogEntry.processDefinitionId, jdbcType=NVARCHAR},
+             #{eventLogEntry.processInstanceId, jdbcType=NVARCHAR},
+             #{eventLogEntry.executionId, jdbcType=NVARCHAR},
+             #{eventLogEntry.taskId, jdbcType=NVARCHAR},
+             #{eventLogEntry.timeStamp, jdbcType=TIMESTAMP},
+             #{eventLogEntry.userId, jdbcType=NVARCHAR},
              #{eventLogEntry.data, jdbcType=${blobType}},
-             #{eventLogEntry.lockOwner, jdbcType=VARCHAR},
+             #{eventLogEntry.lockOwner, jdbcType=NVARCHAR},
              #{eventLogEntry.lockTime, jdbcType=TIMESTAMP},
              #{eventLogEntry.isProcessed, jdbcType=INTEGER})
       </foreach>
@@ -85,15 +85,15 @@
   <resultMap id="eventLogEntryResultMap" type="org.flowable.engine.impl.persistence.entity.EventLogEntryEntityImpl">
     <id property="logNumber" column="LOG_NR_" jdbcType="BIGINT" />
     <result property="id" column="LOG_NR_" jdbcType="BIGINT" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR"/>
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR"/>
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR"/>
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR"/>
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR"/>
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR"/>
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR"/>
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR"/>
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR"/>
     <result property="timeStamp" column="TIME_STAMP_" jdbcType="TIMESTAMP"/>
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
     <result property="data" column="DATA_" jdbcType="${blobType}"/>
-    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR"/>
+    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR"/>
     <result property="lockTime" column="LOCK_TIME_" jdbcType="TIMESTAMP"/>
     <result property="isProcessed" column="IS_PROCESSED_" jdbcType="INTEGER"/>
   </resultMap>
@@ -106,20 +106,20 @@
   
   <select id="selectEventLogEntries" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="eventLogEntryResultMap">
     select * from ${prefix}ACT_EVT_LOG 
-    WHERE LOG_NR_ &gt; #{parameter.startLogNr}
-    AND LOG_NR_ &lt; #{parameter.endLogNr}
+    WHERE LOG_NR_ &gt; #{parameter.startLogNr, jdbcType=BIGINT}
+    AND LOG_NR_ &lt; #{parameter.endLogNr, jdbcType=BIGINT}
     ORDER BY LOG_NR_ 
   </select>
   
   <select id="selectEventLogEntriesByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="eventLogEntryResultMap">
     select * from ${prefix}ACT_EVT_LOG 
-    WHERE PROC_INST_ID_ = #{parameter.processInstanceId}
+    WHERE PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
     ORDER BY LOG_NR_ 
   </select>
   
   <!-- DELETE -->
   <delete id="deleteEventLogEntry" parameterType="long">
-    delete from ${prefix}ACT_EVT_LOG where LOG_NR_ = #{logNr}
+    delete from ${prefix}ACT_EVT_LOG where LOG_NR_ = #{logNr, jdbcType=BIGINT}
   </delete>
 
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml
index c057801d937..17ae1b2d572 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml
@@ -13,25 +13,25 @@
                                            TASK_COUNT_, JOB_COUNT_, TIMER_JOB_COUNT_, SUSP_JOB_COUNT_, DEADLETTER_JOB_COUNT_, EXTERNAL_WORKER_JOB_COUNT_, VAR_COUNT_, ID_LINK_COUNT_,
                                            CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, PROPAGATED_STAGE_INST_ID_, BUSINESS_STATUS_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      1, #{processInstanceId, jdbcType=VARCHAR},
-      #{businessKey, jdbcType=VARCHAR},
-      #{processDefinitionId ,jdbcType=VARCHAR},
-      #{activityId ,jdbcType=VARCHAR},
-      #{isActive ,jdbcType=BOOLEAN},
-      #{isConcurrent ,jdbcType=BOOLEAN},
-      #{isScope ,jdbcType=BOOLEAN},
-      #{isEventScope ,jdbcType=BOOLEAN},
+      #{id, jdbcType=NVARCHAR},
+      1, #{processInstanceId, jdbcType=NVARCHAR},
+      #{businessKey, jdbcType=NVARCHAR},
+      #{processDefinitionId, jdbcType=NVARCHAR},
+      #{activityId, jdbcType=NVARCHAR},
+      #{isActive, jdbcType=BOOLEAN},
+      #{isConcurrent, jdbcType=BOOLEAN},
+      #{isScope, jdbcType=BOOLEAN},
+      #{isEventScope, jdbcType=BOOLEAN},
       #{isMultiInstanceRoot, jdbcType=BOOLEAN},
-      #{parentId, jdbcType=VARCHAR},
-      #{superExecutionId, jdbcType=VARCHAR},
-      #{rootProcessInstanceId, jdbcType=VARCHAR},
+      #{parentId, jdbcType=NVARCHAR},
+      #{superExecutionId, jdbcType=NVARCHAR},
+      #{rootProcessInstanceId, jdbcType=NVARCHAR},
       #{suspensionState, jdbcType=INTEGER},
-      #{tenantId, jdbcType=VARCHAR},
-      #{name, jdbcType=VARCHAR},
-      #{startActivityId, jdbcType=VARCHAR},
+      #{tenantId, jdbcType=NVARCHAR},
+      #{name, jdbcType=NVARCHAR},
+      #{startActivityId, jdbcType=NVARCHAR},
       #{startTime, jdbcType=TIMESTAMP},
-      #{startUserId, jdbcType=VARCHAR},
+      #{startUserId, jdbcType=NVARCHAR},
       #{isCountEnabled, jdbcType=BOOLEAN},
       #{eventSubscriptionCount, jdbcType=INTEGER},
       #{taskCount, jdbcType=INTEGER},
@@ -42,12 +42,12 @@
       #{externalWorkerJobCount, jdbcType=INTEGER},
       #{variableCount, jdbcType=INTEGER},
       #{identityLinkCount, jdbcType=INTEGER},
-      #{callbackId, jdbcType=VARCHAR},
-      #{callbackType, jdbcType=VARCHAR},
-      #{referenceId, jdbcType=VARCHAR},
-      #{referenceType, jdbcType=VARCHAR},
-      #{propagatedStageInstanceId, jdbcType=VARCHAR},
-      #{businessStatus, jdbcType=VARCHAR}
+      #{callbackId, jdbcType=NVARCHAR},
+      #{callbackType, jdbcType=NVARCHAR},
+      #{referenceId, jdbcType=NVARCHAR},
+      #{referenceType, jdbcType=NVARCHAR},
+      #{propagatedStageInstanceId, jdbcType=NVARCHAR},
+      #{businessStatus, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -59,25 +59,25 @@
                                            CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, PROPAGATED_STAGE_INST_ID_, BUSINESS_STATUS_)
     values
       <foreach collection="list" item="execution" index="index" separator=",">
-        (#{execution.id ,jdbcType=VARCHAR},
-         1, #{execution.processInstanceId, jdbcType=VARCHAR},
-         #{execution.businessKey, jdbcType=VARCHAR},
-         #{execution.processDefinitionId ,jdbcType=VARCHAR},
-         #{execution.activityId ,jdbcType=VARCHAR},
-         #{execution.isActive ,jdbcType=BOOLEAN},
-         #{execution.isConcurrent ,jdbcType=BOOLEAN},
-         #{execution.isScope ,jdbcType=BOOLEAN},
-         #{execution.isEventScope ,jdbcType=BOOLEAN},
+        (#{execution.id, jdbcType=NVARCHAR},
+         1, #{execution.processInstanceId, jdbcType=NVARCHAR},
+         #{execution.businessKey, jdbcType=NVARCHAR},
+         #{execution.processDefinitionId, jdbcType=NVARCHAR},
+         #{execution.activityId, jdbcType=NVARCHAR},
+         #{execution.isActive, jdbcType=BOOLEAN},
+         #{execution.isConcurrent, jdbcType=BOOLEAN},
+         #{execution.isScope, jdbcType=BOOLEAN},
+         #{execution.isEventScope, jdbcType=BOOLEAN},
          #{execution.isMultiInstanceRoot, jdbcType=BOOLEAN},
-         #{execution.parentId, jdbcType=VARCHAR},
-         #{execution.superExecutionId, jdbcType=VARCHAR},
-         #{execution.rootProcessInstanceId, jdbcType=VARCHAR},
+         #{execution.parentId, jdbcType=NVARCHAR},
+         #{execution.superExecutionId, jdbcType=NVARCHAR},
+         #{execution.rootProcessInstanceId, jdbcType=NVARCHAR},
          #{execution.suspensionState, jdbcType=INTEGER},
-         #{execution.tenantId, jdbcType=VARCHAR},
-         #{execution.name, jdbcType=VARCHAR},
-         #{execution.startActivityId, jdbcType=VARCHAR},
+         #{execution.tenantId, jdbcType=NVARCHAR},
+         #{execution.name, jdbcType=NVARCHAR},
+         #{execution.startActivityId, jdbcType=NVARCHAR},
          #{execution.startTime, jdbcType=TIMESTAMP},
-         #{execution.startUserId, jdbcType=VARCHAR},
+         #{execution.startUserId, jdbcType=NVARCHAR},
          #{execution.isCountEnabled, jdbcType=BOOLEAN},
          #{execution.eventSubscriptionCount, jdbcType=INTEGER},
          #{execution.taskCount, jdbcType=INTEGER},
@@ -88,12 +88,12 @@
          #{execution.externalWorkerJobCount, jdbcType=INTEGER},
          #{execution.variableCount, jdbcType=INTEGER},
          #{execution.identityLinkCount, jdbcType=INTEGER},
-         #{execution.callbackId, jdbcType=VARCHAR},
-         #{execution.callbackType, jdbcType=VARCHAR},
-         #{execution.referenceId, jdbcType=VARCHAR},
-         #{execution.referenceType, jdbcType=VARCHAR},
-         #{execution.propagatedStageInstanceId, jdbcType=VARCHAR},
-         #{execution.businessStatus, jdbcType=VARCHAR}
+         #{execution.callbackId, jdbcType=NVARCHAR},
+         #{execution.callbackType, jdbcType=NVARCHAR},
+         #{execution.referenceId, jdbcType=NVARCHAR},
+         #{execution.referenceType, jdbcType=NVARCHAR},
+         #{execution.propagatedStageInstanceId, jdbcType=NVARCHAR},
+         #{execution.businessStatus, jdbcType=NVARCHAR}
         )
       </foreach>
   </insert>
@@ -107,25 +107,25 @@
                                         TASK_COUNT_, JOB_COUNT_, TIMER_JOB_COUNT_, SUSP_JOB_COUNT_, DEADLETTER_JOB_COUNT_, EXTERNAL_WORKER_JOB_COUNT_, VAR_COUNT_, ID_LINK_COUNT_,
                                         CALLBACK_ID_, CALLBACK_TYPE_, REFERENCE_ID_, REFERENCE_TYPE_, PROPAGATED_STAGE_INST_ID_, BUSINESS_STATUS_) VALUES
             (
-             #{execution.id ,jdbcType=VARCHAR},
-             1, #{execution.processInstanceId, jdbcType=VARCHAR},
-             #{execution.businessKey, jdbcType=VARCHAR},
-             #{execution.processDefinitionId ,jdbcType=VARCHAR},
-             #{execution.activityId ,jdbcType=VARCHAR},
-             #{execution.isActive ,jdbcType=BOOLEAN},
-             #{execution.isConcurrent ,jdbcType=BOOLEAN},
-             #{execution.isScope ,jdbcType=BOOLEAN},
-             #{execution.isEventScope ,jdbcType=BOOLEAN},
+             #{execution.id, jdbcType=NVARCHAR},
+             1, #{execution.processInstanceId, jdbcType=NVARCHAR},
+             #{execution.businessKey, jdbcType=NVARCHAR},
+             #{execution.processDefinitionId, jdbcType=NVARCHAR},
+             #{execution.activityId, jdbcType=NVARCHAR},
+             #{execution.isActive, jdbcType=BOOLEAN},
+             #{execution.isConcurrent, jdbcType=BOOLEAN},
+             #{execution.isScope, jdbcType=BOOLEAN},
+             #{execution.isEventScope, jdbcType=BOOLEAN},
              #{execution.isMultiInstanceRoot, jdbcType=BOOLEAN},
-             #{execution.parentId, jdbcType=VARCHAR},
-             #{execution.superExecutionId, jdbcType=VARCHAR},
-             #{execution.rootProcessInstanceId, jdbcType=VARCHAR},
+             #{execution.parentId, jdbcType=NVARCHAR},
+             #{execution.superExecutionId, jdbcType=NVARCHAR},
+             #{execution.rootProcessInstanceId, jdbcType=NVARCHAR},
              #{execution.suspensionState, jdbcType=INTEGER},
-             #{execution.tenantId, jdbcType=VARCHAR},
-             #{execution.name, jdbcType=VARCHAR},
-             #{execution.startActivityId, jdbcType=VARCHAR},
+             #{execution.tenantId, jdbcType=NVARCHAR},
+             #{execution.name, jdbcType=NVARCHAR},
+             #{execution.startActivityId, jdbcType=NVARCHAR},
              #{execution.startTime, jdbcType=TIMESTAMP},
-             #{execution.startUserId, jdbcType=VARCHAR},
+             #{execution.startUserId, jdbcType=NVARCHAR},
              #{execution.isCountEnabled, jdbcType=BOOLEAN},
              #{execution.eventSubscriptionCount, jdbcType=INTEGER},
              #{execution.taskCount, jdbcType=INTEGER},
@@ -136,12 +136,12 @@
              #{execution.externalWorkerJobCount, jdbcType=INTEGER},
              #{execution.variableCount, jdbcType=INTEGER},
              #{execution.identityLinkCount, jdbcType=INTEGER},
-             #{execution.callbackId, jdbcType=VARCHAR},
-             #{execution.callbackType, jdbcType=VARCHAR},
-             #{execution.referenceId, jdbcType=VARCHAR},
-             #{execution.referenceType, jdbcType=VARCHAR},
-             #{execution.propagatedStageInstanceId, jdbcType=VARCHAR},
-             #{execution.businessStatus, jdbcType=VARCHAR}
+             #{execution.callbackId, jdbcType=NVARCHAR},
+             #{execution.callbackType, jdbcType=NVARCHAR},
+             #{execution.referenceId, jdbcType=NVARCHAR},
+             #{execution.referenceType, jdbcType=NVARCHAR},
+             #{execution.propagatedStageInstanceId, jdbcType=NVARCHAR},
+             #{execution.businessStatus, jdbcType=NVARCHAR}
             )
       </foreach>
     SELECT * FROM dual
@@ -154,13 +154,13 @@
         <set>
             REV_ = #{revisionNext, jdbcType=INTEGER},
             <if test="originalPersistentState.businessKey != businessKey">
-                BUSINESS_KEY_ = #{businessKey, jdbcType=VARCHAR},
+                BUSINESS_KEY_ = #{businessKey, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.activityId != activityId">
-                ACT_ID_ = #{activityId, jdbcType=VARCHAR},
+                ACT_ID_ = #{activityId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.isActive != isActive">
                 IS_ACTIVE_ = #{isActive, jdbcType=BOOLEAN},
@@ -178,19 +178,19 @@
                 IS_MI_ROOT_ = #{isMultiInstanceRoot, jdbcType=BOOLEAN},
             </if>
             <if test="originalPersistentState.parentId != parentId">
-                PARENT_ID_ = #{parentId, jdbcType=VARCHAR},
+                PARENT_ID_ = #{parentId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.superExecutionId != superExecutionId">
-                SUPER_EXEC_ = #{superExecutionId, jdbcType=VARCHAR},
+                SUPER_EXEC_ = #{superExecutionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.rootProcessInstanceId != rootProcessInstanceId">
-                ROOT_PROC_INST_ID_ = #{rootProcessInstanceId, jdbcType=VARCHAR},
+                ROOT_PROC_INST_ID_ = #{rootProcessInstanceId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.suspensionState != suspensionState">
                 SUSPENSION_STATE_ = #{suspensionState, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.name != name">
-                NAME_ = #{name, jdbcType=VARCHAR},
+                NAME_ = #{name, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.isCountEnabled != isCountEnabled">
                 IS_COUNT_ENABLED_ = #{isCountEnabled, jdbcType=BOOLEAN},
@@ -223,37 +223,37 @@
                 ID_LINK_COUNT_ = #{identityLinkCount, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.callbackId != callbackId">
-                CALLBACK_ID_ = #{callbackId, jdbcType=VARCHAR},
+                CALLBACK_ID_ = #{callbackId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.callbackType != callbackType">
-                CALLBACK_ID_ = #{callbackType, jdbcType=VARCHAR},
+                CALLBACK_ID_ = #{callbackType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.referenceId != referenceId">
-                REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR},
+                REFERENCE_ID_ = #{referenceId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.referenceType != referenceType">
-                REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR},
+                REFERENCE_TYPE_ = #{referenceType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.propagatedStageInstanceId != propagatedStageInstanceId">
-                PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=VARCHAR},
+                PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.businessStatus != businessStatus">
-                BUSINESS_STATUS_ = #{businessStatus, jdbcType=VARCHAR},
+                BUSINESS_STATUS_ = #{businessStatus, jdbcType=NVARCHAR},
             </if>
         </set>
-    where ID_ = #{id, jdbcType=VARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <update id="updateExecutionTenantIdForDeployment" parameterType="java.util.Map">
     update ${prefix}ACT_RU_EXECUTION set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+      TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
     where
       ID_ in (
         SELECT E.ID_ from ${prefix}ACT_RU_EXECUTION E
         inner join ${prefix}ACT_RE_PROCDEF P on E.PROC_DEF_ID_  = P.ID_
         inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
       )
   </update>
 
@@ -261,7 +261,7 @@
        Tested this on MySQL 5.6: does NOT use a temporary table (so good, performance) -->
   <update id="updateExecutionTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
     update ${prefix}ACT_RU_EXECUTION set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+      TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
     where
       ID_ in (
 
@@ -271,7 +271,7 @@
                 FROM  ${prefix}ACT_RU_EXECUTION E
                 inner join ${prefix}ACT_RE_PROCDEF P on E.PROC_DEF_ID_  = P.ID_
                 inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-                where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+                where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
 
         ) AS tempExecution
 
@@ -282,8 +282,8 @@
     update ${prefix}ACT_RU_EXECUTION
     set
       LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
-      LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}
-    where ID_ = #{id}
+      LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
       and (LOCK_TIME_ is null OR LOCK_TIME_ &lt; #{expirationTime, jdbcType=TIMESTAMP})
   </update>
 
@@ -292,7 +292,7 @@
     set
       LOCK_TIME_ = null,
       LOCK_OWNER_ = null
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
   </update>
 
   <update id="clearAllProcessInstanceLockTimes" parameterType="java.util.Map">
@@ -300,7 +300,7 @@
     set
       LOCK_TIME_ = null,
       LOCK_OWNER_ = null
-    where LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}
+    where LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}
   </update>
 
   <update id="updateExecutionRelatedEntityCountEnabled" parameterType="boolean">
@@ -311,40 +311,40 @@
   <!-- EXECUTION DELETE -->
 
   <delete id="deleteExecution" parameterType="org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl">
-    delete from ${prefix}ACT_RU_EXECUTION where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RU_EXECUTION where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <delete id="bulkDeleteExecution" parameterType="java.util.Collection">
     delete from ${prefix}ACT_RU_EXECUTION where
      <foreach item="execution" collection="list" index="index" separator=" or ">
-        ID_ = #{execution.id, jdbcType=VARCHAR}
+        ID_ = #{execution.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
 
   <!-- EXECUTION RESULTMAP -->
 
   <resultMap id="executionResultMap" type="org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="VARCHAR" />
-    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="activityId" column="ACT_ID_" jdbcType="VARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="NVARCHAR" />
+    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="activityId" column="ACT_ID_" jdbcType="NVARCHAR" />
     <result property="isActive" column="IS_ACTIVE_" jdbcType="BOOLEAN" />
     <result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
     <result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
-    <result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
-    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
-    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
+    <result property="parentId" column="PARENT_ID_" jdbcType="NVARCHAR" />
+    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="NVARCHAR" />
+    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="NVARCHAR" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER"/>
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="startActivityId" column="START_ACT_ID_" jdbcType="VARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="startActivityId" column="START_ACT_ID_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
-    <result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR" />
+    <result property="startUserId" column="START_USER_ID_" jdbcType="NVARCHAR" />
     <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
     <result property="eventSubscriptionCount" column="EVT_SUBSCR_COUNT_" jdbcType="INTEGER" />
     <result property="taskCount" column="TASK_COUNT_" jdbcType="INTEGER" />
@@ -355,45 +355,45 @@
     <result property="externalWorkerJobCount" column="EXTERNAL_WORKER_JOB_COUNT_" jdbcType="INTEGER" />
     <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
     <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
-    <result property="callbackId" column="CALLBACK_ID_" jdbcType="VARCHAR" />
-    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="VARCHAR" />
-    <result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR" />
-    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR" />
+    <result property="callbackId" column="CALLBACK_ID_" jdbcType="NVARCHAR" />
+    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="referenceId" column="REFERENCE_ID_" jdbcType="NVARCHAR" />
+    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="NVARCHAR" />
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <resultMap id="processInstanceResultMap" type="org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="VARCHAR" />
-    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="VARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="NVARCHAR" />
+    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="NVARCHAR" />
 
     <!-- Lowercase 'columns', as they are filled in during a query and are not mapped directly to a table column -->
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionName" column="ProcessDefinitionName" jdbcType="VARCHAR" />
-    <result property="processDefinitionKey" column="ProcessDefinitionKey" jdbcType="VARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionName" column="ProcessDefinitionName" jdbcType="NVARCHAR" />
+    <result property="processDefinitionKey" column="ProcessDefinitionKey" jdbcType="NVARCHAR" />
     <result property="processDefinitionVersion" column="ProcessDefinitionVersion" jdbcType="INTEGER" />
-    <result property="processDefinitionCategory" column="ProcessDefinitionCategory" jdbcType="VARCHAR"/>
-    <result property="deploymentId" column="DeploymentId" jdbcType="VARCHAR" />
+    <result property="processDefinitionCategory" column="ProcessDefinitionCategory" jdbcType="NVARCHAR"/>
+    <result property="deploymentId" column="DeploymentId" jdbcType="NVARCHAR" />
 
-    <result property="activityId" column="ACT_ID_" jdbcType="VARCHAR" />
+    <result property="activityId" column="ACT_ID_" jdbcType="NVARCHAR" />
     <result property="isActive" column="IS_ACTIVE_" jdbcType="BOOLEAN" />
     <result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
     <result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
-    <result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
-    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
-    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
+    <result property="parentId" column="PARENT_ID_" jdbcType="NVARCHAR" />
+    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="NVARCHAR" />
+    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="NVARCHAR" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER"/>
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
     <result property="lockTime" column="LOCK_TIME_" jdbcType="TIMESTAMP" />
-    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
-    <result property="startActivityId" column="START_ACT_ID_" jdbcType="VARCHAR" />
+    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
+    <result property="startActivityId" column="START_ACT_ID_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
-    <result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR" />
+    <result property="startUserId" column="START_USER_ID_" jdbcType="NVARCHAR" />
     <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
     <result property="eventSubscriptionCount" column="EVT_SUBSCR_COUNT_" jdbcType="INTEGER" />
     <result property="taskCount" column="TASK_COUNT_" jdbcType="INTEGER" />
@@ -404,35 +404,35 @@
     <result property="externalWorkerJobCount" column="EXTERNAL_WORKER_JOB_COUNT_" jdbcType="INTEGER" />
     <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
     <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
-    <result property="callbackId" column="CALLBACK_ID_" jdbcType="VARCHAR" />
-    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="VARCHAR" />
-    <result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR" />
-    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR" />
+    <result property="callbackId" column="CALLBACK_ID_" jdbcType="NVARCHAR" />
+    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="referenceId" column="REFERENCE_ID_" jdbcType="NVARCHAR" />
+    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="NVARCHAR" />
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <resultMap id="executionAndVariablesResultMap" type="org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="VARCHAR" />
-    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="activityId" column="ACT_ID_" jdbcType="VARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="NVARCHAR" />
+    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="activityId" column="ACT_ID_" jdbcType="NVARCHAR" />
     <result property="isActive" column="IS_ACTIVE_" jdbcType="BOOLEAN" />
     <result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
     <result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
-    <result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
-    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
-    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
+    <result property="parentId" column="PARENT_ID_" jdbcType="NVARCHAR" />
+    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="NVARCHAR" />
+    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="NVARCHAR" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER"/>
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="startActivityId" column="START_ACT_ID_" jdbcType="VARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="startActivityId" column="START_ACT_ID_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
-    <result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR" />
+    <result property="startUserId" column="START_USER_ID_" jdbcType="NVARCHAR" />
     <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
     <result property="eventSubscriptionCount" column="EVT_SUBSCR_COUNT_" jdbcType="INTEGER" />
     <result property="taskCount" column="TASK_COUNT_" jdbcType="INTEGER" />
@@ -443,57 +443,57 @@
     <result property="externalWorkerJobCount" column="EXTERNAL_WORKER_JOB_COUNT_" jdbcType="INTEGER" />
     <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
     <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
-    <result property="callbackId" column="CALLBACK_ID_" jdbcType="VARCHAR" />
-    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="VARCHAR" />
-    <result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR" />
-    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR" />
+    <result property="callbackId" column="CALLBACK_ID_" jdbcType="NVARCHAR" />
+    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="referenceId" column="REFERENCE_ID_" jdbcType="NVARCHAR" />
+    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="NVARCHAR" />
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
     <collection property="queryVariables" column="EXECUTION_ID_" javaType="ArrayList" ofType="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-      <id property="id" column="VAR_ID_"/>
-      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR" />
-      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
+      <id property="id" column="VAR_ID_" jdbcType="NVARCHAR"/>
+      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR" />
+      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
       <result property="revision" column="VAR_REV_" jdbcType="INTEGER" />
-      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR" />
+      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
       <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
       <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE" />
-      <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR" />
-      <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR" />
+      <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR" />
+      <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR" />
       <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT" />
     </collection>
   </resultMap>
 
   <resultMap id="processInstanceAndVariablesResultMap" type="org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="VARCHAR" />
-    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionName" column="ProcessDefinitionName" jdbcType="VARCHAR" />
-    <result property="processDefinitionKey" column="ProcessDefinitionKey" jdbcType="VARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="NVARCHAR" />
+    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionName" column="ProcessDefinitionName" jdbcType="NVARCHAR" />
+    <result property="processDefinitionKey" column="ProcessDefinitionKey" jdbcType="NVARCHAR" />
     <result property="processDefinitionVersion" column="ProcessDefinitionVersion" jdbcType="INTEGER" />
-      <result property="processDefinitionCategory" column="ProcessDefinitionCategory" jdbcType="VARCHAR"/>
-    <result property="deploymentId" column="DeploymentId" jdbcType="VARCHAR" />
-    <result property="activityId" column="ACT_ID_" jdbcType="VARCHAR" />
+      <result property="processDefinitionCategory" column="ProcessDefinitionCategory" jdbcType="NVARCHAR"/>
+    <result property="deploymentId" column="DeploymentId" jdbcType="NVARCHAR" />
+    <result property="activityId" column="ACT_ID_" jdbcType="NVARCHAR" />
     <result property="isActive" column="IS_ACTIVE_" jdbcType="BOOLEAN" />
     <result property="isConcurrent" column="IS_CONCURRENT_" jdbcType="BOOLEAN" />
     <result property="isScope" column="IS_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isEventScope" column="IS_EVENT_SCOPE_" jdbcType="BOOLEAN" />
     <result property="isMultiInstanceRoot" column="IS_MI_ROOT_" jdbcType="BOOLEAN" />
-    <result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
-    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="VARCHAR" />
-    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="VARCHAR" />
+    <result property="parentId" column="PARENT_ID_" jdbcType="NVARCHAR" />
+    <result property="superExecutionId" column="SUPER_EXEC_" jdbcType="NVARCHAR" />
+    <result property="rootProcessInstanceId" column="ROOT_PROC_INST_ID_" jdbcType="NVARCHAR" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER"/>
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
     <result property="lockTime" column="LOCK_TIME_" jdbcType="TIMESTAMP" />
-    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
-    <result property="startActivityId" column="START_ACT_ID_" jdbcType="VARCHAR" />
+    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
+    <result property="startActivityId" column="START_ACT_ID_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
-    <result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR" />
+    <result property="startUserId" column="START_USER_ID_" jdbcType="NVARCHAR" />
     <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
     <result property="eventSubscriptionCount" column="EVT_SUBSCR_COUNT_" jdbcType="INTEGER" />
     <result property="taskCount" column="TASK_COUNT_" jdbcType="INTEGER" />
@@ -504,24 +504,24 @@
     <result property="externalWorkerJobCount" column="EXTERNAL_WORKER_JOB_COUNT_" jdbcType="INTEGER" />
     <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
     <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
-    <result property="callbackId" column="CALLBACK_ID_" jdbcType="VARCHAR" />
-    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="VARCHAR" />
-    <result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR" />
-    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR" />
+    <result property="callbackId" column="CALLBACK_ID_" jdbcType="NVARCHAR" />
+    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="referenceId" column="REFERENCE_ID_" jdbcType="NVARCHAR" />
+    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="NVARCHAR" />
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
     <collection property="queryVariables" column="EXECUTION_ID_" javaType="ArrayList" ofType="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-      <id property="id" column="VAR_ID_"/>
-      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR" />
-      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
+      <id property="id" column="VAR_ID_" jdbcType="NVARCHAR" />
+      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR" />
+      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
       <result property="revision" column="VAR_REV_" jdbcType="INTEGER" />
-      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR" />
+      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
       <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
       <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE" />
-      <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR" />
-      <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR" />
+      <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR" />
+      <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR" />
       <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT" />
     </collection>
   </resultMap>
@@ -530,67 +530,67 @@
 
   <select id="selectExecutionsWithSameRootProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
     select * from ${prefix}ACT_RU_EXECUTION
-    where ROOT_PROC_INST_ID_ = (select ROOT_PROC_INST_ID_ from ${prefix}ACT_RU_EXECUTION where ID_ = #{parameter})
+    where ROOT_PROC_INST_ID_ = (select ROOT_PROC_INST_ID_ from ${prefix}ACT_RU_EXECUTION where ID_ = #{parameter, jdbcType=NVARCHAR})
   </select>
 
   <select id="selectExecution" parameterType="string" resultMap="executionResultMap">
-    select * from ${prefix}ACT_RU_EXECUTION where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RU_EXECUTION where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectExecutionsByParentExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
     select * from ${prefix}ACT_RU_EXECUTION
-    where PARENT_ID_ = #{parameter}
+    where PARENT_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="countActiveExecutionsByParentId" parameterType="java.util.Map" resultType="long">
     select count(ID_) from ${prefix}ACT_RU_EXECUTION
-    where PARENT_ID_ = #{parentId} and IS_ACTIVE_ = #{isActive}
+    where PARENT_ID_ = #{parentId, jdbcType=NVARCHAR} and IS_ACTIVE_ = #{isActive, jdbcType=BOOLEAN}
   </select>
 
   <select id="selectExecutionsByRootProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
     select * from ${prefix}ACT_RU_EXECUTION
-    where ROOT_PROC_INST_ID_ = #{parameter}
+    where ROOT_PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectChildExecutionsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
     select * from ${prefix}ACT_RU_EXECUTION
-    where PROC_INST_ID_ = #{parameter} and PARENT_ID_ is not null
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR} and PARENT_ID_ is not null
   </select>
 
   <select id="selectExecutionsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
     select * from ${prefix}ACT_RU_EXECUTION
-    where PROC_INST_ID_ = #{parameter}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectProcessInstanceIdsByProcessDefinitionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
     select ID_
     from ${prefix}ACT_RU_EXECUTION
-    where PROC_DEF_ID_ = #{parameter} and PARENT_ID_ is null
+    where PROC_DEF_ID_ = #{parameter, jdbcType=NVARCHAR} and PARENT_ID_ is null
   </select>
 
   <select id="selectInactiveExecutionsForProcessInstance" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
   	select *
   	from ${prefix}ACT_RU_EXECUTION
-  	where PROC_INST_ID_ = #{parameter.processInstanceId}
-  	and IS_ACTIVE_ = #{parameter.isActive}
+  	where PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
+  	and IS_ACTIVE_ = #{parameter.isActive, jdbcType=BOOLEAN}
   </select>
 
   <select id="selectInactiveExecutionsInActivityAndProcessInstance" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="executionResultMap">
   	select *
   	from ${prefix}ACT_RU_EXECUTION
-  	where ACT_ID_ = #{parameter.activityId}
-  	and PROC_INST_ID_ = #{parameter.processInstanceId}
-  	and IS_ACTIVE_ = #{parameter.isActive}
+  	where ACT_ID_ = #{parameter.activityId, jdbcType=NVARCHAR}
+  	and PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
+  	and IS_ACTIVE_ = #{parameter.isActive, jdbcType=BOOLEAN}
   </select>
 
     <select id="selectExecutionsByParentExecutionAndActivityIds" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject"
             resultMap="executionResultMap">
         select *
         from ${prefix}ACT_RU_EXECUTION
-        where PARENT_ID_ = #{parameter.parentExecutionId}
+        where PARENT_ID_ = #{parameter.parentExecutionId, jdbcType=NVARCHAR}
         and ACT_ID_ in
         <foreach item="activityId" collection="parameter.activityIds" open="(" separator="," close=")">
-            #{activityId}
+            #{activityId, jdbcType=NVARCHAR}
         </foreach>
     </select>
 
@@ -668,48 +668,48 @@
         RES.PARENT_ID_ is null
       </if>
       <if test="processDefinitionId != null">
-        and P.ID_ = #{processDefinitionId}
+        and P.ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionIds != null and !processDefinitionIds.empty">
         and P.ID_ in
-        <foreach item="item" index="index" collection="processDefinitionIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processDefinitionId" index="index" collection="processDefinitionIds" open="(" separator="," close=")">
+          #{processDefinitionId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="processDefinitionKey != null">
-        and P.KEY_ = #{processDefinitionKey}
+        and P.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionKeys != null and !processDefinitionKeys.empty">
         and P.KEY_ in
-        <foreach item="item" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processDefinitionKey" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
+          #{processDefinitionKey, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="processDefinitionCategory != null">
-        and P.CATEGORY_ = #{processDefinitionCategory}
+        and P.CATEGORY_ = #{processDefinitionCategory, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionName != null">
-        and P.NAME_ = #{processDefinitionName}
+        and P.NAME_ = #{processDefinitionName, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionVersion != null">
-        and P.VERSION_ = #{processDefinitionVersion}
+        and P.VERSION_ = #{processDefinitionVersion, jdbcType=INTEGER}
       </if>
       <if test="processDefinitionEngineVersion != null">
-        and P.ENGINE_VERSION_ = #{processDefinitionEngineVersion}
+        and P.ENGINE_VERSION_ = #{processDefinitionEngineVersion, jdbcType=NVARCHAR}
       </if>
       <if test="executionId != null">
-        and RES.ID_ = #{executionId}
+        and RES.ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceId != null">
-        and RES.PROC_INST_ID_ = #{processInstanceId}
+        and RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="rootProcessInstanceId != null">
-        and RES.ROOT_PROC_INST_ID_ = #{rootProcessInstanceId}
+        and RES.ROOT_PROC_INST_ID_ = #{rootProcessInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceIds != null and !processInstanceIds.empty">
         and RES.PROC_INST_ID_ in
-        <foreach item="item" index="index" collection="processInstanceIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="processInstanceIds" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="businessKey != null or businessKeyLike != null">
@@ -721,35 +721,35 @@
                   <where>
                       RES.PROC_INST_ID_ = INST.ID_
                       <if test="businessKey != null">
-                        and INST.BUSINESS_KEY_ = #{businessKey}
+                        and INST.BUSINESS_KEY_ = #{businessKey, jdbcType=NVARCHAR}
                       </if>
                       <if test="businessKeyLike != null">
-                        and INST.BUSINESS_KEY_ like #{businessKeyLike}${wildcardEscapeClause}
+                        and INST.BUSINESS_KEY_ like #{businessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                       </if>
                   </where>
                 )
               </when>
               <otherwise>
                   <if test="businessKey != null">
-                      and RES.BUSINESS_KEY_ = #{businessKey}
+                      and RES.BUSINESS_KEY_ = #{businessKey, jdbcType=NVARCHAR}
                   </if>
                   <if test="businessKeyLike != null">
-                      and RES.BUSINESS_KEY_ like #{businessKeyLike}${wildcardEscapeClause}
+                      and RES.BUSINESS_KEY_ like #{businessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
               </otherwise>
           </choose>
       </if>
       <if test="businessStatus != null">
-        and RES.BUSINESS_STATUS_ = #{businessStatus}
+        and RES.BUSINESS_STATUS_ = #{businessStatus, jdbcType=NVARCHAR}
       </if>
       <if test="businessStatusLike != null">
-        and RES.BUSINESS_STATUS_ like #{businessStatusLike}${wildcardEscapeClause}
+        and RES.BUSINESS_STATUS_ like #{businessStatusLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="activityId != null">
-        and RES.ACT_ID_ = #{activityId} and RES.IS_ACTIVE_ = #{isActive}
+        and RES.ACT_ID_ = #{activityId, jdbcType=NVARCHAR} and RES.IS_ACTIVE_ = #{isActive, jdbcType=BOOLEAN}
       </if>
       <if test="parentId != null">
-        and RES.PARENT_ID_ = #{parentId}
+        and RES.PARENT_ID_ = #{parentId, jdbcType=NVARCHAR}
       </if>
       <if test="onlyChildExecutions">
       	and RES.PARENT_ID_ is not null
@@ -761,22 +761,22 @@
         and RES.PARENT_ID_ is null
       </if>
       <if test="deploymentId != null">
-        and P.DEPLOYMENT_ID_ = #{deploymentId}
+        and P.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
       </if>
       <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
         and P.DEPLOYMENT_ID_ IN
-        <foreach item="deployment" index="index" collection="deploymentIds"
+        <foreach item="deploymentId" index="index" collection="deploymentIds"
                  open="(" separator="," close=")">
-          #{deployment}
+          #{deploymentId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="superProcessInstanceId != null">
         <!-- A sub process instance is stored under a certain *execution*, potentially nested.
              A sub process instance is NOT stored under the process instanc, hence the following: -->
-        and RES.SUPER_EXEC_ IN (select ID_ from ${prefix}ACT_RU_EXECUTION where PROC_INST_ID_ = #{superProcessInstanceId})
+        and RES.SUPER_EXEC_ IN (select ID_ from ${prefix}ACT_RU_EXECUTION where PROC_INST_ID_ = #{superProcessInstanceId, jdbcType=NVARCHAR})
       </if>
       <if test="subProcessInstanceId != null">
-        and RES.ID_ = (select PROC_INST_ID_ from ${prefix}ACT_RU_EXECUTION where ID_ = (select SUPER_EXEC_ from ${prefix}ACT_RU_EXECUTION where ID_ = #{subProcessInstanceId}))
+        and RES.ID_ = (select PROC_INST_ID_ from ${prefix}ACT_RU_EXECUTION where ID_ = (select SUPER_EXEC_ from ${prefix}ACT_RU_EXECUTION where ID_ = #{subProcessInstanceId, jdbcType=NVARCHAR}))
       </if>
       <if test="excludeSubprocesses">
         and RES.SUPER_EXEC_ is null
@@ -790,38 +790,38 @@
         </if>
       </if>
       <if test="callbackId != null">
-            and CALLBACK_ID_ = #{callbackId}
+            and CALLBACK_ID_ = #{callbackId, jdbcType=NVARCHAR}
       </if>
       <if test="callbackType != null">
-           and CALLBACK_TYPE_ = #{callbackType}
+           and CALLBACK_TYPE_ = #{callbackType, jdbcType=NVARCHAR}
       </if>
       <if test="referenceId != null">
-            and REFERENCE_ID_ = #{referenceId}
+            and REFERENCE_ID_ = #{referenceId, jdbcType=NVARCHAR}
       </if>
       <if test="referenceType != null">
-           and REFERENCE_TYPE_ = #{referenceType}
+           and REFERENCE_TYPE_ = #{referenceType, jdbcType=NVARCHAR}
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase})${wildcardEscapeClause}
+        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
       </if>
       <if test="parentScopeId != null">
           and EXISTS(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
-            LINK.SCOPE_ID_ = #{parentScopeId}
+            LINK.SCOPE_ID_ = #{parentScopeId, jdbcType=NVARCHAR}
             and LINK.REF_SCOPE_ID_ = RES.ID_
             and LINK.HIERARCHY_TYPE_ = 'parent'
           )
@@ -829,25 +829,25 @@
       <if test="rootScopeId != null">
           and exists(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
             LINK.REF_SCOPE_ID_ = RES.ID_
-            and LINK.ROOT_SCOPE_ID_ = #{rootScopeId}
+            and LINK.ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR}
             )
       </if>
       <if test="activeActivityId != null">
-        and EXISTS(select ID_ from ${prefix}ACT_RU_ACTINST A where A.PROC_INST_ID_ = RES.ID_ and A.ACT_ID_ = #{activeActivityId} and A.END_TIME_ is null)
+        and EXISTS(select ID_ from ${prefix}ACT_RU_ACTINST A where A.PROC_INST_ID_ = RES.ID_ and A.ACT_ID_ = #{activeActivityId, jdbcType=NVARCHAR} and A.END_TIME_ is null)
       </if>
       <if test="activeActivityIds != null">
         and EXISTS(select ID_ from ${prefix}ACT_RU_ACTINST A where A.PROC_INST_ID_ = RES.ID_ and A.ACT_ID_ in 
         <foreach item="activeActivityId" index="index" collection="activeActivityIds" open="(" separator="," close=")">
-            #{activeActivityId}
+            #{activeActivityId, jdbcType=NVARCHAR}
         </foreach>
         and A.END_TIME_ is null)
       </if>
       <if test="involvedUser != null">
-        and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and I.USER_ID_ = #{involvedUser})
+        and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and I.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR})
       </if>
       <if test="involvedUserIdentityLink != null">
         and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and 
-        I.USER_ID_ = #{involvedUserIdentityLink.userId} and I.TYPE_ = #{involvedUserIdentityLink.type})
+        I.USER_ID_ = #{involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedUserIdentityLink.type, jdbcType=NVARCHAR})
       </if>
       <if test="involvedGroups != null">
         and EXISTS(
@@ -858,9 +858,9 @@
                 or
                 </if>
                 I.GROUP_ID_ IN
-                <foreach item="group" index="index" collection="involvedGroupListItem"
+                <foreach item="groupId" index="index" collection="involvedGroupListItem"
                       open="(" separator="," close=")">
-                  #{group}
+                  #{groupId, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
             )
@@ -868,14 +868,14 @@
       </if>
       <if test="involvedGroupIdentityLink != null">
         and EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and 
-        I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId} and I.TYPE_ = #{involvedGroupIdentityLink.type})
+        I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
       </if>
       <!-- PLEASE NOTE: If you change anything have a look into the HistoricVariableInstance & HistoricProcessInstance, the same query object is used there! -->
       <foreach collection="queryVariableValues" index="index" item="queryVariableValue">
         <choose>
             <when test="queryVariableValue.operator.equals('EXISTS')">
               and EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name}
+                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR}
                 <if test="!queryVariableValue.local">
                     and RES.PROC_INST_ID_ = EXECUTION_ID_
                 </if>
@@ -886,7 +886,7 @@
             </when>
             <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
               and NOT EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name}
+                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR}
                 <if test="!queryVariableValue.local">
                     and RES.PROC_INST_ID_ = EXECUTION_ID_
                 </if>
@@ -908,10 +908,10 @@
                         </if>
                         <if test="queryVariableValue.name != null">
                             <!-- Match-all variable-names when name is null -->
-                            and V.NAME_= #{queryVariableValue.name}
+                            and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                         </if>
                         <if test="queryVariableValue.needsTypeCheck()">
-                            and V.TYPE_ = #{queryVariableValue.type}
+                            and V.TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                         </if>
                         <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                             <choose>
@@ -926,7 +926,7 @@
                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                 <otherwise><include refid="executionVariableOperator" /></otherwise>
                             </choose>
-                            #{queryVariableValue.textValue}
+                            #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -941,7 +941,7 @@
                                 <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                 <otherwise><include refid="executionVariableOperator" /></otherwise>
                             </choose>
-                            #{queryVariableValue.textValue2}
+                            #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -949,7 +949,7 @@
                         <if test="queryVariableValue.longValue != null">
                             and (V.LONG_
                             <include refid="executionVariableOperator" />
-                            #{queryVariableValue.longValue}
+                            #{queryVariableValue.longValue, jdbcType=BIGINT}
                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.LONG_ is null
                             </if>
@@ -958,7 +958,7 @@
                         <if test="queryVariableValue.doubleValue != null">
                             and (V.DOUBLE_
                             <include refid="executionVariableOperator" />
-                            #{queryVariableValue.doubleValue}
+                            #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.DOUBLE_ is null
                             </if>
@@ -988,8 +988,8 @@
                 from ${prefix}ACT_RU_EVENT_SUBSCR EVT
                 <where>
                     RES.ID_ = EVT.EXECUTION_ID_
-                    and EVT.EVENT_TYPE_ = #{eventSubscriptionValue.eventType}
-                    and EVT.EVENT_NAME_ = #{eventSubscriptionValue.eventName}
+                    and EVT.EVENT_TYPE_ = #{eventSubscriptionValue.eventType, jdbcType=NVARCHAR}
+                    and EVT.EVENT_NAME_ = #{eventSubscriptionValue.eventName, jdbcType=NVARCHAR}
                 </where>
             )
 	      </foreach>
@@ -998,79 +998,79 @@
         and
         <trim prefix="(" prefixOverrides="OR" suffix=")">
           <if test="orQueryObject.processDefinitionId != null">
-            P.ID_ = #{orQueryObject.processDefinitionId}
+            P.ID_ = #{orQueryObject.processDefinitionId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processDefinitionIds != null and !orQueryObject.processDefinitionIds.empty">
             or P.ID_ in
-            <foreach item="item" index="index" collection="orQueryObject.processDefinitionIds" open="(" separator="," close=")">
-              #{item}
+            <foreach item="processDefinitionId" index="index" collection="orQueryObject.processDefinitionIds" open="(" separator="," close=")">
+              #{processDefinitionId, jdbcType=NVARCHAR}
             </foreach>
           </if>
           <if test="orQueryObject.processDefinitionKey != null">
-            or P.KEY_ = #{orQueryObject.processDefinitionKey}
+            or P.KEY_ = #{orQueryObject.processDefinitionKey, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processDefinitionKeys != null and !orQueryObject.processDefinitionKeys.empty">
             or P.KEY_ in
-            <foreach item="item" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
-              #{item}
+            <foreach item="processDefinitionKey" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
+              #{processDefinitionKey, jdbcType=NVARCHAR}
             </foreach>
           </if>
           <if test="orQueryObject.processDefinitionCategory != null">
-            or P.CATEGORY_ = #{orQueryObject.processDefinitionCategory}
+            or P.CATEGORY_ = #{orQueryObject.processDefinitionCategory, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processDefinitionName != null">
-            or P.NAME_ = #{orQueryObject.processDefinitionName}
+            or P.NAME_ = #{orQueryObject.processDefinitionName, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processDefinitionVersion != null">
-            or P.VERSION_ = #{orQueryObject.processDefinitionVersion}
+            or P.VERSION_ = #{orQueryObject.processDefinitionVersion, jdbcType=INTEGER}
           </if>
           <if test="orQueryObject.processDefinitionEngineVersion != null">
-            or P.ENGINE_VERSION_ = #{orQueryObject.processDefinitionEngineVersion}
+            or P.ENGINE_VERSION_ = #{orQueryObject.processDefinitionEngineVersion, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.executionId != null">
-            or RES.ID_ = #{orQueryObject.executionId}
+            or RES.ID_ = #{orQueryObject.executionId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processInstanceId != null">
-            or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId}
+            or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processInstanceIds != null and !orQueryObject.processInstanceIds.empty">
             or RES.PROC_INST_ID_ in
-            <foreach item="item" index="index" collection="orQueryObject.processInstanceIds" open="(" separator="," close=")">
-              #{item}
+            <foreach item="processInstanceId" index="index" collection="orQueryObject.processInstanceIds" open="(" separator="," close=")">
+              #{processInstanceId, jdbcType=NVARCHAR}
             </foreach>
           </if>
           <if test="orQueryObject.businessKey != null">
-            or RES.BUSINESS_KEY_ = #{orQueryObject.businessKey}
+            or RES.BUSINESS_KEY_ = #{orQueryObject.businessKey, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.businessStatus != null">
-            or RES.BUSINESS_STATUS_ = #{orQueryObject.businessStatus}
+            or RES.BUSINESS_STATUS_ = #{orQueryObject.businessStatus, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.businessStatusLike != null">
-            or RES.BUSINESS_STATUS_ like #{orQueryObject.businessStatusLike}${wildcardEscapeClause}
+            or RES.BUSINESS_STATUS_ like #{orQueryObject.businessStatusLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
           </if>
           <if test="orQueryObject.activityId != null">
-            or (RES.ACT_ID_ = #{orQueryObject.activityId} and RES.IS_ACTIVE_ = #{isActive})
+            or (RES.ACT_ID_ = #{orQueryObject.activityId, jdbcType=NVARCHAR} and RES.IS_ACTIVE_ = #{isActive, jdbcType=BOOLEAN})
           </if>
           <if test="orQueryObject.parentId != null">
-            or RES.PARENT_ID_ = #{orQueryObject.parentId}
+            or RES.PARENT_ID_ = #{orQueryObject.parentId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.deploymentId != null">
-            or P.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId}
+            or P.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.deploymentIds != null &amp;&amp; !orQueryObject.deploymentIds.empty">
             or P.DEPLOYMENT_ID_ IN
-            <foreach item="deployment" index="index" collection="orQueryObject.deploymentIds"
+            <foreach item="deploymentId" index="index" collection="orQueryObject.deploymentIds"
                      open="(" separator="," close=")">
-              #{deployment}
+              #{deploymentId, jdbcType=NVARCHAR}
             </foreach>
           </if>
           <if test="orQueryObject.superProcessInstanceId != null">
             <!-- A sub process instance is stored under a certain *execution*, potentially nested.
                  A sub process instance is NOT stored under the process instanc, hence the following: -->
-            or RES.SUPER_EXEC_ IN (select ID_ from ${prefix}ACT_RU_EXECUTION where PROC_INST_ID_ = #{orQueryObject.superProcessInstanceId})
+            or RES.SUPER_EXEC_ IN (select ID_ from ${prefix}ACT_RU_EXECUTION where PROC_INST_ID_ = #{orQueryObject.superProcessInstanceId, jdbcType=NVARCHAR})
           </if>
           <if test="orQueryObject.subProcessInstanceId != null">
-            or RES.ID_ = (select PROC_INST_ID_ from ${prefix}ACT_RU_EXECUTION where ID_ = (select SUPER_EXEC_ from ${prefix}ACT_RU_EXECUTION where ID_ = #{orQueryObject.subProcessInstanceId}))
+            or RES.ID_ = (select PROC_INST_ID_ from ${prefix}ACT_RU_EXECUTION where ID_ = (select SUPER_EXEC_ from ${prefix}ACT_RU_EXECUTION where ID_ = #{orQueryObject.subProcessInstanceId, jdbcType=NVARCHAR}))
           </if>
           <if test="orQueryObject.excludeSubprocesses">
             or RES.SUPER_EXEC_ is null
@@ -1084,38 +1084,38 @@
             </if>
           </if>
           <if test="orQueryObject.callbackId != null">
-              or CALLBACK_ID_ = #{orQueryObject.callbackId}
+              or CALLBACK_ID_ = #{orQueryObject.callbackId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.callbackType != null">
-              or CALLBACK_TYPE_ = #{orQueryObject.callbackType}
+              or CALLBACK_TYPE_ = #{orQueryObject.callbackType, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.referenceId != null">
-              or REFERENCE_ID_ = #{orQueryObject.referenceId}
+              or REFERENCE_ID_ = #{orQueryObject.referenceId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.referenceType != null">
-              or REFERENCE_TYPE_ = #{orQueryObject.referenceType}
+              or REFERENCE_TYPE_ = #{orQueryObject.referenceType, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.tenantId != null">
-            or RES.TENANT_ID_ = #{orQueryObject.tenantId}
+            or RES.TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.tenantIdLike != null">
-            or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike}${wildcardEscapeClause}
+            or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
           </if>
           <if test="orQueryObject.withoutTenantId">
             or (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
           </if>
           <if test="orQueryObject.name != null">
-            or RES.NAME_ = #{orQueryObject.name}
+            or RES.NAME_ = #{orQueryObject.name, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.nameLike != null">
-            or RES.NAME_ like #{orQueryObject.nameLike}${wildcardEscapeClause}
+            or RES.NAME_ like #{orQueryObject.nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
           </if>
           <if test="orQueryObject.nameLikeIgnoreCase != null">
-            or lower(RES.NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase})${wildcardEscapeClause}
+            or lower(RES.NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
           </if>
           <if test="orQueryObject.parentScopeId != null">
               or EXISTS(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
-              LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId}
+              LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId, jdbcType=NVARCHAR}
               and LINK.REF_SCOPE_ID_ = RES.ID_
               and LINK.HIERARCHY_TYPE_ = 'parent'
               )
@@ -1123,25 +1123,25 @@
           <if test="orQueryObject.rootScopeId != null">
               or exists(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
               LINK.REF_SCOPE_ID_ = RES.ID_
-              and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId}
+              and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId, jdbcType=NVARCHAR}
               )
           </if>
           <if test="orQueryObject.activeActivityId != null">
-	        or EXISTS(select ID_ from ${prefix}ACT_RU_ACTINST A where A.PROC_INST_ID_ = RES.ID_ and A.ACT_ID_ = #{orQueryObject.activeActivityId} and A.END_TIME_ is null)
+	        or EXISTS(select ID_ from ${prefix}ACT_RU_ACTINST A where A.PROC_INST_ID_ = RES.ID_ and A.ACT_ID_ = #{orQueryObject.activeActivityId, jdbcType=NVARCHAR} and A.END_TIME_ is null)
 	      </if>
 	      <if test="orQueryObject.activeActivityIds != null">
 	        or EXISTS(select ID_ from ${prefix}ACT_RU_ACTINST A where A.PROC_INST_ID_ = RES.ID_ and A.ACT_ID_ in 
 	        <foreach item="activeActivityId" index="index" collection="orQueryObject.activeActivityIds" open="(" separator="," close=")">
-	            #{activeActivityId}
+	            #{activeActivityId, jdbcType=NVARCHAR}
 	        </foreach>
 	        and A.END_TIME_ is null)
 	      </if>
           <if test="orQueryObject.involvedUser != null">
-            or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and I.USER_ID_ = #{orQueryObject.involvedUser})
+            or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and I.USER_ID_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR})
           </if>
           <if test="orQueryObject.involvedUserIdentityLink != null">
 	        or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and 
-	        I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type})
+	        I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type, jdbcType=NVARCHAR})
 	      </if>
           <if test="orQueryObject.involvedGroups != null">
             or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and 
@@ -1151,9 +1151,9 @@
                     or
                     </if>
                     I.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="involvedGroupListItem"
+                    <foreach item="groupId" index="index" collection="involvedGroupListItem"
                           open="(" separator="," close=")">
-                      #{group}
+                      #{groupId, jdbcType=NVARCHAR}
                     </foreach>
                 </foreach>
                 )
@@ -1161,7 +1161,7 @@
           </if>
           <if test="orQueryObject.involvedGroupIdentityLink != null">
 	        or EXISTS(select ID_ from ${prefix}ACT_RU_IDENTITYLINK I where I.PROC_INST_ID_ = RES.ID_ and 
-	        I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type})
+	        I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
 	      </if>
           <!-- PLEASE NOTE: If you change anything have a look into the HistoricVariableInstance & HistoricProcessInstance, the same query object is used there! -->
           <foreach collection="orQueryObject.queryVariableValues" index="index" item="queryVariableValue">
@@ -1170,7 +1170,7 @@
               <choose>
                 <when test="queryVariableValue.operator.equals('EXISTS')">
                     and EXISTS (
-                        select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name}
+                        select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR}
                     <if test="!queryVariableValue.local">
                         and RES.PROC_INST_ID_ = EXECUTION_ID_
                     </if>
@@ -1181,7 +1181,7 @@
                 </when>
                 <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
                     and NOT EXISTS (
-                        select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name}
+                        select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR}
                     <if test="!queryVariableValue.local">
                         and RES.PROC_INST_ID_ = EXECUTION_ID_
                     </if>
@@ -1203,10 +1203,10 @@
                             </if>
                             <if test="queryVariableValue.name != null">
                                 <!-- Match-all variable-names when name is null -->
-                                and V.NAME_= #{queryVariableValue.name}
+                                and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                             </if>
                             <if test="queryVariableValue.needsTypeCheck()">
-                                and V.TYPE_ = #{queryVariableValue.type}
+                                and V.TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                             </if>
                             <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                                 <choose>
@@ -1221,7 +1221,7 @@
                                     <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                     <otherwise><include refid="executionVariableOperator" /></otherwise>
                                 </choose>
-                                #{queryVariableValue.textValue}
+                                #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                                 <choose>
                                     <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                                 </choose>
@@ -1236,7 +1236,7 @@
                                     <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                     <otherwise><include refid="executionVariableOperator" /></otherwise>
                                 </choose>
-                                #{queryVariableValue.textValue2}
+                                #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                                 <choose>
                                     <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                 </choose>
@@ -1244,7 +1244,7 @@
                             <if test="queryVariableValue.longValue != null">
                                 and (V.LONG_
                                 <include refid="executionVariableOperator" />
-                                #{queryVariableValue.longValue}
+                                #{queryVariableValue.longValue, jdbcType=BIGINT}
                                 <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                     or V.LONG_ is null
                                 </if>
@@ -1253,7 +1253,7 @@
                             <if test="queryVariableValue.doubleValue != null">
                                 and (V.DOUBLE_
                                 <include refid="executionVariableOperator" />
-                                #{queryVariableValue.doubleValue}
+                                #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                                 <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                     or V.DOUBLE_ is null
                                 </if>
@@ -1289,13 +1289,13 @@
           )
       </if>
       <if test="startedBefore != null">
-        and RES.START_TIME_ &lt;= #{startedBefore}
+        and RES.START_TIME_ &lt;= #{startedBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="startedAfter != null">
-        and RES.START_TIME_ &gt;= #{startedAfter}
+        and RES.START_TIME_ &gt;= #{startedAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="startedBy != null">
-        and RES.START_USER_ID_ = #{startedBy}
+        and RES.START_USER_ID_ = #{startedBy, jdbcType=NVARCHAR}
       </if>
     </where>
   </sql>
@@ -1316,7 +1316,7 @@
   <select id="selectSubProcessInstanceBySuperExecutionId" parameterType="string" resultMap="executionResultMap">
     select *
     from ${prefix}ACT_RU_EXECUTION
-    where SUPER_EXEC_ = #{parameter}
+    where SUPER_EXEC_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectExecutionByNativeQuery" parameterType="java.util.Map" resultMap="executionResultMap">
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricActivityInstance.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricActivityInstance.xml
index 746840ae38c..673e986342d 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricActivityInstance.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricActivityInstance.xml
@@ -40,22 +40,22 @@
         DELETE_REASON_,
         TENANT_ID_
       ) values (
-        #{id ,jdbcType=VARCHAR},
-        1, #{processDefinitionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{executionId, jdbcType=VARCHAR},
-        #{activityId ,jdbcType=VARCHAR},
-        #{taskId ,jdbcType=VARCHAR},
-        #{calledProcessInstanceId ,jdbcType=VARCHAR},
-        #{activityName ,jdbcType=VARCHAR},
-        #{activityType ,jdbcType=VARCHAR},
-        #{assignee ,jdbcType=VARCHAR},
+        #{id, jdbcType=NVARCHAR},
+        1, #{processDefinitionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{activityId, jdbcType=NVARCHAR},
+        #{taskId, jdbcType=NVARCHAR},
+        #{calledProcessInstanceId, jdbcType=NVARCHAR},
+        #{activityName, jdbcType=NVARCHAR},
+        #{activityType, jdbcType=NVARCHAR},
+        #{assignee, jdbcType=NVARCHAR},
         #{startTime, jdbcType=TIMESTAMP},
         #{endTime, jdbcType=TIMESTAMP},
-        #{transactionOrder ,jdbcType=INTEGER},
-        #{durationInMillis ,jdbcType=BIGINT},
-        #{deleteReason, jdbcType=VARCHAR},
-        #{tenantId, jdbcType=VARCHAR}
+        #{transactionOrder, jdbcType=INTEGER},
+        #{durationInMillis, jdbcType=BIGINT},
+        #{deleteReason, jdbcType=NVARCHAR},
+        #{tenantId, jdbcType=NVARCHAR}
       )
   </insert>
   
@@ -80,22 +80,22 @@
         TENANT_ID_
       ) values 
       <foreach collection="list" item="historicActivityInstance" index="index" separator=",">
-         (#{historicActivityInstance.id ,jdbcType=VARCHAR},
-          1, #{historicActivityInstance.processDefinitionId, jdbcType=VARCHAR},
-          #{historicActivityInstance.processInstanceId, jdbcType=VARCHAR},
-          #{historicActivityInstance.executionId, jdbcType=VARCHAR},
-          #{historicActivityInstance.activityId ,jdbcType=VARCHAR},
-          #{historicActivityInstance.taskId ,jdbcType=VARCHAR},
-          #{historicActivityInstance.calledProcessInstanceId ,jdbcType=VARCHAR},
-          #{historicActivityInstance.activityName ,jdbcType=VARCHAR},
-          #{historicActivityInstance.activityType ,jdbcType=VARCHAR},
-          #{historicActivityInstance.assignee ,jdbcType=VARCHAR},
+         (#{historicActivityInstance.id, jdbcType=NVARCHAR},
+          1, #{historicActivityInstance.processDefinitionId, jdbcType=NVARCHAR},
+          #{historicActivityInstance.processInstanceId, jdbcType=NVARCHAR},
+          #{historicActivityInstance.executionId, jdbcType=NVARCHAR},
+          #{historicActivityInstance.activityId, jdbcType=NVARCHAR},
+          #{historicActivityInstance.taskId, jdbcType=NVARCHAR},
+          #{historicActivityInstance.calledProcessInstanceId, jdbcType=NVARCHAR},
+          #{historicActivityInstance.activityName, jdbcType=NVARCHAR},
+          #{historicActivityInstance.activityType, jdbcType=NVARCHAR},
+          #{historicActivityInstance.assignee, jdbcType=NVARCHAR},
           #{historicActivityInstance.startTime, jdbcType=TIMESTAMP},
           #{historicActivityInstance.endTime, jdbcType=TIMESTAMP},
           #{historicActivityInstance.transactionOrder, jdbcType=INTEGER},
           #{historicActivityInstance.durationInMillis, jdbcType=BIGINT},
-          #{historicActivityInstance.deleteReason, jdbcType=VARCHAR},
-          #{historicActivityInstance.tenantId, jdbcType=VARCHAR})
+          #{historicActivityInstance.deleteReason, jdbcType=NVARCHAR},
+          #{historicActivityInstance.tenantId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
   
@@ -121,22 +121,22 @@
           DELETE_REASON_,
           TENANT_ID_
         ) VALUES 
-           (#{historicActivityInstance.id ,jdbcType=VARCHAR},
-            1, #{historicActivityInstance.processDefinitionId, jdbcType=VARCHAR},
-            #{historicActivityInstance.processInstanceId, jdbcType=VARCHAR},
-            #{historicActivityInstance.executionId, jdbcType=VARCHAR},
-            #{historicActivityInstance.activityId ,jdbcType=VARCHAR},
-            #{historicActivityInstance.taskId ,jdbcType=VARCHAR},
-            #{historicActivityInstance.calledProcessInstanceId ,jdbcType=VARCHAR},
-            #{historicActivityInstance.activityName ,jdbcType=VARCHAR},
-            #{historicActivityInstance.activityType ,jdbcType=VARCHAR},
-            #{historicActivityInstance.assignee ,jdbcType=VARCHAR},
+           (#{historicActivityInstance.id, jdbcType=NVARCHAR},
+            1, #{historicActivityInstance.processDefinitionId, jdbcType=NVARCHAR},
+            #{historicActivityInstance.processInstanceId, jdbcType=NVARCHAR},
+            #{historicActivityInstance.executionId, jdbcType=NVARCHAR},
+            #{historicActivityInstance.activityId, jdbcType=NVARCHAR},
+            #{historicActivityInstance.taskId, jdbcType=NVARCHAR},
+            #{historicActivityInstance.calledProcessInstanceId, jdbcType=NVARCHAR},
+            #{historicActivityInstance.activityName, jdbcType=NVARCHAR},
+            #{historicActivityInstance.activityType, jdbcType=NVARCHAR},
+            #{historicActivityInstance.assignee, jdbcType=NVARCHAR},
             #{historicActivityInstance.startTime, jdbcType=TIMESTAMP},
             #{historicActivityInstance.endTime, jdbcType=TIMESTAMP},
             #{historicActivityInstance.transactionOrder, jdbcType=INTEGER},
-            #{historicActivityInstance.durationInMillis ,jdbcType=BIGINT},
-            #{historicActivityInstance.deleteReason ,jdbcType=VARCHAR},
-            #{historicActivityInstance.tenantId, jdbcType=VARCHAR})
+            #{historicActivityInstance.durationInMillis, jdbcType=BIGINT},
+            #{historicActivityInstance.deleteReason, jdbcType=NVARCHAR},
+            #{historicActivityInstance.tenantId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -148,90 +148,90 @@
     <set>
         REV_ = #{revisionNext, jdbcType=INTEGER},
         <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-            PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+            PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.executionId != executionId">
-            EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+            EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.taskId != taskId">
-            TASK_ID_ = #{taskId, jdbcType=VARCHAR},
+            TASK_ID_ = #{taskId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.assignee != assignee">
-            ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
+            ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.endTime != endTime">
-            END_TIME_ = #{endTime, jdbcType=VARCHAR},
+            END_TIME_ = #{endTime, jdbcType=TIMESTAMP},
         </if>
         <if test="originalPersistentState.transactionOrder != transactionOrder">
         	TRANSACTION_ORDER_ = #{transactionOrder, jdbcType=INTEGER}, 
         </if>
         <if test="originalPersistentState.durationInMillis != durationInMillis">
-            DURATION_ = #{durationInMillis, jdbcType=VARCHAR},
+            DURATION_ = #{durationInMillis, jdbcType=BIGINT},
         </if>
         <if test="originalPersistentState.deleteReason != deleteReason">
-            DELETE_REASON_ = #{deleteReason, jdbcType=VARCHAR},
+            DELETE_REASON_ = #{deleteReason, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.calledProcessInstanceId != calledProcessInstanceId">
-            CALL_PROC_INST_ID_ = #{calledProcessInstanceId, jdbcType=VARCHAR},
+            CALL_PROC_INST_ID_ = #{calledProcessInstanceId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.activityId != activityId">
-            ACT_ID_ = #{activityId, jdbcType=VARCHAR},
+            ACT_ID_ = #{activityId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.activityName != activityName">
-            ACT_NAME_ = #{activityName, jdbcType=VARCHAR},
+            ACT_NAME_ = #{activityName, jdbcType=NVARCHAR},
         </if>
     </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
     and REV_ = #{revision, jdbcType=INTEGER}
 </update>
 
   <!-- HISTORIC ACTIVITY INSTANCE DELETE -->
   
   <delete id="deleteHistoricActivityInstancesByProcessInstanceId">
-    delete from ${prefix}ACT_HI_ACTINST where PROC_INST_ID_ = #{processInstanceId}
+    delete from ${prefix}ACT_HI_ACTINST where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteHistoricActivityInstance">
-    delete from ${prefix}ACT_HI_ACTINST where ID_ = #{id}
+    delete from ${prefix}ACT_HI_ACTINST where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="bulkDeleteHistoricActivityInstance" parameterType="java.util.Collection">
         delete from ${prefix}ACT_HI_ACTINST where
-        <foreach item="activityInstance" collection="list" index="index" separator=" or ">
-            ID_ = #{activityInstance.id, jdbcType=VARCHAR}
+        <foreach item="historicActivityInstance" collection="list" index="index" separator=" or ">
+            ID_ = #{historicActivityInstance.id, jdbcType=NVARCHAR}
         </foreach>
   </delete>
   
   <!-- HISTORIC ACTIVITY INSTANCE RESULT MAP -->
 
   <resultMap id="historicActivityInstanceResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricActivityInstanceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="activityId" column="ACT_ID_" jdbcType="VARCHAR" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-    <result property="calledProcessInstanceId" column="CALL_PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="activityName" column="ACT_NAME_" jdbcType="VARCHAR" />
-    <result property="activityType" column="ACT_TYPE_" jdbcType="VARCHAR" />
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="activityId" column="ACT_ID_" jdbcType="NVARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="calledProcessInstanceId" column="CALL_PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="activityName" column="ACT_NAME_" jdbcType="NVARCHAR" />
+    <result property="activityType" column="ACT_TYPE_" jdbcType="NVARCHAR" />
+    <result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
     <result property="endTime" column="END_TIME_" jdbcType="TIMESTAMP" />
     <result property="transactionOrder" column="TRANSACTION_ORDER_" jdbcType="INTEGER" />
     <result property="durationInMillis" column="DURATION_" jdbcType="BIGINT" />
-    <result property="deleteReason" column="DELETE_REASON_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <result property="deleteReason" column="DELETE_REASON_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- HISTORIC ACTIVITY INSTANCE SELECT -->
   
   <select id="selectHistoricActivityInstanceByActivityIdAndProcessInstanceId" resultMap="historicActivityInstanceResultMap">
-    select * from ${prefix}ACT_HI_ACTINST where ACT_ID_ = #{activityId} and PROC_INST_ID_ = #{processInstanceId}
+    select * from ${prefix}ACT_HI_ACTINST where ACT_ID_ = #{activityId, jdbcType=NVARCHAR} and PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectHistoricActivityInstance" resultMap="historicActivityInstanceResultMap">
-    select * from ${prefix}ACT_HI_ACTINST where ID_ =#{id}
+    select * from ${prefix}ACT_HI_ACTINST where ID_ =#{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectHistoricActivityInstancesByQueryCriteria" parameterType="org.flowable.engine.impl.HistoricActivityInstanceQueryImpl" resultMap="historicActivityInstanceResultMap">
@@ -268,8 +268,8 @@
         or
         </if>
         PROC_INST_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -298,58 +298,58 @@
     from ${prefix}ACT_HI_ACTINST ${queryTablePrefixSelect}
     <where>
       <if test="processInstanceId != null">
-        ${queryTablePrefix}PROC_INST_ID_ = #{processInstanceId}
+        ${queryTablePrefix}PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="activityInstanceId != null">
-        and ${queryTablePrefix}ID_ = #{activityInstanceId}
+        and ${queryTablePrefix}ID_ = #{activityInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="executionId != null">
-        and ${queryTablePrefix}EXECUTION_ID_ = #{executionId}
+        and ${queryTablePrefix}EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionId != null">
-        and ${queryTablePrefix}PROC_DEF_ID_ = #{processDefinitionId}
+        and ${queryTablePrefix}PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="activityId != null">
-        and ${queryTablePrefix}ACT_ID_ = #{activityId}
+        and ${queryTablePrefix}ACT_ID_ = #{activityId, jdbcType=NVARCHAR}
       </if>
       <if test="activityName != null">
-        and ${queryTablePrefix}ACT_NAME_ = #{activityName}
+        and ${queryTablePrefix}ACT_NAME_ = #{activityName, jdbcType=NVARCHAR}
       </if>
       <if test="activityType != null">
-        and ${queryTablePrefix}ACT_TYPE_ = #{activityType}
+        and ${queryTablePrefix}ACT_TYPE_ = #{activityType, jdbcType=NVARCHAR}
       </if>
       <if test="activityTypes != null and !activityTypes.empty">
         and ${queryTablePrefix}ACT_TYPE_ in
-         <foreach item="item" index="index" collection="activityTypes" open="(" separator="," close=")">
-              #{item}
+         <foreach item="activityType" index="index" collection="activityTypes" open="(" separator="," close=")">
+              #{activityType, jdbcType=NVARCHAR}
          </foreach>
       </if>
       <if test="startedBefore != null">
-          and ${queryTablePrefix}START_TIME_ &lt;= #{startedBefore}
+          and ${queryTablePrefix}START_TIME_ &lt;= #{startedBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="startedAfter != null">
-          and ${queryTablePrefix}START_TIME_ &gt;= #{startedAfter}
+          and ${queryTablePrefix}START_TIME_ &gt;= #{startedAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="finishedBefore != null">
-          and ${queryTablePrefix}END_TIME_ &lt;= #{finishedBefore}
+          and ${queryTablePrefix}END_TIME_ &lt;= #{finishedBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="finishedAfter != null">
-        and ${queryTablePrefix}END_TIME_ &gt;= #{finishedAfter}
+        and ${queryTablePrefix}END_TIME_ &gt;= #{finishedAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="assignee != null">
-        and ${queryTablePrefix}ASSIGNEE_ = #{assignee}
+        and ${queryTablePrefix}ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR}
       </if>
       <if test="tenantId != null">
-        and ${queryTablePrefix}TENANT_ID_ = #{tenantId}
+        and ${queryTablePrefix}TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIds != null &amp;&amp; !tenantIds.empty">
         and ${queryTablePrefix}TENANT_ID_ in
         <foreach item="tenantId" index="index" collection="tenantIds" open="(" separator="," close=")">
-            #{tenantId}
+            #{tenantId, jdbcType=NVARCHAR}
          </foreach>
       </if>
       <if test="tenantIdLike != null">
-        and ${queryTablePrefix}TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (${queryTablePrefix}TENANT_ID_ = '' or ${queryTablePrefix}TENANT_ID_ is null)
@@ -361,10 +361,10 @@
        and ${queryTablePrefix}END_TIME_ is not null
       </if>
       <if test="deleteReason != null">
-        and ${queryTablePrefix}DELETE_REASON_ = #{deleteReason}
+        and ${queryTablePrefix}DELETE_REASON_ = #{deleteReason, jdbcType=NVARCHAR}
       </if>
       <if test="deleteReasonLike != null">
-        and ${queryTablePrefix}DELETE_REASON_ like #{deleteReasonLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}DELETE_REASON_ like #{deleteReasonLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
     </where>
   </sql>
@@ -379,17 +379,17 @@
   
   <select id="selectUnfinishedHistoricActivityInstanceExecutionIdAndActivityId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicActivityInstanceResultMap">
     select * from ${prefix}ACT_HI_ACTINST RES
-    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=VARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=VARCHAR} and END_TIME_ is null
+    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=NVARCHAR} and END_TIME_ is null
   </select>
   
   <select id="selectHistoricActivityInstanceExecutionIdAndActivityId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicActivityInstanceResultMap">
     select * from ${prefix}ACT_HI_ACTINST RES
-    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=VARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=VARCHAR}
+    where EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR} and ACT_ID_ = #{parameter.activityId, jdbcType=NVARCHAR}
   </select>
   
    <select id="selectUnfinishedHistoricActivityInstanceByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicActivityInstanceResultMap">
     select * from ${prefix}ACT_HI_ACTINST RES
-    where PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=VARCHAR} and END_TIME_ is null
+    where PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR} and END_TIME_ is null
   </select>
   
 </mapper>
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricDetail.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricDetail.xml
index 0a3932d8829..f8a3089bafd 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricDetail.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricDetail.xml
@@ -23,15 +23,15 @@
   <insert id="insertHistoricFormProperty" parameterType="org.flowable.engine.impl.persistence.entity.HistoricFormPropertyEntityImpl">
     insert into ${prefix}ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, ACT_INST_ID_, EXECUTION_ID_, TASK_ID_, TIME_, NAME_, TEXT_)
     values (
-      #{id, jdbcType=VARCHAR},
+      #{id, jdbcType=NVARCHAR},
       'FormProperty',
-      #{processInstanceId, jdbcType=VARCHAR},
-      #{activityInstanceId, jdbcType=VARCHAR},
-      #{executionId, jdbcType=VARCHAR},
-      #{taskId, jdbcType=VARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{activityInstanceId, jdbcType=NVARCHAR},
+      #{executionId, jdbcType=NVARCHAR},
+      #{taskId, jdbcType=NVARCHAR},
       #{time, jdbcType=TIMESTAMP},
-      #{propertyId, jdbcType=VARCHAR},
-      #{propertyValue, jdbcType=VARCHAR}
+      #{propertyId, jdbcType=NVARCHAR},
+      #{propertyValue, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -39,15 +39,15 @@
     insert into ${prefix}ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, ACT_INST_ID_, EXECUTION_ID_, TASK_ID_, TIME_, NAME_, TEXT_)
     values 
     <foreach collection="list" item="historicFormProperty" index="index" separator=",">
-      (#{historicFormProperty.id, jdbcType=VARCHAR},
-       #{historicFormProperty.detailType, jdbcType=VARCHAR},
-       #{historicFormProperty.processInstanceId, jdbcType=VARCHAR},
-       #{historicFormProperty.activityInstanceId, jdbcType=VARCHAR},
-       #{historicFormProperty.executionId, jdbcType=VARCHAR},
-       #{historicFormProperty.taskId, jdbcType=VARCHAR},
+      (#{historicFormProperty.id, jdbcType=NVARCHAR},
+       #{historicFormProperty.detailType, jdbcType=NVARCHAR},
+       #{historicFormProperty.processInstanceId, jdbcType=NVARCHAR},
+       #{historicFormProperty.activityInstanceId, jdbcType=NVARCHAR},
+       #{historicFormProperty.executionId, jdbcType=NVARCHAR},
+       #{historicFormProperty.taskId, jdbcType=NVARCHAR},
        #{historicFormProperty.time, jdbcType=TIMESTAMP},
-       #{historicFormProperty.propertyId, jdbcType=VARCHAR},
-       #{historicFormProperty.propertyValue, jdbcType=VARCHAR})
+       #{historicFormProperty.propertyId, jdbcType=NVARCHAR},
+       #{historicFormProperty.propertyValue, jdbcType=NVARCHAR})
     </foreach>
   </insert>
 
@@ -55,15 +55,15 @@
     INSERT ALL 
     <foreach collection="list" item="historicFormProperty" index="index">
       INTO ${prefix}ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, ACT_INST_ID_, EXECUTION_ID_, TASK_ID_, TIME_, NAME_, TEXT_) VALUES 
-        (#{historicFormProperty.id, jdbcType=VARCHAR},
-         #{historicFormProperty.detailType, jdbcType=VARCHAR},
-         #{historicFormProperty.processInstanceId, jdbcType=VARCHAR},
-         #{historicFormProperty.activityInstanceId, jdbcType=VARCHAR},
-         #{historicFormProperty.executionId, jdbcType=VARCHAR},
-         #{historicFormProperty.taskId, jdbcType=VARCHAR},
+        (#{historicFormProperty.id, jdbcType=NVARCHAR},
+         #{historicFormProperty.detailType, jdbcType=NVARCHAR},
+         #{historicFormProperty.processInstanceId, jdbcType=NVARCHAR},
+         #{historicFormProperty.activityInstanceId, jdbcType=NVARCHAR},
+         #{historicFormProperty.executionId, jdbcType=NVARCHAR},
+         #{historicFormProperty.taskId, jdbcType=NVARCHAR},
          #{historicFormProperty.time, jdbcType=TIMESTAMP},
-         #{historicFormProperty.propertyId, jdbcType=VARCHAR},
-         #{historicFormProperty.propertyValue, jdbcType=VARCHAR})
+         #{historicFormProperty.propertyId, jdbcType=NVARCHAR},
+         #{historicFormProperty.propertyValue, jdbcType=NVARCHAR})
     </foreach>
     SELECT * FROM dual
   </insert>
@@ -71,21 +71,21 @@
   <insert id="insertHistoricDetailVariableInstanceUpdate" parameterType="org.flowable.engine.impl.persistence.entity.HistoricDetailVariableInstanceUpdateEntityImpl">
     insert into ${prefix}ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_)
     values (
-      #{id, jdbcType=VARCHAR},
+      #{id, jdbcType=NVARCHAR},
       'VariableUpdate',
-      #{processInstanceId, jdbcType=VARCHAR},
-      #{executionId, jdbcType=VARCHAR},
-      #{activityInstanceId, jdbcType=VARCHAR},
-      #{taskId, jdbcType=VARCHAR},
-      #{variableName, jdbcType=VARCHAR},
-      #{revision, jdbcType=VARCHAR},
-      #{variableType, jdbcType=VARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{executionId, jdbcType=NVARCHAR},
+      #{activityInstanceId, jdbcType=NVARCHAR},
+      #{taskId, jdbcType=NVARCHAR},
+      #{variableName, jdbcType=NVARCHAR},
+      #{revision, jdbcType=INTEGER},
+      #{variableType, jdbcType=NVARCHAR},
       #{time, jdbcType=TIMESTAMP},
       #{byteArrayRef, typeHandler=ByteArrayRefTypeHandler},
       #{doubleValue, jdbcType=DOUBLE},
       #{longValue, jdbcType=BIGINT},
-      #{textValue, jdbcType=VARCHAR},
-      #{textValue2, jdbcType=VARCHAR}
+      #{textValue, jdbcType=NVARCHAR},
+      #{textValue2, jdbcType=NVARCHAR}
     )
   </insert>
   
@@ -93,21 +93,21 @@
     insert into ${prefix}ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_)
     values 
       <foreach collection="list" item="historicDetailVariableInstance" index="index" separator=",">
-        (#{historicDetailVariableInstance.id, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.detailType, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.processInstanceId, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.executionId, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.activityInstanceId, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.taskId, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.variableName, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.revision, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.variableType, jdbcType=VARCHAR},
+        (#{historicDetailVariableInstance.id, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.detailType, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.processInstanceId, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.executionId, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.activityInstanceId, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.taskId, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.variableName, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.revision, jdbcType=INTEGER},
+         #{historicDetailVariableInstance.variableType, jdbcType=NVARCHAR},
          #{historicDetailVariableInstance.time, jdbcType=TIMESTAMP},
          #{historicDetailVariableInstance.byteArrayRef, typeHandler=ByteArrayRefTypeHandler},
          #{historicDetailVariableInstance.doubleValue, jdbcType=DOUBLE},
          #{historicDetailVariableInstance.longValue, jdbcType=BIGINT},
-         #{historicDetailVariableInstance.textValue, jdbcType=VARCHAR},
-         #{historicDetailVariableInstance.textValue2, jdbcType=VARCHAR})
+         #{historicDetailVariableInstance.textValue, jdbcType=NVARCHAR},
+         #{historicDetailVariableInstance.textValue2, jdbcType=NVARCHAR})
       </foreach>
   </insert>
   
@@ -116,21 +116,21 @@
       <foreach collection="list" item="historicDetailVariableInstance" index="index">
         INTO ${prefix}ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_,
         NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) VALUES 
-            (#{historicDetailVariableInstance.id, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.detailType, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.processInstanceId, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.executionId, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.activityInstanceId, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.taskId, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.variableName, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.revision, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.variableType, jdbcType=VARCHAR},
+            (#{historicDetailVariableInstance.id, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.detailType, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.processInstanceId, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.executionId, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.activityInstanceId, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.taskId, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.variableName, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.revision, jdbcType=INTEGER},
+             #{historicDetailVariableInstance.variableType, jdbcType=NVARCHAR},
              #{historicDetailVariableInstance.time, jdbcType=TIMESTAMP},
              #{historicDetailVariableInstance.byteArrayRef, typeHandler=ByteArrayRefTypeHandler},
              #{historicDetailVariableInstance.doubleValue, jdbcType=DOUBLE},
              #{historicDetailVariableInstance.longValue, jdbcType=BIGINT},
-             #{historicDetailVariableInstance.textValue, jdbcType=VARCHAR},
-             #{historicDetailVariableInstance.textValue2, jdbcType=VARCHAR})
+             #{historicDetailVariableInstance.textValue, jdbcType=NVARCHAR},
+             #{historicDetailVariableInstance.textValue2, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -138,19 +138,19 @@
   <!-- HISTORIC DETAILS DELETE -->
 
   <delete id="deleteHistoricDetailAssignment">
-    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id}
+    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteHistoricDetailTransitionInstance">
-    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id}
+    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteHistoricDetailVariableInstanceUpdate">
-    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id}
+    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteHistoricFormProperty">
-    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id}
+    delete from ${prefix}ACT_HI_DETAIL where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteBytesForHistoricDetailForProcessInstanceIds" parameterType="java.util.Collection">
@@ -164,8 +164,8 @@
             or
             </if>
             HIDETAIL.PROC_INST_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{processInstanceId, jdbcType=NVARCHAR}
             </foreach>
           </foreach>
       )
@@ -178,8 +178,8 @@
         or
         </if>
         PROC_INST_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -195,8 +195,8 @@
             or
             </if>
             HIDETAIL.TASK_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{taskId, jdbcType=NVARCHAR}
             </foreach>
           </foreach>
       )
@@ -209,8 +209,8 @@
         or
         </if>
         TASK_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{taskId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -253,11 +253,11 @@
 
   <!-- HISTORIC DETAILS RESULTMAP -->
   <resultMap id="historicDetailResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricDetailEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="activityInstanceId" column="ACT_INST_ID_" jdbcType="VARCHAR" />
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="activityInstanceId" column="ACT_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
     <result property="time" column="TIME_" jdbcType="TIMESTAMP" />
     <discriminator javaType="string" column="TYPE_">
       <case value="VariableUpdate" resultMap="historicVariableUpdateResultMap"/> 
@@ -266,32 +266,32 @@
   </resultMap>
   
   <resultMap id="historicVariableUpdateResultMap" extends="historicDetailResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricDetailVariableInstanceUpdateEntityImpl">
-    <result property="name" column="NAME_" javaType="String" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" javaType="String" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR"/>
-    <result property="activityId" column="ACTIVITY_ID_" jdbcType="VARCHAR" />
+    <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR"/>
+    <result property="activityId" column="ACTIVITY_ID_" jdbcType="NVARCHAR" />
     <result property="byteArrayRef" column="BYTEARRAY_ID_" typeHandler="ByteArrayRefTypeHandler" />
     <result property="doubleValue" column="DOUBLE_" jdbcType="DOUBLE" />
-    <result property="textValue" column="TEXT_" jdbcType="VARCHAR" />
-    <result property="textValue2" column="TEXT2_" jdbcType="VARCHAR" />
+    <result property="textValue" column="TEXT_" jdbcType="NVARCHAR" />
+    <result property="textValue2" column="TEXT2_" jdbcType="NVARCHAR" />
     <result property="longValue" column="LONG_" jdbcType="BIGINT" />
   </resultMap>
   
   <resultMap id="historicFormPropertyResultMap" extends="historicDetailResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricFormPropertyEntityImpl">
-    <result property="propertyId" column="NAME_" javaType="String" jdbcType="VARCHAR" />
-    <result property="propertyValue" column="TEXT_" javaType="String" jdbcType="VARCHAR"/>
+    <result property="propertyId" column="NAME_" javaType="String" jdbcType="NVARCHAR" />
+    <result property="propertyValue" column="TEXT_" javaType="String" jdbcType="NVARCHAR"/>
   </resultMap>
 
   <!-- HISTORIC VARIABLE SELECT -->
   
   <select id="selectHistoricDetailByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicDetailResultMap">
     select * from ${prefix}ACT_HI_DETAIL
-    where PROC_INST_ID_ = #{parameter}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricDetailByTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicDetailResultMap">
     select * from ${prefix}ACT_HI_DETAIL
-    where TASK_ID_ = #{parameter}
+    where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectHistoricDetailsByQueryCriteria" parameterType="org.flowable.engine.impl.HistoricDetailQueryImpl" resultMap="historicDetailResultMap">
@@ -311,23 +311,23 @@
     from ${prefix}ACT_HI_DETAIL RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceId != null">
-        RES.PROC_INST_ID_ = #{processInstanceId}
+        RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="executionId != null">
-        RES.EXECUTION_ID_ = #{executionId}
+        RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="activityId != null">
-        and RES.ACT_INST_ID_ = #{activityId}
+        and RES.ACT_INST_ID_ = #{activityId, jdbcType=NVARCHAR}
       </if>
       <if test="activityInstanceId != null">
-        and RES.ACT_INST_ID_ = #{activityInstanceId}
+        and RES.ACT_INST_ID_ = #{activityInstanceId, jdbcType=NVARCHAR}
       </if>
       <choose>
         <when test="taskId != null">
-          and RES.TASK_ID_ = #{taskId}
+          and RES.TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
         </when>
         <otherwise>
           <if test="excludeTaskRelated">
@@ -337,7 +337,7 @@
       </choose>
       
       <if test="type != null">
-        and RES.TYPE_ = #{type}
+        and RES.TYPE_ = #{type, jdbcType=NVARCHAR}
       </if>
     </where>
   </sql>
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
index eb5d14545db..53459c6123c 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
@@ -44,26 +44,26 @@
         PROPAGATED_STAGE_INST_ID_,
         BUSINESS_STATUS_
       ) values (
-        #{id ,jdbcType=VARCHAR},
-        1, #{processInstanceId, jdbcType=VARCHAR},
-        #{businessKey, jdbcType=VARCHAR},
-        #{processDefinitionId, jdbcType=VARCHAR},
+        #{id, jdbcType=NVARCHAR},
+        1, #{processInstanceId, jdbcType=NVARCHAR},
+        #{businessKey, jdbcType=NVARCHAR},
+        #{processDefinitionId, jdbcType=NVARCHAR},
         #{startTime, jdbcType=TIMESTAMP},
         #{endTime, jdbcType=TIMESTAMP},
-        #{durationInMillis ,jdbcType=BIGINT},
-        #{startUserId, jdbcType=VARCHAR},
-        #{startActivityId, jdbcType=VARCHAR},
-        #{endActivityId, jdbcType=VARCHAR},
-        #{superProcessInstanceId, jdbcType=VARCHAR},
-        #{deleteReason, jdbcType=VARCHAR},
-        #{tenantId, jdbcType=VARCHAR},
-        #{name, jdbcType=VARCHAR},
-        #{callbackId, jdbcType=VARCHAR},
-        #{callbackType, jdbcType=VARCHAR},
-        #{referenceId, jdbcType=VARCHAR},
-        #{referenceType, jdbcType=VARCHAR},
-        #{propagatedStageInstanceId, jdbcType=VARCHAR},
-        #{businessStatus, jdbcType=VARCHAR}
+        #{durationInMillis, jdbcType=BIGINT},
+        #{startUserId, jdbcType=NVARCHAR},
+        #{startActivityId, jdbcType=NVARCHAR},
+        #{endActivityId, jdbcType=NVARCHAR},
+        #{superProcessInstanceId, jdbcType=NVARCHAR},
+        #{deleteReason, jdbcType=NVARCHAR},
+        #{tenantId, jdbcType=NVARCHAR},
+        #{name, jdbcType=NVARCHAR},
+        #{callbackId, jdbcType=NVARCHAR},
+        #{callbackType, jdbcType=NVARCHAR},
+        #{referenceId, jdbcType=NVARCHAR},
+        #{referenceType, jdbcType=NVARCHAR},
+        #{propagatedStageInstanceId, jdbcType=NVARCHAR},
+        #{businessStatus, jdbcType=NVARCHAR}
       )
   </insert>
   
@@ -93,26 +93,26 @@
       ) values
         <foreach collection="list" item="historicProcessInstance" index="index" separator=",">
           (
-           #{historicProcessInstance.id ,jdbcType=VARCHAR},
-           1, #{historicProcessInstance.processInstanceId, jdbcType=VARCHAR},
-           #{historicProcessInstance.businessKey, jdbcType=VARCHAR},
-           #{historicProcessInstance.processDefinitionId, jdbcType=VARCHAR},
+           #{historicProcessInstance.id, jdbcType=NVARCHAR},
+           1, #{historicProcessInstance.processInstanceId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.businessKey, jdbcType=NVARCHAR},
+           #{historicProcessInstance.processDefinitionId, jdbcType=NVARCHAR},
            #{historicProcessInstance.startTime, jdbcType=TIMESTAMP},
            #{historicProcessInstance.endTime, jdbcType=TIMESTAMP},
-           #{historicProcessInstance.durationInMillis ,jdbcType=BIGINT},
-           #{historicProcessInstance.startUserId, jdbcType=VARCHAR},
-           #{historicProcessInstance.startActivityId, jdbcType=VARCHAR},
-           #{historicProcessInstance.endActivityId, jdbcType=VARCHAR},
-           #{historicProcessInstance.superProcessInstanceId, jdbcType=VARCHAR},
-           #{historicProcessInstance.deleteReason, jdbcType=VARCHAR},
-           #{historicProcessInstance.tenantId, jdbcType=VARCHAR},
-           #{historicProcessInstance.name, jdbcType=VARCHAR},
-           #{historicProcessInstance.callbackId, jdbcType=VARCHAR},
-           #{historicProcessInstance.callbackType, jdbcType=VARCHAR},
-           #{historicProcessInstance.referenceId, jdbcType=VARCHAR},
-           #{historicProcessInstance.referenceType, jdbcType=VARCHAR},
-           #{historicProcessInstance.propagatedStageInstanceId, jdbcType=VARCHAR},
-           #{historicProcessInstance.businessStatus, jdbcType=VARCHAR}
+           #{historicProcessInstance.durationInMillis, jdbcType=BIGINT},
+           #{historicProcessInstance.startUserId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.startActivityId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.endActivityId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.superProcessInstanceId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.deleteReason, jdbcType=NVARCHAR},
+           #{historicProcessInstance.tenantId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.name, jdbcType=NVARCHAR},
+           #{historicProcessInstance.callbackId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.callbackType, jdbcType=NVARCHAR},
+           #{historicProcessInstance.referenceId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.referenceType, jdbcType=NVARCHAR},
+           #{historicProcessInstance.propagatedStageInstanceId, jdbcType=NVARCHAR},
+           #{historicProcessInstance.businessStatus, jdbcType=NVARCHAR}
           )
          </foreach>
   </insert>
@@ -144,26 +144,26 @@
             BUSINESS_STATUS_
           ) VALUES
               (
-               #{historicProcessInstance.id ,jdbcType=VARCHAR},
-               1, #{historicProcessInstance.processInstanceId, jdbcType=VARCHAR},
-               #{historicProcessInstance.businessKey, jdbcType=VARCHAR},
-               #{historicProcessInstance.processDefinitionId, jdbcType=VARCHAR},
+               #{historicProcessInstance.id, jdbcType=NVARCHAR},
+               1, #{historicProcessInstance.processInstanceId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.businessKey, jdbcType=NVARCHAR},
+               #{historicProcessInstance.processDefinitionId, jdbcType=NVARCHAR},
                #{historicProcessInstance.startTime, jdbcType=TIMESTAMP},
                #{historicProcessInstance.endTime, jdbcType=TIMESTAMP},
-               #{historicProcessInstance.durationInMillis ,jdbcType=BIGINT},
-               #{historicProcessInstance.startUserId, jdbcType=VARCHAR},
-               #{historicProcessInstance.startActivityId, jdbcType=VARCHAR},
-               #{historicProcessInstance.endActivityId, jdbcType=VARCHAR},
-               #{historicProcessInstance.superProcessInstanceId, jdbcType=VARCHAR},
-               #{historicProcessInstance.deleteReason, jdbcType=VARCHAR},
-               #{historicProcessInstance.tenantId, jdbcType=VARCHAR},
-               #{historicProcessInstance.name, jdbcType=VARCHAR},
-               #{historicProcessInstance.callbackId, jdbcType=VARCHAR},
-               #{historicProcessInstance.callbackType, jdbcType=VARCHAR},
-               #{historicProcessInstance.referenceId, jdbcType=VARCHAR},
-               #{historicProcessInstance.referenceType, jdbcType=VARCHAR},
-               #{historicProcessInstance.propagatedStageInstanceId, jdbcType=VARCHAR},
-               #{historicProcessInstance.businessStatus, jdbcType=VARCHAR}
+               #{historicProcessInstance.durationInMillis, jdbcType=BIGINT},
+               #{historicProcessInstance.startUserId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.startActivityId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.endActivityId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.superProcessInstanceId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.deleteReason, jdbcType=NVARCHAR},
+               #{historicProcessInstance.tenantId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.name, jdbcType=NVARCHAR},
+               #{historicProcessInstance.callbackId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.callbackType, jdbcType=NVARCHAR},
+               #{historicProcessInstance.referenceId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.referenceType, jdbcType=NVARCHAR},
+               #{historicProcessInstance.propagatedStageInstanceId, jdbcType=NVARCHAR},
+               #{historicProcessInstance.businessStatus, jdbcType=NVARCHAR}
               )
        </foreach>
     SELECT * FROM dual
@@ -176,10 +176,10 @@
       <set>
         REV_ = #{revisionNext, jdbcType=INTEGER},
         <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-          PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+          PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.businessKey != businessKey">
-          BUSINESS_KEY_ = #{businessKey, jdbcType=VARCHAR},
+          BUSINESS_KEY_ = #{businessKey, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.startTime != startTime">
           START_TIME_ = #{startTime, jdbcType=TIMESTAMP},
@@ -188,50 +188,50 @@
           END_TIME_ = #{endTime, jdbcType=TIMESTAMP},
         </if>
         <if test="originalPersistentState.durationInMillis != durationInMillis">
-          DURATION_ = #{durationInMillis ,jdbcType=BIGINT},
+          DURATION_ = #{durationInMillis, jdbcType=BIGINT},
         </if>
         <if test="originalPersistentState.endActivityId != endActivityId">
-          END_ACT_ID_ = #{endActivityId, jdbcType=VARCHAR},
+          END_ACT_ID_ = #{endActivityId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.deleteReason != deleteReason">
-          DELETE_REASON_ = #{deleteReason, jdbcType=VARCHAR},
+          DELETE_REASON_ = #{deleteReason, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.name != name">
-          NAME_ = #{name, jdbcType=VARCHAR},
+          NAME_ = #{name, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.callbackId != callbackId">
-          CALLBACK_ID_ = #{callbackId, jdbcType=VARCHAR},
+          CALLBACK_ID_ = #{callbackId, jdbcType=NVARCHAR},
         </if> 
         <if test="originalPersistentState.callbackType != callbackType">
-          CALLBACK_TYPE_ = #{callbackType, jdbcType=VARCHAR},
+          CALLBACK_TYPE_ = #{callbackType, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.referenceId != referenceId">
-          REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR},
+          REFERENCE_ID_ = #{referenceId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.referenceType != referenceType">
-          REFERENCE_TYPE_ = #{referenceType, jdbcType=VARCHAR},
+          REFERENCE_TYPE_ = #{referenceType, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.propagatedStageInstanceId != propagatedStageInstanceId">
-          PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=VARCHAR},
+          PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.businessStatus != businessStatus">
-          BUSINESS_STATUS_ = #{businessStatus, jdbcType=VARCHAR},
+          BUSINESS_STATUS_ = #{businessStatus, jdbcType=NVARCHAR},
         </if>
       </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
     and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <!-- HISTORIC PROCESS INSTANCE DELETE -->
   
   <delete id="deleteHistoricProcessInstance">
-    delete from ${prefix}ACT_HI_PROCINST where PROC_INST_ID_ = #{processInstanceId}
+    delete from ${prefix}ACT_HI_PROCINST where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricProcessInstance" parameterType="java.util.Collection">
     delete from ${prefix}ACT_HI_PROCINST where
-     <foreach item="procInst" collection="list" index="index" separator=" or ">
-        ID_ = #{procInst.id, jdbcType=VARCHAR}
+     <foreach item="historicProcessInstance" collection="list" index="index" separator=" or ">
+        ID_ = #{historicProcessInstance.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
   
@@ -242,8 +242,8 @@
         or
         </if>
         ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="listItem" open="(" separator="," close=")">
+          #{id, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -251,74 +251,74 @@
   <!-- HISTORIC PROCESS INSTANCE RESULT MAP -->
   
   <resultMap id="historicProcessInstanceResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="VARCHAR"/>
-    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="VARCHAR"/>
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionName" column="PROC_DEF_NAME_" jdbcType="VARCHAR" /> 
-    <result property="processDefinitionKey" column="PROC_DEF_KEY_" jdbcType="VARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="NVARCHAR"/>
+    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="NVARCHAR"/>
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionName" column="PROC_DEF_NAME_" jdbcType="NVARCHAR" /> 
+    <result property="processDefinitionKey" column="PROC_DEF_KEY_" jdbcType="NVARCHAR" />
     <result property="processDefinitionVersion" column="PROC_DEF_VERSION_" jdbcType="INTEGER" />
-    <result property="processDefinitionCategory" column="PROC_DEF_CATEGORY_" jdbcType="VARCHAR"/>
-    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR" />
+    <result property="processDefinitionCategory" column="PROC_DEF_CATEGORY_" jdbcType="NVARCHAR"/>
+    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
     <result property="endTime" column="END_TIME_" jdbcType="TIMESTAMP" />
     <result property="durationInMillis" column="DURATION_" jdbcType="BIGINT" />
-    <result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR" />
-    <result property="startActivityId" column="START_ACT_ID_" jdbcType="VARCHAR" />
-    <result property="endActivityId" column="END_ACT_ID_" jdbcType="VARCHAR" />
-    <result property="superProcessInstanceId" column="SUPER_PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-    <result property="deleteReason" column="DELETE_REASON_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="callbackId" column="CALLBACK_ID_" jdbcType="VARCHAR" />
-    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="VARCHAR" />
-    <result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR" />
-    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR" />
+    <result property="startUserId" column="START_USER_ID_" jdbcType="NVARCHAR" />
+    <result property="startActivityId" column="START_ACT_ID_" jdbcType="NVARCHAR" />
+    <result property="endActivityId" column="END_ACT_ID_" jdbcType="NVARCHAR" />
+    <result property="superProcessInstanceId" column="SUPER_PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+    <result property="deleteReason" column="DELETE_REASON_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="callbackId" column="CALLBACK_ID_" jdbcType="NVARCHAR" />
+    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="referenceId" column="REFERENCE_ID_" jdbcType="NVARCHAR" />
+    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="NVARCHAR" />
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
   </resultMap>
   
   <resultMap id="historicProcessInstanceAndVariablesResultMap" type="org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="VARCHAR"/>
-    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="VARCHAR"/>
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionName" column="PROC_DEF_NAME_" jdbcType="VARCHAR" /> 
-    <result property="processDefinitionKey" column="PROC_DEF_KEY_" jdbcType="VARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="businessKey" column="BUSINESS_KEY_" jdbcType="NVARCHAR"/>
+    <result property="businessStatus" column="BUSINESS_STATUS_" jdbcType="NVARCHAR"/>
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionName" column="PROC_DEF_NAME_" jdbcType="NVARCHAR" /> 
+    <result property="processDefinitionKey" column="PROC_DEF_KEY_" jdbcType="NVARCHAR" />
     <result property="processDefinitionVersion" column="PROC_DEF_VERSION_" jdbcType="INTEGER" />
-    <result property="processDefinitionCategory" column="PROC_DEF_CATEGORY_" jdbcType="VARCHAR"/>
-    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR" />
+    <result property="processDefinitionCategory" column="PROC_DEF_CATEGORY_" jdbcType="NVARCHAR"/>
+    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="NVARCHAR" />
     <result property="startTime" column="START_TIME_" jdbcType="TIMESTAMP" />
     <result property="endTime" column="END_TIME_" jdbcType="TIMESTAMP" />
     <result property="durationInMillis" column="DURATION_" jdbcType="BIGINT" />
-    <result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR" />
-    <result property="startActivityId" column="START_ACT_ID_" jdbcType="VARCHAR" />
-    <result property="endActivityId" column="END_ACT_ID_" jdbcType="VARCHAR" />
-    <result property="superProcessInstanceId" column="SUPER_PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-    <result property="deleteReason" column="DELETE_REASON_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="callbackId" column="CALLBACK_ID_" jdbcType="VARCHAR" />
-    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="VARCHAR" />
-    <result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR" />
-    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR" />
+    <result property="startUserId" column="START_USER_ID_" jdbcType="NVARCHAR" />
+    <result property="startActivityId" column="START_ACT_ID_" jdbcType="NVARCHAR" />
+    <result property="endActivityId" column="END_ACT_ID_" jdbcType="NVARCHAR" />
+    <result property="superProcessInstanceId" column="SUPER_PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+    <result property="deleteReason" column="DELETE_REASON_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="callbackId" column="CALLBACK_ID_" jdbcType="NVARCHAR" />
+    <result property="callbackType" column="CALLBACK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="referenceId" column="REFERENCE_ID_" jdbcType="NVARCHAR" />
+    <result property="referenceType" column="REFERENCE_TYPE_" jdbcType="NVARCHAR" />
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR" />
     <collection property="queryVariables" column="EXECUTION_ID_" javaType="ArrayList" ofType="org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityImpl">
-      <id property="id" column="VAR_ID_"/>
-      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR" />
-      <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
+      <id property="id" column="VAR_ID_" jdbcType="NVARCHAR"/>
+      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR" />
+      <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
       <result property="revision" column="VAR_REV_" jdbcType="INTEGER" />
-      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR" />
+      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
       <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
       <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE" />
-      <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR" />
-      <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR" />
+      <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR" />
+      <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR" />
       <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT" />
     </collection>
   </resultMap>
@@ -334,13 +334,13 @@
              DEF.DEPLOYMENT_ID_ as DEPLOYMENT_ID_
       from ${prefix}ACT_HI_PROCINST RES
                left outer join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
-      where PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR}
+      where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectHistoricProcessInstanceIdsByProcessDefinitionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
     select ID_
     from ${prefix}ACT_HI_PROCINST 
-    where PROC_DEF_ID_ = #{parameter}
+    where PROC_DEF_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricProcessInstanceIdsBySuperProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicProcessInstanceResultMap">
@@ -352,7 +352,7 @@
              DEF.DEPLOYMENT_ID_ as DEPLOYMENT_ID_
       from ${prefix}ACT_HI_PROCINST RES
                left outer join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
-      where SUPER_PROCESS_INSTANCE_ID_ = #{parameter}
+      where SUPER_PROCESS_INSTANCE_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricProcessInstanceIdsBySuperProcessInstanceIds" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
@@ -362,8 +362,8 @@
             or
         </if>
         SUPER_PROCESS_INSTANCE_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-            #{item}
+        <foreach item="superProcessInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+            #{superProcessInstanceId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </select>
@@ -458,46 +458,46 @@
         <property name="queryTablePrefix" value="RES."/>
       </include>
       <if test="processDefinitionKey != null">
-        and DEF.KEY_ = #{processDefinitionKey}
+        and DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionKeyIn != null &amp;&amp; !processDefinitionKeyIn.empty">
         and DEF.KEY_ IN
-        <foreach item="definition" index="index" collection="processDefinitionKeyIn"
+        <foreach item="processDefinitionKey" index="index" collection="processDefinitionKeyIn"
                  open="(" separator="," close=")">
-          #{definition}
+          #{processDefinitionKey, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="processDefinitionVersion != null">
-        and DEF.VERSION_ = #{processDefinitionVersion}
+        and DEF.VERSION_ = #{processDefinitionVersion, jdbcType=INTEGER}
       </if>
       <if test="processDefinitionCategory != null">
-        and DEF.CATEGORY_ = #{processDefinitionCategory}
+        and DEF.CATEGORY_ = #{processDefinitionCategory, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionName != null">
-        and DEF.NAME_ = #{processDefinitionName}
+        and DEF.NAME_ = #{processDefinitionName, jdbcType=NVARCHAR}
       </if>
       <if test="deploymentId != null">
-        and DEF.DEPLOYMENT_ID_ = #{deploymentId}
+        and DEF.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
       </if>
       <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
         and DEF.DEPLOYMENT_ID_ IN
-        <foreach item="deployment" index="index" collection="deploymentIds" 
+        <foreach item="deploymentId" index="index" collection="deploymentIds"
                  open="(" separator="," close=")">
-          #{deployment}
+          #{deploymentId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="processKeyNotIn != null">
-        <foreach collection="processKeyNotIn" index="index" item="procDefKey">
-            and DEF.KEY_ not like #{procDefKey}${wildcardEscapeClause}
+        <foreach collection="processKeyNotIn" index="index" item="processDefinitionKey">
+            and DEF.KEY_ not like #{processDefinitionKey, jdbcType=NVARCHAR}${wildcardEscapeClause}
         </foreach>
       </if>
       <foreach collection="queryVariableValues" index="index" item="queryVariableValue">
         <choose>
             <when test="queryVariableValue.operator.equals('EXISTS')">
-              and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.PROC_INST_ID_ = PROC_INST_ID_)
+              and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.PROC_INST_ID_ = PROC_INST_ID_)
             </when>
             <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
-              and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.PROC_INST_ID_ = PROC_INST_ID_)
+              and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.PROC_INST_ID_ = PROC_INST_ID_)
             </when>
             <otherwise>
                 and exists (
@@ -513,10 +513,10 @@
                         </if>
                         <if test="queryVariableValue.name != null">
                             <!-- Match-all variable-names when name is null -->
-                            and V.NAME_= #{queryVariableValue.name}
+                            and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                         </if>
                         <if test="queryVariableValue.needsTypeCheck()">
-                            and V.VAR_TYPE_ = #{queryVariableValue.type}
+                            and V.VAR_TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                         </if>
                         <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                             <choose>
@@ -531,7 +531,7 @@
                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                 <otherwise><include refid="executionVariableOperator" /></otherwise>
                             </choose>
-                            #{queryVariableValue.textValue}
+                            #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -546,7 +546,7 @@
                                 <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                 <otherwise><include refid="executionVariableOperator" /></otherwise>
                             </choose>
-                            #{queryVariableValue.textValue2}
+                            #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -554,7 +554,7 @@
                         <if test="queryVariableValue.longValue != null">
                             and (V.LONG_
                             <include refid="executionVariableOperator" />
-                            #{queryVariableValue.longValue}
+                            #{queryVariableValue.longValue, jdbcType=BIGINT}
                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.LONG_ is null
                             </if>
@@ -563,7 +563,7 @@
                         <if test="queryVariableValue.doubleValue != null">
                             and (V.DOUBLE_
                             <include refid="executionVariableOperator" />
-                            #{queryVariableValue.doubleValue}
+                            #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                             <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.DOUBLE_ is null
                             </if>
@@ -592,39 +592,39 @@
             <property name="queryTablePrefix" value="RES."/>
           </include>
           <if test="orQueryObject.processDefinitionKey != null">
-            or DEF.KEY_ = #{orQueryObject.processDefinitionKey}
+            or DEF.KEY_ = #{orQueryObject.processDefinitionKey, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processDefinitionKeyIn != null &amp;&amp; !orQueryObject.processDefinitionKeyIn.empty">
             or DEF.KEY_ IN
-            <foreach item="definition" index="index" collection="orQueryObject.processDefinitionKeyIn"
+            <foreach item="processDefinitionKey" index="index" collection="orQueryObject.processDefinitionKeyIn"
                      open="(" separator="," close=")">
-              #{definition}
+              #{processDefinitionKey, jdbcType=NVARCHAR}
             </foreach>
           </if>
           <if test="orQueryObject.processDefinitionVersion != null">
-            or DEF.VERSION_ = #{orQueryObject.processDefinitionVersion}
+            or DEF.VERSION_ = #{orQueryObject.processDefinitionVersion, jdbcType=INTEGER}
           </if>
           <if test="orQueryObject.processDefinitionCategory != null">
-            or DEF.CATEGORY_ = #{orQueryObject.processDefinitionCategory}
+            or DEF.CATEGORY_ = #{orQueryObject.processDefinitionCategory, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.processDefinitionName != null">
-            or DEF.NAME_ = #{orQueryObject.processDefinitionName}
+            or DEF.NAME_ = #{orQueryObject.processDefinitionName, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.deploymentId != null">
-            or DEF.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId}
+            or DEF.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId, jdbcType=NVARCHAR}
           </if>
           <if test="orQueryObject.deploymentIds != null &amp;&amp; !orQueryObject.deploymentIds.empty">
             or DEF.DEPLOYMENT_ID_ IN
-            <foreach item="deployment" index="index" collection="orQueryObject.deploymentIds" 
+            <foreach item="deploymentId" index="index" collection="orQueryObject.deploymentIds"
                      open="(" separator="," close=")">
-              #{deployment}
+              #{deploymentId, jdbcType=NVARCHAR}
             </foreach>
           </if>
           <if test="orQueryObject.processKeyNotIn != null">
             or
             <trim prefix="(" prefixOverrides="AND" suffix=")">
-              <foreach collection="orQueryObject.processKeyNotIn" index="index" item="procDefKey">
-                and DEF.KEY_ not like #{procDefKey}${wildcardEscapeClause}
+              <foreach collection="orQueryObject.processKeyNotIn" index="index" item="processDefinitionKey">
+                and DEF.KEY_ not like #{processDefinitionKey, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </foreach>
             </trim>
           </if>
@@ -633,10 +633,10 @@
             <trim prefix="(" prefixOverrides="AND" suffix=")">
               <choose>
                 <when test="queryVariableValue.operator.equals('EXISTS')">
-                    and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.PROC_INST_ID_ = PROC_INST_ID_)
+                    and EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.PROC_INST_ID_ = PROC_INST_ID_)
                 </when>
                 <when test="queryVariableValue.operator.equals('NOT_EXISTS')">
-                    and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name} and RES.PROC_INST_ID_ = PROC_INST_ID_)
+                    and NOT EXISTS (select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVariableValue.name, jdbcType=NVARCHAR} and RES.PROC_INST_ID_ = PROC_INST_ID_)
                 </when>
                 <otherwise>
                     and exists (
@@ -652,10 +652,10 @@
                             </if>
                             <if test="queryVariableValue.name != null">
                                 <!-- Match-all variable-names when name is null -->
-                                and V.NAME_= #{queryVariableValue.name}
+                                and V.NAME_= #{queryVariableValue.name, jdbcType=NVARCHAR}
                             </if>
                             <if test="queryVariableValue.needsTypeCheck()">
-                                and V.VAR_TYPE_ = #{queryVariableValue.type}
+                                and V.VAR_TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                             </if>
                             <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                                 <choose>
@@ -670,7 +670,7 @@
                                     <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                     <otherwise><include refid="executionVariableOperator" /></otherwise>
                                 </choose>
-                                #{queryVariableValue.textValue}
+                                #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                                 <choose>
                                     <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                                 </choose>
@@ -685,7 +685,7 @@
                                     <when test="queryVariableValue.operator.equals('LIKE')">LIKE</when>
                                     <otherwise><include refid="executionVariableOperator" /></otherwise>
                                 </choose>
-                                #{queryVariableValue.textValue2}
+                                #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                                 <choose>
                                     <when test="queryVariableValue.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                 </choose>
@@ -693,7 +693,7 @@
                             <if test="queryVariableValue.longValue != null">
                                 and (V.LONG_
                                 <include refid="executionVariableOperator" />
-                                #{queryVariableValue.longValue}
+                                #{queryVariableValue.longValue, jdbcType=BIGINT}
                                 <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                     or V.LONG_ is null
                                 </if>
@@ -702,7 +702,7 @@
                             <if test="queryVariableValue.doubleValue != null">
                                 and (V.DOUBLE_
                                 <include refid="executionVariableOperator" />
-                                #{queryVariableValue.doubleValue}
+                                #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                                 <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                     or V.DOUBLE_ is null
                                 </if>
@@ -742,40 +742,40 @@
   
   <sql id="commonInstanceQuerySql">
     <if test="processInstanceId != null">
-        ${queryTablePrefix}PROC_INST_ID_ = #{processInstanceId}
+        ${queryTablePrefix}PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceIds != null and !processInstanceIds.empty">
         and ${queryTablePrefix}PROC_INST_ID_ in
-        <foreach item="item" index="index" collection="processInstanceIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="processInstanceIds" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="processDefinitionId != null">
-        and ${queryTablePrefix}PROC_DEF_ID_ = #{processDefinitionId}
+        and ${queryTablePrefix}PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="businessKey != null">
-        and ${queryTablePrefix}BUSINESS_KEY_ = #{businessKey}
+        and ${queryTablePrefix}BUSINESS_KEY_ = #{businessKey, jdbcType=NVARCHAR}
       </if>
       <if test="businessKeyLike != null">
-        and ${queryTablePrefix}BUSINESS_KEY_ like #{businessKeyLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}BUSINESS_KEY_ like #{businessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="businessStatus != null">
-        and ${queryTablePrefix}BUSINESS_STATUS_ = #{businessStatus}
+        and ${queryTablePrefix}BUSINESS_STATUS_ = #{businessStatus, jdbcType=NVARCHAR}
       </if>
       <if test="businessStatusLike != null">
-        and ${queryTablePrefix}BUSINESS_STATUS_ like #{businessStatusLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}BUSINESS_STATUS_ like #{businessStatusLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="startedBefore != null">
-        and ${queryTablePrefix}START_TIME_ &lt;= #{startedBefore}
+        and ${queryTablePrefix}START_TIME_ &lt;= #{startedBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="startedAfter != null">
-        and ${queryTablePrefix}START_TIME_ &gt;= #{startedAfter}
+        and ${queryTablePrefix}START_TIME_ &gt;= #{startedAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="finishedBefore != null">
-        and ${queryTablePrefix}END_TIME_ &lt;= #{finishedBefore}
+        and ${queryTablePrefix}END_TIME_ &lt;= #{finishedBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="finishedAfter != null">
-        and ${queryTablePrefix}END_TIME_ &gt;= #{finishedAfter}
+        and ${queryTablePrefix}END_TIME_ &gt;= #{finishedAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="unfinished">
         and ${queryTablePrefix}END_TIME_ IS NULL
@@ -790,21 +790,21 @@
         and ${queryTablePrefix}DELETE_REASON_ IS NOT NULL
       </if>
       <if test="activeActivityId != null">
-        and EXISTS(select ID_ from ${prefix}ACT_HI_ACTINST A where A.PROC_INST_ID_ = ${queryTablePrefix}ID_ and A.ACT_ID_ = #{activeActivityId} and A.END_TIME_ is null)
+        and EXISTS(select ID_ from ${prefix}ACT_HI_ACTINST A where A.PROC_INST_ID_ = ${queryTablePrefix}ID_ and A.ACT_ID_ = #{activeActivityId, jdbcType=NVARCHAR} and A.END_TIME_ is null)
       </if>
       <if test="activeActivityIds != null">
         and EXISTS(select ID_ from ${prefix}ACT_HI_ACTINST A where A.PROC_INST_ID_ = ${queryTablePrefix}ID_ and A.ACT_ID_ in 
         <foreach item="activeActivityId" index="index" collection="activeActivityIds" open="(" separator="," close=")">
-            #{activeActivityId}
+            #{activeActivityId, jdbcType=NVARCHAR}
         </foreach>
         and A.END_TIME_ is null)
       </if>
       <if test="involvedUser != null">
-        and (exists(select LINK.USER_ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where USER_ID_ = #{involvedUser} and LINK.PROC_INST_ID_ = ${queryTablePrefix}ID_))
+        and (exists(select LINK.USER_ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where USER_ID_ = #{involvedUser, jdbcType=NVARCHAR} and LINK.PROC_INST_ID_ = ${queryTablePrefix}ID_))
       </if>
       <if test="involvedUserIdentityLink != null">
           and EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.PROC_INST_ID_ = ${queryTablePrefix}ID_ and 
-          I.USER_ID_ = #{involvedUserIdentityLink.userId} and I.TYPE_ = #{involvedUserIdentityLink.type})
+          I.USER_ID_ = #{involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedUserIdentityLink.type, jdbcType=NVARCHAR})
       </if>
       <if test="involvedGroups != null">
           and EXISTS(
@@ -817,7 +817,7 @@
                 LINK.GROUP_ID_ IN
                 <foreach item="group" index="index" collection="involvedGroupListItem"
                       open="(" separator="," close=")">
-                  #{group}
+                  #{group, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
             )
@@ -825,53 +825,53 @@
       </if>
       <if test="involvedGroupIdentityLink != null">
           and EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.PROC_INST_ID_ = ${queryTablePrefix}ID_ and 
-          I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId} and I.TYPE_ = #{involvedGroupIdentityLink.type})
+          I.GROUP_ID_ = #{involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
       </if>
       <if test="startedBy != null">
-      	and ${queryTablePrefix}START_USER_ID_ = #{startedBy}
+      	and ${queryTablePrefix}START_USER_ID_ = #{startedBy, jdbcType=NVARCHAR}
       </if>
       <if test="superProcessInstanceId != null">
-        and ${queryTablePrefix}SUPER_PROCESS_INSTANCE_ID_ = #{superProcessInstanceId}
+        and ${queryTablePrefix}SUPER_PROCESS_INSTANCE_ID_ = #{superProcessInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="excludeSubprocesses">
         and ${queryTablePrefix}SUPER_PROCESS_INSTANCE_ID_ is null
       </if>
       <if test="callbackId != null">
-        and ${queryTablePrefix}CALLBACK_ID_ = #{callbackId}
+        and ${queryTablePrefix}CALLBACK_ID_ = #{callbackId, jdbcType=NVARCHAR}
       </if>
       <if test="callbackType != null">
-        and ${queryTablePrefix}CALLBACK_TYPE_ = #{callbackType}
+        and ${queryTablePrefix}CALLBACK_TYPE_ = #{callbackType, jdbcType=NVARCHAR}
       </if>
       <if test="withoutCallbackId">
         and ${queryTablePrefix}CALLBACK_ID_ is null
       </if>
       <if test="referenceId != null">
-          and ${queryTablePrefix}REFERENCE_ID_ = #{referenceId}
+          and ${queryTablePrefix}REFERENCE_ID_ = #{referenceId, jdbcType=NVARCHAR}
       </if>
       <if test="referenceType != null">
-          and ${queryTablePrefix}REFERENCE_TYPE_ = #{referenceType}
+          and ${queryTablePrefix}REFERENCE_TYPE_ = #{referenceType, jdbcType=NVARCHAR}
       </if>
       <if test="tenantId != null">
-        and ${queryTablePrefix}TENANT_ID_ = #{tenantId}
+        and ${queryTablePrefix}TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and ${queryTablePrefix}TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (${queryTablePrefix}TENANT_ID_ = '' or ${queryTablePrefix}TENANT_ID_ is null)
       </if>
       <if test="name != null">
-        and ${queryTablePrefix}NAME_ = #{name}
+        and ${queryTablePrefix}NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and ${queryTablePrefix}NAME_ like #{nameLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="nameLikeIgnoreCase != null">
-          and lower(${queryTablePrefix}NAME_) like lower(#{nameLikeIgnoreCase})${wildcardEscapeClause}
+          and lower(${queryTablePrefix}NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
       </if>
       <if test="parentScopeId != null">
           and EXISTS(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
-            LINK.SCOPE_ID_ = #{parentScopeId}
+            LINK.SCOPE_ID_ = #{parentScopeId, jdbcType=NVARCHAR}
             and LINK.REF_SCOPE_ID_ = RES.ID_
             and LINK.HIERARCHY_TYPE_ = 'parent'
           )
@@ -879,47 +879,47 @@
       <if test="rootScopeId != null">
           and exists(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
           LINK.REF_SCOPE_ID_ = RES.ID_
-          and LINK.ROOT_SCOPE_ID_ = #{rootScopeId}
+          and LINK.ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR}
           )
       </if>
   </sql>
   
   <sql id="commonInstanceOrQuerySql">
       <if test="orQueryObject.processInstanceId != null">
-        ${queryTablePrefix}PROC_INST_ID_ = #{orQueryObject.processInstanceId}
+        ${queryTablePrefix}PROC_INST_ID_ = #{orQueryObject.processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.processInstanceIds != null and !orQueryObject.processInstanceIds.empty">
         or ${queryTablePrefix}PROC_INST_ID_ in
-        <foreach item="item" index="index" collection="orQueryObject.processInstanceIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="orQueryObject.processInstanceIds" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="orQueryObject.processDefinitionId != null">
-        or ${queryTablePrefix}PROC_DEF_ID_ = #{orQueryObject.processDefinitionId}
+        or ${queryTablePrefix}PROC_DEF_ID_ = #{orQueryObject.processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.businessKey != null">
-        or ${queryTablePrefix}BUSINESS_KEY_ = #{orQueryObject.businessKey}
+        or ${queryTablePrefix}BUSINESS_KEY_ = #{orQueryObject.businessKey, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.businessKeyLike != null">
-        or ${queryTablePrefix}BUSINESS_KEY_ like #{orQueryObject.businessKeyLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}BUSINESS_KEY_ like #{orQueryObject.businessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.businessStatus != null">
-        or ${queryTablePrefix}BUSINESS_STATUS_ = #{orQueryObject.businessStatus}
+        or ${queryTablePrefix}BUSINESS_STATUS_ = #{orQueryObject.businessStatus, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.businessStatusLike != null">
-        or ${queryTablePrefix}BUSINESS_STATUS_ like #{orQueryObject.businessStatusLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}BUSINESS_STATUS_ like #{orQueryObject.businessStatusLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.startedBefore != null">
-        or ${queryTablePrefix}START_TIME_ &lt;= #{orQueryObject.startedBefore}
+        or ${queryTablePrefix}START_TIME_ &lt;= #{orQueryObject.startedBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.startedAfter != null">
-        or ${queryTablePrefix}START_TIME_ &gt;= #{orQueryObject.startedAfter}
+        or ${queryTablePrefix}START_TIME_ &gt;= #{orQueryObject.startedAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.finishedBefore != null">
-        or (${queryTablePrefix}END_TIME_ is not NULL and ${queryTablePrefix}END_TIME_ &lt;= #{orQueryObject.finishedBefore})
+        or (${queryTablePrefix}END_TIME_ is not NULL and ${queryTablePrefix}END_TIME_ &lt;= #{orQueryObject.finishedBefore, jdbcType=TIMESTAMP})
       </if>
       <if test="orQueryObject.finishedAfter != null">
-        or (${queryTablePrefix}END_TIME_ is not NULL and ${queryTablePrefix}END_TIME_ &gt;= #{orQueryObject.finishedAfter})
+        or (${queryTablePrefix}END_TIME_ is not NULL and ${queryTablePrefix}END_TIME_ &gt;= #{orQueryObject.finishedAfter, jdbcType=TIMESTAMP})
       </if>
       <if test="orQueryObject.unfinished">
         or ${queryTablePrefix}END_TIME_ IS NULL
@@ -934,21 +934,21 @@
         or ${queryTablePrefix}DELETE_REASON_ IS NOT NULL
       </if>
       <if test="activeActivityId != null">
-        or EXISTS(select ID_ from ${prefix}ACT_HI_ACTINST A where A.PROC_INST_ID_ = ${queryTablePrefix}ID_ and A.ACT_ID_ = #{activeActivityId} and A.END_TIME_ is null)
+        or EXISTS(select ID_ from ${prefix}ACT_HI_ACTINST A where A.PROC_INST_ID_ = ${queryTablePrefix}ID_ and A.ACT_ID_ = #{activeActivityId, jdbcType=NVARCHAR} and A.END_TIME_ is null)
       </if>
       <if test="activeActivityIds != null">
         or EXISTS(select ID_ from ${prefix}ACT_HI_ACTINST A where A.PROC_INST_ID_ = ${queryTablePrefix}ID_ and A.ACT_ID_ in 
         <foreach item="activeActivityId" index="index" collection="activeActivityIds" open="(" separator="," close=")">
-            #{activeActivityId}
+            #{activeActivityId, jdbcType=NVARCHAR}
         </foreach>
         and A.END_TIME_ is null)
       </if>
       <if test="orQueryObject.involvedUser != null">
-        or (exists(select LINK.USER_ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where USER_ID_ = #{orQueryObject.involvedUser} and LINK.PROC_INST_ID_ = ${queryTablePrefix}ID_))
+        or (exists(select LINK.USER_ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where USER_ID_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR} and LINK.PROC_INST_ID_ = ${queryTablePrefix}ID_))
       </if>
       <if test="orQueryObject.involvedUserIdentityLink != null">
           or EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.PROC_INST_ID_ = ${queryTablePrefix}ID_ and 
-          I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type})
+          I.USER_ID_ = #{orQueryObject.involvedUserIdentityLink.userId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedUserIdentityLink.type, jdbcType=NVARCHAR})
       </if>
       <if test="orQueryObject.involvedGroups != null">
         or EXISTS(
@@ -961,7 +961,7 @@
                     LINK.GROUP_ID_ IN
                     <foreach item="group" index="index" collection="involvedGroupListItem"
                           open="(" separator="," close=")">
-                      #{group}
+                      #{group, jdbcType=NVARCHAR}
                     </foreach>
                 </foreach>
                 )
@@ -969,53 +969,53 @@
       </if>
       <if test="orQueryObject.involvedGroupIdentityLink != null">
           or EXISTS(select ID_ from ${prefix}ACT_HI_IDENTITYLINK I where I.PROC_INST_ID_ = ${queryTablePrefix}ID_ and 
-          I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type})
+          I.GROUP_ID_ = #{orQueryObject.involvedGroupIdentityLink.groupId, jdbcType=NVARCHAR} and I.TYPE_ = #{orQueryObject.involvedGroupIdentityLink.type, jdbcType=NVARCHAR})
       </if>
       <if test="orQueryObject.startedBy != null">
-        or ${queryTablePrefix}START_USER_ID_ = #{orQueryObject.startedBy}
+        or ${queryTablePrefix}START_USER_ID_ = #{orQueryObject.startedBy, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.superProcessInstanceId != null">
-        or ${queryTablePrefix}SUPER_PROCESS_INSTANCE_ID_ = #{orQueryObject.superProcessInstanceId}
+        or ${queryTablePrefix}SUPER_PROCESS_INSTANCE_ID_ = #{orQueryObject.superProcessInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.excludeSubprocesses">
         or ${queryTablePrefix}SUPER_PROCESS_INSTANCE_ID_ is null
       </if>
       <if test="orQueryObject.callbackId != null">
-        or ${queryTablePrefix}CALLBACK_ID_ = #{orQueryObject.callbackId}
+        or ${queryTablePrefix}CALLBACK_ID_ = #{orQueryObject.callbackId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.callbackType != null">
-        or ${queryTablePrefix}CALLBACK_TYPE_ = #{orQueryObject.callbackType}
+        or ${queryTablePrefix}CALLBACK_TYPE_ = #{orQueryObject.callbackType, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.withoutCallbackId">
           or ${queryTablePrefix}CALLBACK_ID_ is null
       </if>
       <if test="orQueryObject.referenceId != null">
-          or ${queryTablePrefix}REFERENCE_ID_ = #{orQueryObject.referenceId}
+          or ${queryTablePrefix}REFERENCE_ID_ = #{orQueryObject.referenceId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.referenceType != null">
-          or ${queryTablePrefix}REFERENCE_TYPE_ = #{orQueryObject.referenceType}
+          or ${queryTablePrefix}REFERENCE_TYPE_ = #{orQueryObject.referenceType, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.tenantId != null">
-        or ${queryTablePrefix}TENANT_ID_ = #{orQueryObject.tenantId}
+        or ${queryTablePrefix}TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.tenantIdLike != null">
-        or ${queryTablePrefix}TENANT_ID_ like #{orQueryObject.tenantIdLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}TENANT_ID_ like #{orQueryObject.tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.withoutTenantId">
         or (${queryTablePrefix}TENANT_ID_ = '' or ${queryTablePrefix}TENANT_ID_ is null)
       </if>
       <if test="orQueryObject.name != null">
-        or ${queryTablePrefix}NAME_ = #{orQueryObject.name}
+        or ${queryTablePrefix}NAME_ = #{orQueryObject.name, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.nameLike != null">
-        or ${queryTablePrefix}NAME_ like #{orQueryObject.nameLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}NAME_ like #{orQueryObject.nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.nameLikeIgnoreCase != null">
-        or lower(${queryTablePrefix}NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase})${wildcardEscapeClause}
+        or lower(${queryTablePrefix}NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.parentScopeId != null">
           or EXISTS(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
-          LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId}
+          LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId, jdbcType=NVARCHAR}
           and LINK.REF_SCOPE_ID_ = RES.ID_
           and LINK.HIERARCHY_TYPE_ = 'parent'
           )
@@ -1023,7 +1023,7 @@
       <if test="orQueryObject.rootScopeId != null">
           or exists(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
             LINK.REF_SCOPE_ID_ = RES.ID_
-            and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId}
+            and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId, jdbcType=NVARCHAR}
           )
       </if>
   </sql>
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Model.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Model.xml
index b959804ee71..2b780d756ef 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Model.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Model.xml
@@ -8,36 +8,36 @@
   
   <insert id="insertModel" parameterType="org.flowable.engine.impl.persistence.entity.ModelEntityImpl">
     insert into ${prefix}ACT_RE_MODEL(ID_, REV_, NAME_, KEY_, CATEGORY_, CREATE_TIME_, LAST_UPDATE_TIME_, VERSION_, META_INFO_, DEPLOYMENT_ID_, EDITOR_SOURCE_VALUE_ID_, EDITOR_SOURCE_EXTRA_VALUE_ID_, TENANT_ID_)
-    values(#{id, jdbcType=VARCHAR}, 
-           1, #{name, jdbcType=VARCHAR},
-           #{key, jdbcType=VARCHAR}, 
-           #{category, jdbcType=VARCHAR}, 
+    values(#{id, jdbcType=NVARCHAR}, 
+           1, #{name, jdbcType=NVARCHAR},
+           #{key, jdbcType=NVARCHAR}, 
+           #{category, jdbcType=NVARCHAR}, 
            #{createTime, jdbcType=TIMESTAMP},
            #{lastUpdateTime, jdbcType=TIMESTAMP},
            #{version, jdbcType=INTEGER}, 
-           #{metaInfo, jdbcType=VARCHAR}, 
-           #{deploymentId, jdbcType=VARCHAR},
-           #{editorSourceValueId, jdbcType=VARCHAR}, 
-           #{editorSourceExtraValueId, jdbcType=VARCHAR},
-           #{tenantId, jdbcType=VARCHAR})
+           #{metaInfo, jdbcType=NVARCHAR}, 
+           #{deploymentId, jdbcType=NVARCHAR},
+           #{editorSourceValueId, jdbcType=NVARCHAR}, 
+           #{editorSourceExtraValueId, jdbcType=NVARCHAR},
+           #{tenantId, jdbcType=NVARCHAR})
   </insert>
 
   <insert id="bulkInsertModel" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_RE_MODEL(ID_, REV_, NAME_, KEY_, CATEGORY_, CREATE_TIME_, LAST_UPDATE_TIME_, VERSION_, META_INFO_, DEPLOYMENT_ID_, EDITOR_SOURCE_VALUE_ID_, EDITOR_SOURCE_EXTRA_VALUE_ID_, TENANT_ID_)
     VALUES 
       <foreach collection="list" item="model" index="index" separator=","> 
-        (#{model.id, jdbcType=VARCHAR}, 
-         1, #{model.name, jdbcType=VARCHAR},
-         #{model.key, jdbcType=VARCHAR}, 
-         #{model.category, jdbcType=VARCHAR}, 
+        (#{model.id, jdbcType=NVARCHAR}, 
+         1, #{model.name, jdbcType=NVARCHAR},
+         #{model.key, jdbcType=NVARCHAR}, 
+         #{model.category, jdbcType=NVARCHAR}, 
          #{model.createTime, jdbcType=TIMESTAMP},
          #{model.lastUpdateTime, jdbcType=TIMESTAMP},
          #{model.version, jdbcType=INTEGER}, 
-         #{model.metaInfo, jdbcType=VARCHAR}, 
-         #{model.deploymentId, jdbcType=VARCHAR},
-         #{model.editorSourceValueId, jdbcType=VARCHAR}, 
-         #{model.editorSourceExtraValueId, jdbcType=VARCHAR},
-         #{model.tenantId, jdbcType=VARCHAR})
+         #{model.metaInfo, jdbcType=NVARCHAR}, 
+         #{model.deploymentId, jdbcType=NVARCHAR},
+         #{model.editorSourceValueId, jdbcType=NVARCHAR}, 
+         #{model.editorSourceExtraValueId, jdbcType=NVARCHAR},
+         #{model.tenantId, jdbcType=NVARCHAR})
      </foreach>
   </insert>
 
@@ -46,18 +46,18 @@
       <foreach collection="list" item="model" index="index"> 
         INTO ${prefix}ACT_RE_MODEL(ID_, REV_, NAME_, KEY_, CATEGORY_, CREATE_TIME_, LAST_UPDATE_TIME_,
         VERSION_, META_INFO_, DEPLOYMENT_ID_, EDITOR_SOURCE_VALUE_ID_, EDITOR_SOURCE_EXTRA_VALUE_ID_, TENANT_ID_) VALUES 
-          (#{model.id, jdbcType=VARCHAR}, 
-           1, #{model.name, jdbcType=VARCHAR},
-           #{model.key, jdbcType=VARCHAR}, 
-           #{model.category, jdbcType=VARCHAR}, 
+          (#{model.id, jdbcType=NVARCHAR}, 
+           1, #{model.name, jdbcType=NVARCHAR},
+           #{model.key, jdbcType=NVARCHAR}, 
+           #{model.category, jdbcType=NVARCHAR}, 
            #{model.createTime, jdbcType=TIMESTAMP},
            #{model.lastUpdateTime, jdbcType=TIMESTAMP},
            #{model.version, jdbcType=INTEGER}, 
-           #{model.metaInfo, jdbcType=VARCHAR}, 
-           #{model.deploymentId, jdbcType=VARCHAR},
-           #{model.editorSourceValueId, jdbcType=VARCHAR}, 
-           #{model.editorSourceExtraValueId, jdbcType=VARCHAR},
-           #{model.tenantId, jdbcType=VARCHAR})
+           #{model.metaInfo, jdbcType=NVARCHAR}, 
+           #{model.deploymentId, jdbcType=NVARCHAR},
+           #{model.editorSourceValueId, jdbcType=NVARCHAR}, 
+           #{model.editorSourceExtraValueId, jdbcType=NVARCHAR},
+           #{model.tenantId, jdbcType=NVARCHAR})
      </foreach>
     SELECT * FROM dual
   </insert>
@@ -68,62 +68,62 @@
       <set>
           REV_ = #{revisionNext, jdbcType=INTEGER},
           <if test="originalPersistentState.name != name">
-              NAME_ = #{name, jdbcType=VARCHAR},
+              NAME_ = #{name, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.key != key">
-              KEY_ = #{key, jdbcType=VARCHAR},
+              KEY_ = #{key, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.category != category">
-              CATEGORY_ = #{category, jdbcType=VARCHAR},
+              CATEGORY_ = #{category, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.lastUpdateTime != lastUpdateTime">
-              LAST_UPDATE_TIME_ = #{lastUpdateTime, jdbcType=VARCHAR},
+              LAST_UPDATE_TIME_ = #{lastUpdateTime, jdbcType=TIMESTAMP},
           </if>
           <if test="originalPersistentState.version != version">
               VERSION_ = #{version, jdbcType=INTEGER},
           </if>
           <if test="originalPersistentState.metaInfo != metaInfo">
-              META_INFO_ = #{metaInfo, jdbcType=VARCHAR},
+              META_INFO_ = #{metaInfo, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.deploymentId != deploymentId">
-              DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR},
+              DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.editorSourceValueId != editorSourceValueId">
-              EDITOR_SOURCE_VALUE_ID_ = #{editorSourceValueId, jdbcType=VARCHAR},
+              EDITOR_SOURCE_VALUE_ID_ = #{editorSourceValueId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.editorSourceExtraValueId != editorSourceExtraValueId">
-              EDITOR_SOURCE_EXTRA_VALUE_ID_ = #{editorSourceExtraValueId, jdbcType=VARCHAR},
+              EDITOR_SOURCE_EXTRA_VALUE_ID_ = #{editorSourceExtraValueId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.tenantId != tenantId">
-              TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
+              TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
           </if>
       </set>
-    where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
+    where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   
   <!-- MODEL DELETE -->
   
   <delete id="deleteModel" parameterType="org.flowable.engine.impl.persistence.entity.ModelEntityImpl">
-    delete from ${prefix}ACT_RE_MODEL where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RE_MODEL where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <!-- MODEL RESULTMAP -->
   
   <resultMap id="modelResultMap" type="org.flowable.engine.impl.persistence.entity.ModelEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="key" column="KEY_" jdbcType="VARCHAR" />
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="key" column="KEY_" jdbcType="NVARCHAR" />
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
     <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
     <result property="lastUpdateTime" column="LAST_UPDATE_TIME_" jdbcType="TIMESTAMP"/>
     <result property="version" column="VERSION_" jdbcType="INTEGER" />
-    <result property="metaInfo" column="META_INFO_" jdbcType="VARCHAR" />
-    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR" />
-    <result property="editorSourceValueId" column="EDITOR_SOURCE_VALUE_ID_" jdbcType="VARCHAR" />
-    <result property="editorSourceExtraValueId" column="EDITOR_SOURCE_EXTRA_VALUE_ID_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <result property="metaInfo" column="META_INFO_" jdbcType="NVARCHAR" />
+    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="NVARCHAR" />
+    <result property="editorSourceValueId" column="EDITOR_SOURCE_VALUE_ID_" jdbcType="NVARCHAR" />
+    <result property="editorSourceExtraValueId" column="EDITOR_SOURCE_EXTRA_VALUE_ID_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- MODEL SELECT -->
@@ -145,31 +145,31 @@
     from ${prefix}ACT_RE_MODEL RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=NVARCHAR}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=NVARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
       </if>
       <if test="notDeployed">
         and RES.DEPLOYMENT_ID_ is null
@@ -181,10 +181,10 @@
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}ACT_RE_MODEL where KEY_ = RES.KEY_)
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -193,7 +193,7 @@
   </sql>
   
   <select id="selectModel" parameterType="string" resultMap="modelResultMap">
-    select * from ${prefix}ACT_RE_MODEL where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RE_MODEL where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectModelByNativeQuery" parameterType="java.util.Map" resultMap="modelResultMap">
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinition.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinition.xml
index a0ae99a32fb..2d1867bf1bf 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinition.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinition.xml
@@ -8,46 +8,46 @@
 
   <insert id="insertProcessDefinition" parameterType="org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityImpl">
     insert into ${prefix}ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, DESCRIPTION_, HAS_START_FORM_KEY_, HAS_GRAPHICAL_NOTATION_ , SUSPENSION_STATE_, DERIVED_FROM_, DERIVED_FROM_ROOT_, DERIVED_VERSION_, TENANT_ID_, ENGINE_VERSION_)
-    values (#{id, jdbcType=VARCHAR},
-    		1, #{category, jdbcType=VARCHAR},
-            #{name, jdbcType=VARCHAR},
-            #{key, jdbcType=VARCHAR}, 
+    values (#{id, jdbcType=NVARCHAR},
+    		1, #{category, jdbcType=NVARCHAR},
+            #{name, jdbcType=NVARCHAR},
+            #{key, jdbcType=NVARCHAR}, 
             #{version, jdbcType=INTEGER},
-            #{deploymentId, jdbcType=VARCHAR},
-            #{resourceName, jdbcType=VARCHAR},
-            #{diagramResourceName, jdbcType=VARCHAR},
-            #{description, jdbcType=VARCHAR},
+            #{deploymentId, jdbcType=NVARCHAR},
+            #{resourceName, jdbcType=NVARCHAR},
+            #{diagramResourceName, jdbcType=NVARCHAR},
+            #{description, jdbcType=NVARCHAR},
             #{hasStartFormKey, jdbcType=BOOLEAN},
             #{isGraphicalNotationDefined, jdbcType=BOOLEAN},
             #{suspensionState, jdbcType=INTEGER},
-            #{derivedFrom, jdbcType=VARCHAR},
-            #{derivedFromRoot, jdbcType=VARCHAR},
+            #{derivedFrom, jdbcType=NVARCHAR},
+            #{derivedFromRoot, jdbcType=NVARCHAR},
             #{derivedVersion, jdbcType=INTEGER},
-            #{tenantId, jdbcType=VARCHAR},
-            #{engineVersion, jdbcType=VARCHAR})
+            #{tenantId, jdbcType=NVARCHAR},
+            #{engineVersion, jdbcType=NVARCHAR})
   </insert>
 
   <insert id="bulkInsertProcessDefinition" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, DESCRIPTION_, HAS_START_FORM_KEY_, HAS_GRAPHICAL_NOTATION_ , SUSPENSION_STATE_, DERIVED_FROM_, DERIVED_FROM_ROOT_, DERIVED_VERSION_, TENANT_ID_, ENGINE_VERSION_)
     VALUES 
       <foreach collection="list" item="processDefinition" index="index" separator=","> 
-        (#{processDefinition.id, jdbcType=VARCHAR},
-         1, #{processDefinition.category, jdbcType=VARCHAR},
-         #{processDefinition.name, jdbcType=VARCHAR},
-         #{processDefinition.key, jdbcType=VARCHAR}, 
+        (#{processDefinition.id, jdbcType=NVARCHAR},
+         1, #{processDefinition.category, jdbcType=NVARCHAR},
+         #{processDefinition.name, jdbcType=NVARCHAR},
+         #{processDefinition.key, jdbcType=NVARCHAR}, 
          #{processDefinition.version, jdbcType=INTEGER},
-         #{processDefinition.deploymentId, jdbcType=VARCHAR},
-         #{processDefinition.resourceName, jdbcType=VARCHAR},
-         #{processDefinition.diagramResourceName, jdbcType=VARCHAR},
-         #{processDefinition.description, jdbcType=VARCHAR},
+         #{processDefinition.deploymentId, jdbcType=NVARCHAR},
+         #{processDefinition.resourceName, jdbcType=NVARCHAR},
+         #{processDefinition.diagramResourceName, jdbcType=NVARCHAR},
+         #{processDefinition.description, jdbcType=NVARCHAR},
          #{processDefinition.hasStartFormKey, jdbcType=BOOLEAN},
          #{processDefinition.isGraphicalNotationDefined, jdbcType=BOOLEAN},
          #{processDefinition.suspensionState, jdbcType=INTEGER},
-         #{processDefinition.derivedFrom, jdbcType=VARCHAR},
-         #{processDefinition.derivedFromRoot, jdbcType=VARCHAR},
+         #{processDefinition.derivedFrom, jdbcType=NVARCHAR},
+         #{processDefinition.derivedFromRoot, jdbcType=NVARCHAR},
          #{processDefinition.derivedVersion, jdbcType=INTEGER},
-         #{processDefinition.tenantId, jdbcType=VARCHAR},
-         #{processDefinition.engineVersion, jdbcType=VARCHAR})
+         #{processDefinition.tenantId, jdbcType=NVARCHAR},
+         #{processDefinition.engineVersion, jdbcType=NVARCHAR})
     </foreach>
   </insert>
 
@@ -56,23 +56,23 @@
     <foreach collection="list" item="processDefinition" index="index"> 
       INTO ${prefix}ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_,
       DGRM_RESOURCE_NAME_, DESCRIPTION_, HAS_START_FORM_KEY_, HAS_GRAPHICAL_NOTATION_ , SUSPENSION_STATE_, DERIVED_FROM_, DERIVED_FROM_ROOT_, DERIVED_VERSION_, TENANT_ID_, ENGINE_VERSION_) VALUES 
-        (#{processDefinition.id, jdbcType=VARCHAR},
-         1, #{processDefinition.category, jdbcType=VARCHAR},
-         #{processDefinition.name, jdbcType=VARCHAR},
-         #{processDefinition.key, jdbcType=VARCHAR}, 
+        (#{processDefinition.id, jdbcType=NVARCHAR},
+         1, #{processDefinition.category, jdbcType=NVARCHAR},
+         #{processDefinition.name, jdbcType=NVARCHAR},
+         #{processDefinition.key, jdbcType=NVARCHAR}, 
          #{processDefinition.version, jdbcType=INTEGER},
-         #{processDefinition.deploymentId, jdbcType=VARCHAR},
-         #{processDefinition.resourceName, jdbcType=VARCHAR},
-         #{processDefinition.diagramResourceName, jdbcType=VARCHAR},
-         #{processDefinition.description, jdbcType=VARCHAR},
+         #{processDefinition.deploymentId, jdbcType=NVARCHAR},
+         #{processDefinition.resourceName, jdbcType=NVARCHAR},
+         #{processDefinition.diagramResourceName, jdbcType=NVARCHAR},
+         #{processDefinition.description, jdbcType=NVARCHAR},
          #{processDefinition.hasStartFormKey, jdbcType=BOOLEAN},
          #{processDefinition.isGraphicalNotationDefined, jdbcType=BOOLEAN},
          #{processDefinition.suspensionState, jdbcType=INTEGER},
-         #{processDefinition.derivedFrom, jdbcType=VARCHAR},
-         #{processDefinition.derivedFromRoot, jdbcType=VARCHAR},
+         #{processDefinition.derivedFrom, jdbcType=NVARCHAR},
+         #{processDefinition.derivedFromRoot, jdbcType=NVARCHAR},
          #{processDefinition.derivedVersion, jdbcType=INTEGER},
-         #{processDefinition.tenantId, jdbcType=VARCHAR},
-         #{processDefinition.engineVersion, jdbcType=VARCHAR})
+         #{processDefinition.tenantId, jdbcType=NVARCHAR},
+         #{processDefinition.engineVersion, jdbcType=NVARCHAR})
     </foreach>
     SELECT * FROM dual
   </insert>
@@ -87,64 +87,64 @@
               SUSPENSION_STATE_ = #{suspensionState, jdbcType=INTEGER},
           </if>
           <if test="originalPersistentState.category != category">
-              CATEGORY_ = #{category, jdbcType=VARCHAR},
+              CATEGORY_ = #{category, jdbcType=NVARCHAR},
           </if>
       </set>
-    where ID_ = #{id, jdbcType=VARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
   <update id="updateProcessDefinitionTenantIdForDeploymentId" parameterType="java.util.Map">
     update ${prefix}ACT_RE_PROCDEF set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+      TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
     where
-      DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
   </update>
 
   <update id="updateProcessDefinitionVersionForProcessDefinitionId" parameterType="java.util.Map">
     update ${prefix}ACT_RE_PROCDEF set
       VERSION_ = #{version, jdbcType=INTEGER}
     where
-      ID_ = #{processDefinitionId, jdbcType=VARCHAR}
+      ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </update>
 
   <!-- PROCESSDEFINITION DELETE -->
 
   <delete id="deleteProcessDefinitionsByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_RE_PROCDEF where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}ACT_RE_PROCDEF where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
   </delete>
   
   <!-- PROCESSDEFINITION RESULTMAP -->
 
   <resultMap id="processDefinitionResultMap" type="org.flowable.engine.impl.persistence.entity.ProcessDefinitionEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="revision" column="REV_" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
-    <result property="key" column="KEY_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="revision" column="REV_" jdbcType="INTEGER"/>
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="key" column="KEY_" jdbcType="NVARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
-    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR"/>
-    <result property="resourceName" column="RESOURCE_NAME_" jdbcType="VARCHAR"/>
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="diagramResourceName" column="DGRM_RESOURCE_NAME_" jdbcType="VARCHAR"/>
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
+    <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="NVARCHAR"/>
+    <result property="resourceName" column="RESOURCE_NAME_" jdbcType="NVARCHAR"/>
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="diagramResourceName" column="DGRM_RESOURCE_NAME_" jdbcType="NVARCHAR"/>
+    <result property="description" column="DESCRIPTION_" jdbcType="NVARCHAR" />
     <result property="hasStartFormKey" column="HAS_START_FORM_KEY_" jdbcType="BOOLEAN"/>
     <result property="isGraphicalNotationDefined" column="HAS_GRAPHICAL_NOTATION_" jdbcType="BOOLEAN" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER"/>
-    <result property="derivedFrom" column="DERIVED_FROM_" jdbcType="VARCHAR" />
-    <result property="derivedFromRoot" column="DERIVED_FROM_ROOT_" jdbcType="VARCHAR" />
+    <result property="derivedFrom" column="DERIVED_FROM_" jdbcType="NVARCHAR" />
+    <result property="derivedFromRoot" column="DERIVED_FROM_ROOT_" jdbcType="NVARCHAR" />
     <result property="derivedVersion" column="DERIVED_VERSION_" jdbcType="INTEGER" />
-    <result property="engineVersion" column="ENGINE_VERSION_" jdbcType="VARCHAR" />
+    <result property="engineVersion" column="ENGINE_VERSION_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- PROCESSDEFINITION SELECT -->
 
   <select id="selectProcessDefinition" parameterType="string" resultMap="processDefinitionResultMap">
-    select * from ${prefix}ACT_RE_PROCDEF where ID_ = #{processDefinitionId, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RE_PROCDEF where ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectProcessDefinitionById" parameterType="string" resultMap="processDefinitionResultMap">
-    select * from ${prefix}ACT_RE_PROCDEF where ID_ = #{processDefinitionId}
+    select * from ${prefix}ACT_RE_PROCDEF where ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectProcessDefinitionsByQueryCriteria" parameterType="org.flowable.engine.impl.ProcessDefinitionQueryImpl" resultMap="processDefinitionResultMap">
@@ -164,78 +164,78 @@
     from ${prefix}ACT_RE_PROCDEF RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=NVARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase}${wildcardEscapeClause})
+        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause})
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=NVARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}${wildcardEscapeClause}
+        and RES.KEY_ like #{keyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=NVARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}${wildcardEscapeClause}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="parentDeploymentId != null">
-          and EXISTS (select 1 from ${prefix}ACT_RE_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = RES.DEPLOYMENT_ID_)
+          and EXISTS (select 1 from ${prefix}ACT_RE_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=NVARCHAR} and D.ID_ = RES.DEPLOYMENT_ID_)
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-	           and TENANT_ID_ = #{tenantId}
+	           and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
 	         </if>
 	         <if test="tenantIdLike != null">
-	           and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+	           and TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
 	         </if>
 	         <if test="withoutTenantId">
 	           and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -246,28 +246,28 @@
         )
       </if>
       <if test="suspensionState != null">
-        and (RES.SUSPENSION_STATE_ = #{suspensionState.stateCode})
+        and (RES.SUSPENSION_STATE_ = #{suspensionState.stateCode, jdbcType=INTEGER})
       </if>
        <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="engineVersion != null">
-      	and RES.ENGINE_VERSION_ = #{engineVersion}
+      	and RES.ENGINE_VERSION_ = #{engineVersion, jdbcType=NVARCHAR}
       </if> 
       <if test="eventSubscriptionType != null">
-        and exists(select 1 from ${prefix}ACT_RU_EVENT_SUBSCR EVT where RES.ID_ = EVT.CONFIGURATION_ and EVT.EVENT_TYPE_ = #{eventSubscriptionType} and EVT.EVENT_NAME_ = #{eventSubscriptionName}) 
+        and exists(select 1 from ${prefix}ACT_RU_EVENT_SUBSCR EVT where RES.ID_ = EVT.CONFIGURATION_ and EVT.EVENT_TYPE_ = #{eventSubscriptionType, jdbcType=NVARCHAR} and EVT.EVENT_NAME_ = #{eventSubscriptionName, jdbcType=NVARCHAR})
       </if>
       <if test="includeAuthorization">
           AND
           <trim prefix="(" prefixOverrides="OR" suffix=")">
               <if test="authorizationUserId != null">
-                  exists (select ID_  from ${prefix}ACT_RU_IDENTITYLINK  IDN where IDN.PROC_DEF_ID_ = RES.ID_ and IDN.USER_ID_ = #{authorizationUserId})
+                  exists (select ID_  from ${prefix}ACT_RU_IDENTITYLINK  IDN where IDN.PROC_DEF_ID_ = RES.ID_ and IDN.USER_ID_ = #{authorizationUserId, jdbcType=NVARCHAR})
               </if>
               <if test="authorizationGroups != null &amp;&amp; !authorizationGroups.empty">
                   OR exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK  IDN where IDN.PROC_DEF_ID_ = RES.ID_ and 
@@ -277,9 +277,9 @@
                         or
                         </if>
                         IDN.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="authorizationGroupListItem"
+                        <foreach item="groupId" index="index" collection="authorizationGroupListItem"
                               open="(" separator="," close=")">
-                          #{group}
+                          #{groupId, jdbcType=NVARCHAR}
                         </foreach>
                     </foreach>
                     )
@@ -293,81 +293,81 @@
   <select id="selectProcessDefinitionByDeploymentAndKey" parameterType="map" resultMap="processDefinitionResultMap">
     select * 
     from ${prefix}ACT_RE_PROCDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{processDefinitionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
+      and KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
    <select id="selectProcessDefinitionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="processDefinitionResultMap">
     select * 
     from ${prefix}ACT_RE_PROCDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{processDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
+      and KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
   </select>
 
     <!-- TODO when deploying cmmn from the Process engine then the BPMN resources do not have a parent deployment, they are the parent deployment   -->
     <select id="selectProcessDefinitionByParentDeploymentAndKey" parameterType="map" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF DEF
-    where EXISTS (select 1 from ${prefix}ACT_RE_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = DEF.DEPLOYMENT_ID_)
-      and KEY_ = #{processDefinitionKey}
+    where EXISTS (select 1 from ${prefix}ACT_RE_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=NVARCHAR} and D.ID_ = DEF.DEPLOYMENT_ID_)
+      and KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
 
     <select id="selectProcessDefinitionByParentDeploymentAndKeyAndTenantId" parameterType="map" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF DEF
-    where EXISTS (select 1 from ${prefix}ACT_RE_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = DEF.DEPLOYMENT_ID_)
-      and KEY_ = #{processDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where EXISTS (select 1 from ${prefix}ACT_RE_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=NVARCHAR} and D.ID_ = DEF.DEPLOYMENT_ID_)
+      and KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectProcessDefinitionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF 
-    where KEY_ = #{parameter.processDefinitionKey} and VERSION_ = #{parameter.processDefinitionVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.processDefinitionKey, jdbcType=NVARCHAR} and VERSION_ = #{parameter.processDefinitionVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
     
   
    <select id="selectProcessDefinitionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF 
-    where KEY_ = #{parameter.processDefinitionKey} and VERSION_ = #{parameter.processDefinitionVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.processDefinitionKey, jdbcType=NVARCHAR} and VERSION_ = #{parameter.processDefinitionVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
   </select>
     
   <select id="selectLatestProcessDefinitionByKey" parameterType="string" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF 
-    where KEY_ = #{key} and
+    where KEY_ = #{key, jdbcType=NVARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
           DERIVED_FROM_ is null and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
   
   <select id="selectLatestProcessDefinitionByKeyAndTenantId" parameterType="map" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF 
-    where KEY_ = #{processDefinitionKey} and
-          TENANT_ID_ = #{tenantId} and
+    where KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR} and
           DERIVED_FROM_ is null and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey} and TENANT_ID_ = #{tenantId})
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectLatestDerivedProcessDefinitionByKey" parameterType="string" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF 
-    where KEY_ = #{key} and
+    where KEY_ = #{key, jdbcType=NVARCHAR} and
     (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-    DERIVED_VERSION_ > 0 and DERIVED_VERSION_ = (select max(DERIVED_VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+    DERIVED_VERSION_ > 0 and DERIVED_VERSION_ = (select max(DERIVED_VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
 
   <select id="selectLatestDerivedProcessDefinitionByKeyAndTenantId" parameterType="map" resultMap="processDefinitionResultMap">
     select *
     from ${prefix}ACT_RE_PROCDEF 
-    where KEY_ = #{processDefinitionKey} and
-    TENANT_ID_ = #{tenantId} and
-    DERIVED_VERSION_ > 0 and DERIVED_VERSION_ = (select max(DERIVED_VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR} and
+    TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR} and
+    DERIVED_VERSION_ > 0 and DERIVED_VERSION_ = (select max(DERIVED_VERSION_) from ${prefix}ACT_RE_PROCDEF where KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR})
   </select>
 
   <select id="selectProcessDefinitionByNativeQuery" parameterType="java.util.Map" resultMap="processDefinitionResultMap">
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinitionInfo.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinitionInfo.xml
index 23ec7cd141c..feeb97c09ed 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinitionInfo.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ProcessDefinitionInfo.xml
@@ -8,18 +8,18 @@
   
   <insert id="insertProcessDefinitionInfo" parameterType="org.flowable.engine.impl.persistence.entity.ProcessDefinitionInfoEntityImpl">
     insert into ${prefix}ACT_PROCDEF_INFO(ID_, PROC_DEF_ID_, REV_, INFO_JSON_ID_)
-    values(#{id, jdbcType=VARCHAR}, 
-           #{processDefinitionId, jdbcType=VARCHAR},
-           1, #{infoJsonId, jdbcType=VARCHAR})
+    values(#{id, jdbcType=NVARCHAR}, 
+           #{processDefinitionId, jdbcType=NVARCHAR},
+           1, #{infoJsonId, jdbcType=NVARCHAR})
   </insert>
 
   <insert id="bulkInsertProcessDefinitionInfo" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_PROCDEF_INFO(ID_, PROC_DEF_ID_, REV_, INFO_JSON_ID_)
     VALUES 
       <foreach collection="list" item="processDefinitionInfo" index="index" separator=","> 
-        (#{processDefinitionInfo.id, jdbcType=VARCHAR}, 
-         #{processDefinitionInfo.processDefinitionId, jdbcType=VARCHAR},
-         1, #{processDefinitionInfo.infoJsonId, jdbcType=VARCHAR})
+        (#{processDefinitionInfo.id, jdbcType=NVARCHAR}, 
+         #{processDefinitionInfo.processDefinitionId, jdbcType=NVARCHAR},
+         1, #{processDefinitionInfo.infoJsonId, jdbcType=NVARCHAR})
      </foreach>
   </insert>
 
@@ -27,9 +27,9 @@
     INSERT ALL 
       <foreach collection="list" item="processDefinitionInfo" index="index"> 
         INTO ${prefix}ACT_PROCDEF_INFO(ID_, PROC_DEF_ID_, REV_, INFO_JSON_ID_) VALUES 
-          (#{processDefinitionInfo.id, jdbcType=VARCHAR}, 
-           #{processDefinitionInfo.processDefinitionId, jdbcType=VARCHAR},
-           1, #{processDefinitionInfo.infoJsonId, jdbcType=VARCHAR})
+          (#{processDefinitionInfo.id, jdbcType=NVARCHAR}, 
+           #{processDefinitionInfo.processDefinitionId, jdbcType=NVARCHAR},
+           1, #{processDefinitionInfo.infoJsonId, jdbcType=NVARCHAR})
      </foreach>
     SELECT * FROM dual
   </insert>
@@ -39,35 +39,35 @@
     update ${prefix}ACT_PROCDEF_INFO
     <set>
       REV_ = #{revisionNext, jdbcType=INTEGER},
-      INFO_JSON_ID_ = #{infoJsonId, jdbcType=VARCHAR},
+      INFO_JSON_ID_ = #{infoJsonId, jdbcType=NVARCHAR},
     </set>
-    where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
+    where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   
   <!-- ProcessDefinitionInfo DELETE -->
   
   <delete id="deleteProcessDefinitionInfo" parameterType="org.flowable.engine.impl.persistence.entity.ProcessDefinitionInfoEntityImpl">
-    delete from ${prefix}ACT_PROCDEF_INFO where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_PROCDEF_INFO where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <!-- MODEL RESULTMAP -->
   
   <resultMap id="processDefinitionInfoResultMap" type="org.flowable.engine.impl.persistence.entity.ProcessDefinitionInfoEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="infoJsonId" column="INFO_JSON_ID_" jdbcType="VARCHAR" />
+    <result property="infoJsonId" column="INFO_JSON_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <!-- ProcessDefinitionInfo SELECT -->
 
   <select id="selectProcessDefinitionInfo" parameterType="string" resultMap="processDefinitionInfoResultMap">
-    select * from ${prefix}ACT_PROCDEF_INFO where ID_ = #{id}
+    select * from ${prefix}ACT_PROCDEF_INFO where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectProcessDefinitionInfoByProcessDefinitionId" parameterType="string" resultMap="processDefinitionInfoResultMap">
-    select * from ${prefix}ACT_PROCDEF_INFO where PROC_DEF_ID_ = #{processDefinitionId}
+    select * from ${prefix}ACT_PROCDEF_INFO where PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </select>
 
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Resource.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Resource.xml
index 243648b83a8..2fe93f9b093 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Resource.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Resource.xml
@@ -8,17 +8,17 @@
 
   <insert id="insertResource" parameterType="org.flowable.engine.impl.persistence.entity.ResourceEntityImpl">
     insert into ${prefix}ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_)
-    values (#{id, jdbcType=VARCHAR}, 1, #{name, jdbcType=VARCHAR}, #{bytes, jdbcType=${blobType}}, #{deploymentId, jdbcType=VARCHAR}, #{generated, jdbcType=BOOLEAN})  
+    values (#{id, jdbcType=NVARCHAR}, 1, #{name, jdbcType=NVARCHAR}, #{bytes, jdbcType=${blobType}}, #{deploymentId, jdbcType=NVARCHAR}, #{generated, jdbcType=BOOLEAN})  
   </insert>
 
   <insert id="bulkInsertResource" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) VALUES 
-      <foreach collection="list" item="byteArr" index="index" separator=","> 
-        (#{byteArr.id, jdbcType=VARCHAR},
-         1, #{byteArr.name, jdbcType=VARCHAR},
-         #{byteArr.bytes, jdbcType=${blobType}},
-         #{byteArr.deploymentId, jdbcType=VARCHAR},
-         #{byteArr.generated, jdbcType=BOOLEAN})
+      <foreach collection="list" item="resource" index="index" separator=",">
+        (#{resource.id, jdbcType=NVARCHAR},
+         1, #{resource.name, jdbcType=NVARCHAR},
+         #{resource.bytes, jdbcType=${blobType}},
+         #{resource.deploymentId, jdbcType=NVARCHAR},
+         #{resource.generated, jdbcType=BOOLEAN})
       </foreach>
   </insert>
 
@@ -26,10 +26,10 @@
     INSERT ALL
       <foreach collection="list" item="resource" index="index"> 
         INTO ${prefix}ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) VALUES 
-        (#{resource.id, jdbcType=VARCHAR},
-         1, #{resource.name, jdbcType=VARCHAR},
+        (#{resource.id, jdbcType=NVARCHAR},
+         1, #{resource.name, jdbcType=NVARCHAR},
          #{resource.bytes, jdbcType=${blobType}},
-         #{resource.deploymentId, jdbcType=VARCHAR},
+         #{resource.deploymentId, jdbcType=NVARCHAR},
          #{resource.generated, jdbcType=BOOLEAN})
       </foreach>
     SELECT * FROM dual
@@ -38,14 +38,14 @@
   <!-- RESOURCE DELETE -->
 
   <delete id="deleteResourcesByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{id}
+    delete from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <!-- RESOURCE RESULTMAP -->
 
   <resultMap id="resourceResultMap" type="org.flowable.engine.impl.persistence.entity.ResourceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR"/>
     <result property="bytes" column="BYTES_" jdbcType="${blobType}"/>
     <result property="generated" column="GENERATED_" jdbcType="BOOLEAN"/>
   </resultMap>
@@ -53,17 +53,17 @@
   <!-- RESOURCE SELECT -->
 
   <select id="selectResourceNamesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
-    select NAME_ from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select NAME_ from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{parameter, jdbcType=NVARCHAR} order by NAME_ asc
   </select>
   
   <select id="selectResourceByDeploymentIdAndResourceName" parameterType="map" resultMap="resourceResultMap">
     select * from ${prefix}ACT_GE_BYTEARRAY 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-          AND NAME_ = #{resourceName}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
+          AND NAME_ = #{resourceName, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectResourcesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="resourceResultMap">
-    select * from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select * from ${prefix}ACT_GE_BYTEARRAY where DEPLOYMENT_ID_ = #{parameter, jdbcType=NVARCHAR} order by NAME_ asc
   </select>
   
   <update id="updateResource" parameterType="org.flowable.engine.impl.persistence.entity.ResourceEntityImpl">
@@ -71,7 +71,7 @@
     <set>
         BYTES_ = #{bytes, jdbcType=${blobType}},
     </set>
-    where ID_ = #{id, jdbcType=VARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
   </update>
 
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/EntityLink.xml b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/EntityLink.xml
index c4ef242875a..153db89d045 100644
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/EntityLink.xml
+++ b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/EntityLink.xml
@@ -9,20 +9,20 @@
   <insert id="insertEntityLink" parameterType="org.flowable.entitylink.service.impl.persistence.entity.EntityLinkEntityImpl">
     insert into ${prefix}ACT_RU_ENTITYLINK (ID_, REV_, CREATE_TIME_, LINK_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, 
     	PARENT_ELEMENT_ID_, REF_SCOPE_ID_, REF_SCOPE_TYPE_, REF_SCOPE_DEFINITION_ID_, ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, HIERARCHY_TYPE_)
-    values (#{id, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
             1, #{createTime, jdbcType=TIMESTAMP},
-            #{linkType, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{parentElementId, jdbcType=VARCHAR},
-            #{referenceScopeId, jdbcType=VARCHAR},
-            #{referenceScopeType, jdbcType=VARCHAR},
-            #{referenceScopeDefinitionId, jdbcType=VARCHAR},
-            #{rootScopeId, jdbcType=VARCHAR},
-            #{rootScopeType, jdbcType=VARCHAR},
-            #{hierarchyType, jdbcType=VARCHAR})
+            #{linkType, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{parentElementId, jdbcType=NVARCHAR},
+            #{referenceScopeId, jdbcType=NVARCHAR},
+            #{referenceScopeType, jdbcType=NVARCHAR},
+            #{referenceScopeDefinitionId, jdbcType=NVARCHAR},
+            #{rootScopeId, jdbcType=NVARCHAR},
+            #{rootScopeType, jdbcType=NVARCHAR},
+            #{hierarchyType, jdbcType=NVARCHAR})
             
   </insert>
   
@@ -31,20 +31,20 @@
     	PARENT_ELEMENT_ID_, REF_SCOPE_ID_, REF_SCOPE_TYPE_, REF_SCOPE_DEFINITION_ID_, ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, HIERARCHY_TYPE_)
     values 
     <foreach collection="list" item="entityLink" index="index" separator=","> 
-      (#{entityLink.id, jdbcType=VARCHAR},
+      (#{entityLink.id, jdbcType=NVARCHAR},
         1, #{entityLink.createTime, jdbcType=TIMESTAMP},
-        #{entityLink.linkType, jdbcType=VARCHAR},
-        #{entityLink.scopeId, jdbcType=VARCHAR},
-        #{entityLink.subScopeId, jdbcType=VARCHAR},
-        #{entityLink.scopeType, jdbcType=VARCHAR},
-        #{entityLink.scopeDefinitionId, jdbcType=VARCHAR},
-        #{entityLink.parentElementId, jdbcType=VARCHAR},
-        #{entityLink.referenceScopeId, jdbcType=VARCHAR},
-        #{entityLink.referenceScopeType, jdbcType=VARCHAR},
-        #{entityLink.referenceScopeDefinitionId, jdbcType=VARCHAR},
-        #{entityLink.rootScopeId, jdbcType=VARCHAR},
-        #{entityLink.rootScopeType, jdbcType=VARCHAR},
-        #{entityLink.hierarchyType, jdbcType=VARCHAR})
+        #{entityLink.linkType, jdbcType=NVARCHAR},
+        #{entityLink.scopeId, jdbcType=NVARCHAR},
+        #{entityLink.subScopeId, jdbcType=NVARCHAR},
+        #{entityLink.scopeType, jdbcType=NVARCHAR},
+        #{entityLink.scopeDefinitionId, jdbcType=NVARCHAR},
+        #{entityLink.parentElementId, jdbcType=NVARCHAR},
+        #{entityLink.referenceScopeId, jdbcType=NVARCHAR},
+        #{entityLink.referenceScopeType, jdbcType=NVARCHAR},
+        #{entityLink.referenceScopeDefinitionId, jdbcType=NVARCHAR},
+        #{entityLink.rootScopeId, jdbcType=NVARCHAR},
+        #{entityLink.rootScopeType, jdbcType=NVARCHAR},
+        #{entityLink.hierarchyType, jdbcType=NVARCHAR})
     </foreach>
   </insert>
   
@@ -53,20 +53,20 @@
       <foreach collection="list" item="entityLink" index="index">
         into ${prefix}ACT_RU_ENTITYLINK (ID_, REV_, CREATE_TIME_, LINK_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, 
         	PARENT_ELEMENT_ID_, REF_SCOPE_ID_, REF_SCOPE_TYPE_, REF_SCOPE_DEFINITION_ID_, ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, HIERARCHY_TYPE_) VALUES
-           (#{entityLink.id, jdbcType=VARCHAR},
+           (#{entityLink.id, jdbcType=NVARCHAR},
             1, #{entityLink.createTime, jdbcType=TIMESTAMP},
-            #{entityLink.linkType, jdbcType=VARCHAR},
-            #{entityLink.scopeId, jdbcType=VARCHAR},
-            #{entityLink.subScopeId, jdbcType=VARCHAR},
-            #{entityLink.scopeType, jdbcType=VARCHAR},
-            #{entityLink.scopeDefinitionId, jdbcType=VARCHAR},
-            #{entityLink.parentElementId, jdbcType=VARCHAR},
-            #{entityLink.referenceScopeId, jdbcType=VARCHAR},
-            #{entityLink.referenceScopeType, jdbcType=VARCHAR},
-            #{entityLink.referenceScopeDefinitionId, jdbcType=VARCHAR},
-            #{entityLink.rootScopeId, jdbcType=VARCHAR},
-            #{entityLink.rootScopeType, jdbcType=VARCHAR},
-            #{entityLink.hierarchyType, jdbcType=VARCHAR})
+            #{entityLink.linkType, jdbcType=NVARCHAR},
+            #{entityLink.scopeId, jdbcType=NVARCHAR},
+            #{entityLink.subScopeId, jdbcType=NVARCHAR},
+            #{entityLink.scopeType, jdbcType=NVARCHAR},
+            #{entityLink.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{entityLink.parentElementId, jdbcType=NVARCHAR},
+            #{entityLink.referenceScopeId, jdbcType=NVARCHAR},
+            #{entityLink.referenceScopeType, jdbcType=NVARCHAR},
+            #{entityLink.referenceScopeDefinitionId, jdbcType=NVARCHAR},
+            #{entityLink.rootScopeId, jdbcType=NVARCHAR},
+            #{entityLink.rootScopeType, jdbcType=NVARCHAR},
+            #{entityLink.hierarchyType, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -74,47 +74,47 @@
   <!-- ENTITY LINK DELETE -->
   
   <delete id="deleteEntityLink" parameterType="string">
-    delete from ${prefix}ACT_RU_ENTITYLINK where ID_ = #{id}
+    delete from ${prefix}ACT_RU_ENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteEntityLink" parameterType="java.util.Collection">
     delete from ${prefix}ACT_RU_ENTITYLINK where 
     <foreach item="entityLink" collection="list" index="index" separator=" or ">
-        ID_ = #{entityLink.id, jdbcType=VARCHAR}
+        ID_ = #{entityLink.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
   
   <delete id="deleteEntityLinksByScopeIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_RU_ENTITYLINK where SCOPE_ID_ = #{scopeId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_RU_ENTITYLINK where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteEntityLinksByRootScopeIdAndRootScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_RU_ENTITYLINK where ROOT_SCOPE_ID_ = #{rootScopeId} and ROOT_SCOPE_TYPE_ = #{rootScopeType}
+    delete from ${prefix}ACT_RU_ENTITYLINK where ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR} and ROOT_SCOPE_TYPE_ = #{rootScopeType, jdbcType=NVARCHAR}
   </delete>
   
   <!-- ENTITY LINK RESULTMAP -->
 
   <resultMap id="entityLinkResultMap" type="org.flowable.entitylink.service.impl.persistence.entity.EntityLinkEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-    <result property="linkType" column="LINK_TYPE_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="parentElementId" column="PARENT_ELEMENT_ID_" jdbcType="VARCHAR"/>
-    <result property="referenceScopeId" column="REF_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="referenceScopeType" column="REF_SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="referenceScopeDefinitionId" column="REF_SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="rootScopeId" column="ROOT_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="rootScopeType" column="ROOT_SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="hierarchyType" column="HIERARCHY_TYPE_" jdbcType="VARCHAR"/>
+    <result property="linkType" column="LINK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="parentElementId" column="PARENT_ELEMENT_ID_" jdbcType="NVARCHAR"/>
+    <result property="referenceScopeId" column="REF_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="referenceScopeType" column="REF_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="referenceScopeDefinitionId" column="REF_SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="rootScopeId" column="ROOT_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="rootScopeType" column="ROOT_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="hierarchyType" column="HIERARCHY_TYPE_" jdbcType="NVARCHAR"/>
   </resultMap>
 
   <!-- ENTITY LINK SELECT -->
 
   <select id="selectEntityLink" parameterType="string" resultMap="entityLinkResultMap">
-    select * from ${prefix}ACT_RU_ENTITYLINK where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RU_ENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectEntityLinks" resultMap="entityLinkResultMap">
@@ -128,10 +128,10 @@
     inner join (
                     select ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_
                     from ${prefix}ACT_RU_ENTITYLINK
-                    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+                    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
                     limit 1
                 ) ROOT_LINK ON RES.ROOT_SCOPE_ID_ = ROOT_LINK.ROOT_SCOPE_ID_ and RES.ROOT_SCOPE_TYPE_ = ROOT_LINK.ROOT_SCOPE_TYPE_
-    where LINK_TYPE_ = #{parameter.linkType}
+    where LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
 
   <!-- If you change something in the select, then check the other DBs as well -->
@@ -141,10 +141,10 @@
     inner join (
                     select ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_
                     from ${prefix}ACT_RU_ENTITYLINK
-                    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+                    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
                     and ROWNUM = 1
                 ) ROOT_LINK ON RES.ROOT_SCOPE_ID_ = ROOT_LINK.ROOT_SCOPE_ID_ and RES.ROOT_SCOPE_TYPE_ = ROOT_LINK.ROOT_SCOPE_TYPE_
-    where LINK_TYPE_ = #{parameter.linkType}
+    where LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
 
   <!-- If you change something in the select, then check the other DBs as well -->
@@ -155,9 +155,9 @@
                     select TOP(1)
                     ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_
                     from ${prefix}ACT_RU_ENTITYLINK
-                    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+                    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
                 ) ROOT_LINK ON RES.ROOT_SCOPE_ID_ = ROOT_LINK.ROOT_SCOPE_ID_ and RES.ROOT_SCOPE_TYPE_ = ROOT_LINK.ROOT_SCOPE_TYPE_
-    where LINK_TYPE_ = #{parameter.linkType}
+    where LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
 
     <select id="selectEntityLinksByQuery" parameterType="org.flowable.entitylink.service.impl.InternalEntityLinkQueryImpl" resultMap="entityLinkResultMap">
@@ -165,40 +165,40 @@
         from ${prefix}ACT_RU_ENTITYLINK RES
         <where>
             <if test="parameter.scopeId != null">
-                AND RES.SCOPE_ID_ = #{parameter.scopeId, jdbcType=VARCHAR}
+                AND RES.SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.scopeIds != null">
                 AND RES.SCOPE_ID_ in
-                <foreach collection="parameter.scopeIds" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.scopeIds" item="scopeId" open="(" separator="," close=")">
+                    #{scopeId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.scopeDefinitionId != null">
-                AND RES.SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId, jdbcType=VARCHAR}
+                AND RES.SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.scopeType != null">
-                AND RES.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+                AND RES.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.referenceScopeId != null">
-                AND RES.REF_SCOPE_ID_ = #{parameter.referenceScopeId, jdbcType=VARCHAR}
+                AND RES.REF_SCOPE_ID_ = #{parameter.referenceScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.referenceScopeDefinitionId != null">
-                AND RES.REF_SCOPE_DEFINITION_ID_ = #{parameter.referenceScopeDefinitionId, jdbcType=VARCHAR}
+                AND RES.REF_SCOPE_DEFINITION_ID_ = #{parameter.referenceScopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.referenceScopeType != null">
-                AND RES.REF_SCOPE_TYPE_ = #{parameter.referenceScopeType, jdbcType=VARCHAR}
+                AND RES.REF_SCOPE_TYPE_ = #{parameter.referenceScopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.rootScopeId != null">
-                AND RES.ROOT_SCOPE_ID_ = #{parameter.rootScopeId, jdbcType=VARCHAR}
+                AND RES.ROOT_SCOPE_ID_ = #{parameter.rootScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.rootScopeType != null">
-                AND RES.ROOT_SCOPE_TYPE_ = #{parameter.rootScopeType, jdbcType=VARCHAR}
+                AND RES.ROOT_SCOPE_TYPE_ = #{parameter.rootScopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.linkType != null">
-                AND RES.LINK_TYPE_ = #{parameter.linkType, jdbcType=VARCHAR}
+                AND RES.LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.hierarchyType != null">
-                AND RES.HIERARCHY_TYPE_ = #{parameter.hierarchyType, jdbcType=VARCHAR}
+                AND RES.HIERARCHY_TYPE_ = #{parameter.hierarchyType, jdbcType=NVARCHAR}
             </if>
         </where>
     </select>
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/HistoricEntityLink.xml b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/HistoricEntityLink.xml
index ee5335cb037..c9ab63e6cb0 100644
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/HistoricEntityLink.xml
+++ b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/mapping/entity/HistoricEntityLink.xml
@@ -9,20 +9,20 @@
   <insert id="insertHistoricEntityLink" parameterType="org.flowable.entitylink.service.impl.persistence.entity.HistoricEntityLinkEntityImpl">
     insert into ${prefix}ACT_HI_ENTITYLINK (ID_, LINK_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, 
     	PARENT_ELEMENT_ID_, REF_SCOPE_ID_, REF_SCOPE_TYPE_, REF_SCOPE_DEFINITION_ID_, ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, CREATE_TIME_, HIERARCHY_TYPE_)
-    values (#{id, jdbcType=VARCHAR},
-            #{linkType, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{parentElementId, jdbcType=VARCHAR},
-            #{referenceScopeId, jdbcType=VARCHAR},
-            #{referenceScopeType, jdbcType=VARCHAR},
-            #{referenceScopeDefinitionId, jdbcType=VARCHAR},
-            #{rootScopeId, jdbcType=VARCHAR},
-            #{rootScopeType, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
+            #{linkType, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{parentElementId, jdbcType=NVARCHAR},
+            #{referenceScopeId, jdbcType=NVARCHAR},
+            #{referenceScopeType, jdbcType=NVARCHAR},
+            #{referenceScopeDefinitionId, jdbcType=NVARCHAR},
+            #{rootScopeId, jdbcType=NVARCHAR},
+            #{rootScopeType, jdbcType=NVARCHAR},
             #{createTime, jdbcType=TIMESTAMP},
-            #{hierarchyType, jdbcType=VARCHAR})
+            #{hierarchyType, jdbcType=NVARCHAR})
   </insert>
   
   <insert id="bulkInsertHistoricEntityLink" parameterType="java.util.List">
@@ -30,20 +30,20 @@
     	PARENT_ELEMENT_ID_, REF_SCOPE_ID_, REF_SCOPE_TYPE_, REF_SCOPE_DEFINITION_ID_, ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, CREATE_TIME_, HIERARCHY_TYPE_)
     values 
       <foreach collection="list" item="historicEntityLink" index="index" separator=",">
-        (#{historicEntityLink.id, jdbcType=VARCHAR},
-         #{historicEntityLink.linkType, jdbcType=VARCHAR},
-         #{historicEntityLink.scopeId, jdbcType=VARCHAR},
-         #{historicEntityLink.subScopeId, jdbcType=VARCHAR},
-         #{historicEntityLink.scopeType, jdbcType=VARCHAR},
-         #{historicEntityLink.scopeDefinitionId, jdbcType=VARCHAR},
-         #{historicEntityLink.parentElementId, jdbcType=VARCHAR},
-         #{historicEntityLink.referenceScopeId, jdbcType=VARCHAR},
-         #{historicEntityLink.referenceScopeType, jdbcType=VARCHAR},
-         #{historicEntityLink.referenceScopeDefinitionId, jdbcType=VARCHAR},
-         #{historicEntityLink.rootScopeId, jdbcType=VARCHAR},
-         #{historicEntityLink.rootScopeType, jdbcType=VARCHAR},
+        (#{historicEntityLink.id, jdbcType=NVARCHAR},
+         #{historicEntityLink.linkType, jdbcType=NVARCHAR},
+         #{historicEntityLink.scopeId, jdbcType=NVARCHAR},
+         #{historicEntityLink.subScopeId, jdbcType=NVARCHAR},
+         #{historicEntityLink.scopeType, jdbcType=NVARCHAR},
+         #{historicEntityLink.scopeDefinitionId, jdbcType=NVARCHAR},
+         #{historicEntityLink.parentElementId, jdbcType=NVARCHAR},
+         #{historicEntityLink.referenceScopeId, jdbcType=NVARCHAR},
+         #{historicEntityLink.referenceScopeType, jdbcType=NVARCHAR},
+         #{historicEntityLink.referenceScopeDefinitionId, jdbcType=NVARCHAR},
+         #{historicEntityLink.rootScopeId, jdbcType=NVARCHAR},
+         #{historicEntityLink.rootScopeType, jdbcType=NVARCHAR},
          #{historicEntityLink.createTime, jdbcType=TIMESTAMP},
-         #{historicEntityLink.hierarchyType, jdbcType=VARCHAR})
+         #{historicEntityLink.hierarchyType, jdbcType=NVARCHAR})
       </foreach>
   </insert>
   
@@ -52,20 +52,20 @@
       <foreach collection="list" item="historicEntityLink" index="index">
         INTO ${prefix}ACT_HI_ENTITYLINK (ID_, LINK_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, 
         	PARENT_ELEMENT_ID_, REF_SCOPE_ID_, REF_SCOPE_TYPE_, REF_SCOPE_DEFINITION_ID_, ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, CREATE_TIME_, HIERARCHY_TYPE_) VALUES
-          (#{historicEntityLink.id, jdbcType=VARCHAR},
-           #{historicEntityLink.linkType, jdbcType=VARCHAR},
-           #{historicEntityLink.scopeId, jdbcType=VARCHAR},
-           #{historicEntityLink.subScopeId, jdbcType=VARCHAR},
-           #{historicEntityLink.scopeType, jdbcType=VARCHAR},
-           #{historicEntityLink.scopeDefinitionId, jdbcType=VARCHAR},
-           #{historicEntityLink.parentElementId, jdbcType=VARCHAR},
-           #{historicEntityLink.referenceScopeId, jdbcType=VARCHAR},
-           #{historicEntityLink.referenceScopeType, jdbcType=VARCHAR},
-           #{historicEntityLink.referenceScopeDefinitionId, jdbcType=VARCHAR},
-           #{historicEntityLink.rootScopeId, jdbcType=VARCHAR},
-           #{historicEntityLink.rootScopeType, jdbcType=VARCHAR},
+          (#{historicEntityLink.id, jdbcType=NVARCHAR},
+           #{historicEntityLink.linkType, jdbcType=NVARCHAR},
+           #{historicEntityLink.scopeId, jdbcType=NVARCHAR},
+           #{historicEntityLink.subScopeId, jdbcType=NVARCHAR},
+           #{historicEntityLink.scopeType, jdbcType=NVARCHAR},
+           #{historicEntityLink.scopeDefinitionId, jdbcType=NVARCHAR},
+           #{historicEntityLink.parentElementId, jdbcType=NVARCHAR},
+           #{historicEntityLink.referenceScopeId, jdbcType=NVARCHAR},
+           #{historicEntityLink.referenceScopeType, jdbcType=NVARCHAR},
+           #{historicEntityLink.referenceScopeDefinitionId, jdbcType=NVARCHAR},
+           #{historicEntityLink.rootScopeId, jdbcType=NVARCHAR},
+           #{historicEntityLink.rootScopeType, jdbcType=NVARCHAR},
            #{historicEntityLink.createTime, jdbcType=TIMESTAMP},
-           #{historicEntityLink.hierarchyType, jdbcType=VARCHAR})
+           #{historicEntityLink.hierarchyType, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -73,33 +73,33 @@
   <!-- HISTORIC ENTITY LINK DELETE -->
   
   <delete id="deleteHistoricEntityLink" parameterType="string">
-    delete from ${prefix}ACT_HI_ENTITYLINK where ID_ = #{id}
+    delete from ${prefix}ACT_HI_ENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricEntityLink" parameterType="java.util.Collection">
     delete from ${prefix}ACT_HI_ENTITYLINK where  
-    <foreach item="entityLink" collection="list" index="index" separator=" or ">
-        ID_ = #{entityLink.id, jdbcType=VARCHAR}
+    <foreach item="historicEntityLink" collection="list" index="index" separator=" or ">
+        ID_ = #{historicEntityLink.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
   
   <delete id="deleteHistoricEntityLinksByScopeIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_HI_ENTITYLINK where SCOPE_ID_ = #{scopeId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_HI_ENTITYLINK where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteHistoricEntityLinksByScopeDefinitionIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_HI_ENTITYLINK where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_HI_ENTITYLINK where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricEntityLinksForScopeTypeAndScopeIds" parameterType="java.util.Map">
-    delete from ${prefix}ACT_HI_ENTITYLINK where SCOPE_TYPE_ = #{scopeType} and 
+    delete from ${prefix}ACT_HI_ENTITYLINK where SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR} and
     (<foreach item="listItem" index="listIndex" collection="scopeIds">
         <if test="listIndex &gt; 0">
         or
         </if>
         SCOPE_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{scopeId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>)
   </delete>
@@ -115,26 +115,26 @@
   <!-- HISTORIC ENTITY LINK RESULTMAP -->
 
   <resultMap id="historicEntityLinkResultMap" type="org.flowable.entitylink.service.impl.persistence.entity.HistoricEntityLinkEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="linkType" column="LINK_TYPE_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="parentElementId" column="PARENT_ELEMENT_ID_" jdbcType="VARCHAR"/>
-    <result property="referenceScopeId" column="REF_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="referenceScopeType" column="REF_SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="referenceScopeDefinitionId" column="REF_SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="rootScopeId" column="ROOT_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="rootScopeType" column="ROOT_SCOPE_TYPE_" jdbcType="VARCHAR"/>
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="linkType" column="LINK_TYPE_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="parentElementId" column="PARENT_ELEMENT_ID_" jdbcType="NVARCHAR"/>
+    <result property="referenceScopeId" column="REF_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="referenceScopeType" column="REF_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="referenceScopeDefinitionId" column="REF_SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="rootScopeId" column="ROOT_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="rootScopeType" column="ROOT_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
     <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-    <result property="hierarchyType" column="HIERARCHY_TYPE_" jdbcType="VARCHAR"/>
+    <result property="hierarchyType" column="HIERARCHY_TYPE_" jdbcType="NVARCHAR"/>
   </resultMap>
 
   <!-- HISTORIC ENTITY LINK SELECT -->
 
   <select id="selectHistoricEntityLink" parameterType="string" resultMap="historicEntityLinkResultMap">
-    select * from ${prefix}ACT_HI_ENTITYLINK where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_HI_ENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectEntityLinks" resultMap="historicEntityLinkResultMap">
@@ -148,10 +148,10 @@
     inner join (
                     select ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_
                     from ${prefix}ACT_HI_ENTITYLINK
-                    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+                    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
                     limit 1
                 ) ROOT_LINK ON RES.ROOT_SCOPE_ID_ = ROOT_LINK.ROOT_SCOPE_ID_ and RES.ROOT_SCOPE_TYPE_ = ROOT_LINK.ROOT_SCOPE_TYPE_
-    where LINK_TYPE_ = #{parameter.linkType}
+    where LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
 
   <!-- If you change something in the select, then check the other DBs as well -->
@@ -161,10 +161,10 @@
     inner join (
                     select ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_
                     from ${prefix}ACT_HI_ENTITYLINK
-                    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+                    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
                     and ROWNUM = 1
                 ) ROOT_LINK ON RES.ROOT_SCOPE_ID_ = ROOT_LINK.ROOT_SCOPE_ID_ and RES.ROOT_SCOPE_TYPE_ = ROOT_LINK.ROOT_SCOPE_TYPE_
-    where LINK_TYPE_ = #{parameter.linkType}
+    where LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
 
   <!-- If you change something in the select, then check the other DBs as well -->
@@ -175,9 +175,9 @@
                     select TOP(1)
                     ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_
                     from ${prefix}ACT_HI_ENTITYLINK
-                    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+                    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
                 ) ROOT_LINK ON RES.ROOT_SCOPE_ID_ = ROOT_LINK.ROOT_SCOPE_ID_ and RES.ROOT_SCOPE_TYPE_ = ROOT_LINK.ROOT_SCOPE_TYPE_
-    where LINK_TYPE_ = #{parameter.linkType}
+    where LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricEntityLinksByRootScopeIdsAndType" resultMap="historicEntityLinkResultMap">
@@ -188,12 +188,12 @@
         or
         </if>
         ROOT_SCOPE_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{scopeId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
     )
-    and LINK_TYPE_ = #{parameter.linkType}
+    and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectRootScopeIdsByScopeIdsAndType" resultType="string">
@@ -205,11 +205,11 @@
         or
         </if>
         SCOPE_ID_ in
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{scopeId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>)
-    and SCOPE_TYPE_ = #{parameter.scopeType} and LINK_TYPE_ = #{parameter.linkType} and ROOT_SCOPE_ID_ is not null
+    and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR} and LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR} and ROOT_SCOPE_ID_ is not null
   </select>
 
     <select id="selectHistoricEntityLinksByQuery" parameterType="org.flowable.entitylink.service.impl.InternalEntityLinkQueryImpl" resultMap="historicEntityLinkResultMap">
@@ -217,40 +217,40 @@
         from ${prefix}ACT_HI_ENTITYLINK RES
         <where>
             <if test="parameter.scopeId != null">
-                AND RES.SCOPE_ID_ = #{parameter.scopeId, jdbcType=VARCHAR}
+                AND RES.SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.scopeIds != null">
                 AND RES.SCOPE_ID_ in
-                <foreach collection="parameter.scopeIds" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.scopeIds" item="scopeId" open="(" separator="," close=")">
+                    #{scopeId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.scopeDefinitionId != null">
-                AND RES.SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId, jdbcType=VARCHAR}
+                AND RES.SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.scopeType != null">
-                AND RES.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+                AND RES.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.referenceScopeId != null">
-                AND RES.REF_SCOPE_ID_ = #{parameter.referenceScopeId, jdbcType=VARCHAR}
+                AND RES.REF_SCOPE_ID_ = #{parameter.referenceScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.referenceScopeDefinitionId != null">
-                AND RES.REF_SCOPE_DEFINITION_ID_ = #{parameter.referenceScopeDefinitionId, jdbcType=VARCHAR}
+                AND RES.REF_SCOPE_DEFINITION_ID_ = #{parameter.referenceScopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.referenceScopeType != null">
-                AND RES.REF_SCOPE_TYPE_ = #{parameter.referenceScopeType, jdbcType=VARCHAR}
+                AND RES.REF_SCOPE_TYPE_ = #{parameter.referenceScopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.rootScopeId != null">
-                AND RES.ROOT_SCOPE_ID_ = #{parameter.rootScopeId, jdbcType=VARCHAR}
+                AND RES.ROOT_SCOPE_ID_ = #{parameter.rootScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.rootScopeType != null">
-                AND RES.ROOT_SCOPE_TYPE_ = #{parameter.rootScopeType, jdbcType=VARCHAR}
+                AND RES.ROOT_SCOPE_TYPE_ = #{parameter.rootScopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.linkType != null">
-                AND RES.LINK_TYPE_ = #{parameter.linkType, jdbcType=VARCHAR}
+                AND RES.LINK_TYPE_ = #{parameter.linkType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.hierarchyType != null">
-                AND RES.HIERARCHY_TYPE_ = #{parameter.hierarchyType, jdbcType=VARCHAR}
+                AND RES.HIERARCHY_TYPE_ = #{parameter.hierarchyType, jdbcType=NVARCHAR}
             </if>
         </where>
     </select>
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/ChannelDefinition.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/ChannelDefinition.xml
index 268fd330adc..d0f93a24384 100644
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/ChannelDefinition.xml
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/ChannelDefinition.xml
@@ -92,15 +92,15 @@
   <!-- DEFINITION DELETE -->
 
   <delete id="deleteChannelDefinitionsByDeploymentId" parameterType="string">
-    delete from ${prefix}FLW_CHANNEL_DEFINITION where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}FLW_CHANNEL_DEFINITION where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR} 
   </delete>
   
   <!-- FORM DEFINITION RESULTMAP -->
 
   <resultMap id="channelDefinitionResultMap" type="org.flowable.eventregistry.impl.persistence.entity.ChannelDefinitionEntityImpl">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
+    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" jdbcType="VARCHAR" />
     <result property="key" column="KEY_" jdbcType="VARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
     <result property="type" column="TYPE_" jdbcType="VARCHAR"/>
@@ -115,11 +115,11 @@
   <!-- DEFINITION SELECT -->
 
   <select id="selectChannelDefinition" parameterType="string" resultMap="channelDefinitionResultMap">
-    select * from ${prefix}FLW_CHANNEL_DEFINITION where ID_ = #{channelDefinitionId, jdbcType=VARCHAR}
+    select * from ${prefix}FLW_CHANNEL_DEFINITION where ID_ = #{id, jdbcType=VARCHAR}
   </select>
 
   <select id="selectChannelDefinitionById" parameterType="string" resultMap="channelDefinitionResultMap">
-    select * from ${prefix}FLW_CHANNEL_DEFINITION where ID_ = #{channelDefinitionId}
+    select * from ${prefix}FLW_CHANNEL_DEFINITION where ID_ = #{id, jdbcType=VARCHAR}
   </select>
 
   <select id="selectChannelDefinitionsByQueryCriteria" parameterType="org.flowable.eventregistry.impl.ChannelDefinitionQueryImpl" resultMap="channelDefinitionResultMap">
@@ -139,55 +139,55 @@
     from ${prefix}FLW_CHANNEL_DEFINITION RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase}${wildcardEscapeClause})
+        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause})
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}
+        and RES.KEY_ like #{keyLike, jdbcType=VARCHAR}
       </if>
       <if test="keyLikeIgnoreCase != null">
-        and lower(RES.KEY_) like lower(#{keyLikeIgnoreCase}${wildcardEscapeClause})
+        and lower(RES.KEY_) like lower(#{keyLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause})
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="onlyInbound">
         and RES.TYPE_ = 'inbound'
@@ -196,42 +196,42 @@
         and RES.TYPE_ = 'outbound'
       </if>
       <if test="implementation != null">
-        and RES.IMPLEMENTATION_ = #{implementation}
+        and RES.IMPLEMENTATION_ = #{implementation, jdbcType=VARCHAR}
       </if>
       <if test="createTime != null">
-        and RES.CREATE_TIME = #{createTime}
+        and RES.CREATE_TIME = #{createTime, jdbcType=TIMESTAMP}
       </if>
       <if test="createTimeAfter != null">
-        and RES.CREATE_TIME &gt; #{createTimeAfter}
+        and RES.CREATE_TIME &gt; #{createTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="createTimeBefore != null">
-        and RES.CREATE_TIME &lt; #{createTimeBefore}
+        and RES.CREATE_TIME &lt; #{createTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=VARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=VARCHAR}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="parentDeploymentId != null">
-          and EXISTS (select 1 from ${prefix}FLW_EVENT_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = RES.DEPLOYMENT_ID_)
+          and EXISTS (select 1 from ${prefix}FLW_EVENT_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR} and D.ID_ = RES.DEPLOYMENT_ID_)
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}FLW_CHANNEL_DEFINITION where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
              </if>
              <if test="withoutTenantId">
                and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -242,10 +242,10 @@
         )
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -256,46 +256,46 @@
   <select id="selectChannelDefinitionByDeploymentAndKey" parameterType="map" resultMap="channelDefinitionResultMap">
     select * 
     from ${prefix}FLW_CHANNEL_DEFINITION 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{channelDefinitionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
    <select id="selectChannelDefinitionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="channelDefinitionResultMap">
     select * 
     from ${prefix}FLW_CHANNEL_DEFINITION 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{channelDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectChannelDefinitionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="channelDefinitionResultMap">
     select *
     from ${prefix}FLW_CHANNEL_DEFINITION 
-    where KEY_ = #{parameter.channelDefinitionKey} and VERSION_ = #{parameter.eventVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.channelDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.eventVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
     
   
    <select id="selectChannelDefinitionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="channelDefinitionResultMap">
     select *
     from ${prefix}FLW_CHANNEL_DEFINITION 
-    where KEY_ = #{parameter.channelDefinitionKey} and VERSION_ = #{parameter.eventVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.channelDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.eventVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectLatestChannelDefinitionByKey" parameterType="string" resultMap="channelDefinitionResultMap">
     select *
     from ${prefix}FLW_CHANNEL_DEFINITION 
-    where KEY_ = #{channelDefinitionKey} and
+    where KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-          VERSION_ = (select max(VERSION_) from ${prefix}FLW_CHANNEL_DEFINITION where KEY_ = #{channelDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}FLW_CHANNEL_DEFINITION where KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
   
   <select id="selectLatestChannelDefinitionByKeyAndTenantId" parameterType="map" resultMap="channelDefinitionResultMap">
     select *
     from ${prefix}FLW_CHANNEL_DEFINITION 
-    where KEY_ = #{channelDefinitionKey} and
-          TENANT_ID_ = #{tenantId} and
-          VERSION_ = (select max(VERSION_) from ${prefix}FLW_CHANNEL_DEFINITION where KEY_ = #{channelDefinitionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=VARCHAR} and
+          VERSION_ = (select max(VERSION_) from ${prefix}FLW_CHANNEL_DEFINITION where KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR})
   </select>
   
   <select id="selectChannelDefinitionByNativeQuery" parameterType="java.util.Map" resultMap="channelDefinitionResultMap">
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDefinition.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDefinition.xml
index 7fc96d7c275..f60e3fd369b 100644
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDefinition.xml
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDefinition.xml
@@ -73,15 +73,15 @@
   <!-- DEFINITION DELETE -->
 
   <delete id="deleteEventDefinitionsByDeploymentId" parameterType="string">
-    delete from ${prefix}FLW_EVENT_DEFINITION where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}FLW_EVENT_DEFINITION where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR} 
   </delete>
   
   <!-- FORM DEFINITION RESULTMAP -->
 
   <resultMap id="eventDefinitionResultMap" type="org.flowable.eventregistry.impl.persistence.entity.EventDefinitionEntityImpl">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
+    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
     <result property="key" column="KEY_" jdbcType="VARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
     <result property="deploymentId" column="DEPLOYMENT_ID_" jdbcType="VARCHAR"/>
@@ -93,11 +93,11 @@
   <!-- DEFINITION SELECT -->
 
   <select id="selectEventDefinition" parameterType="string" resultMap="eventDefinitionResultMap">
-    select * from ${prefix}FLW_EVENT_DEFINITION where ID_ = #{eventDefinitionId, jdbcType=VARCHAR}
+    select * from ${prefix}FLW_EVENT_DEFINITION where ID_ = #{id, jdbcType=VARCHAR}
   </select>
 
   <select id="selectEventDefinitionById" parameterType="string" resultMap="eventDefinitionResultMap">
-    select * from ${prefix}FLW_EVENT_DEFINITION where ID_ = #{eventDefinitionId}
+    select * from ${prefix}FLW_EVENT_DEFINITION where ID_ = #{id, jdbcType=VARCHAR}
   </select>
 
   <select id="selectEventDefinitionsByQueryCriteria" parameterType="org.flowable.eventregistry.impl.EventDefinitionQueryImpl" resultMap="eventDefinitionResultMap">
@@ -117,81 +117,81 @@
     from ${prefix}FLW_EVENT_DEFINITION RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase}${wildcardEscapeClause})
+        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause})
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}
+        and RES.KEY_ like #{keyLike, jdbcType=VARCHAR}
       </if>
       <if test="keyLikeIgnoreCase != null">
-        and lower(RES.KEY_) like lower(#{keyLikeIgnoreCase}${wildcardEscapeClause})
+        and lower(RES.KEY_) like lower(#{keyLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause})
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=VARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=VARCHAR}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="parentDeploymentId != null">
-          and EXISTS (select 1 from ${prefix}FLW_EVENT_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId} and D.ID_ = RES.DEPLOYMENT_ID_)
+          and EXISTS (select 1 from ${prefix}FLW_EVENT_DEPLOYMENT D where D.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR} and D.ID_ = RES.DEPLOYMENT_ID_)
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}FLW_EVENT_DEFINITION where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
              </if>
              <if test="withoutTenantId">
                and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -202,10 +202,10 @@
         )
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -216,46 +216,46 @@
   <select id="selectEventDefinitionByDeploymentAndKey" parameterType="map" resultMap="eventDefinitionResultMap">
     select * 
     from ${prefix}FLW_EVENT_DEFINITION 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{eventDefinitionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
   
    <select id="selectEventDefinitionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="eventDefinitionResultMap">
     select * 
     from ${prefix}FLW_EVENT_DEFINITION 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{eventDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectEventDefinitionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="eventDefinitionResultMap">
     select *
     from ${prefix}FLW_EVENT_DEFINITION 
-    where KEY_ = #{parameter.eventDefinitionKey} and VERSION_ = #{parameter.eventVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.eventDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.eventVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
     
   
    <select id="selectEventDefinitionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="eventDefinitionResultMap">
     select *
     from ${prefix}FLW_EVENT_DEFINITION 
-    where KEY_ = #{parameter.eventDefinitionKey} and VERSION_ = #{parameter.eventVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.eventDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.eventVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
   </select>
     
   <select id="selectLatestEventDefinitionByKey" parameterType="string" resultMap="eventDefinitionResultMap">
     select *
     from ${prefix}FLW_EVENT_DEFINITION 
-    where KEY_ = #{eventDefinitionKey} and
+    where KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-          VERSION_ = (select max(VERSION_) from ${prefix}FLW_EVENT_DEFINITION where KEY_ = #{eventDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}FLW_EVENT_DEFINITION where KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
   
   <select id="selectLatestEventDefinitionByKeyAndTenantId" parameterType="map" resultMap="eventDefinitionResultMap">
     select *
     from ${prefix}FLW_EVENT_DEFINITION 
-    where KEY_ = #{eventDefinitionKey} and
-          TENANT_ID_ = #{tenantId} and
-          VERSION_ = (select max(VERSION_) from ${prefix}FLW_EVENT_DEFINITION where KEY_ = #{eventDefinitionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=VARCHAR} and
+          VERSION_ = (select max(VERSION_) from ${prefix}FLW_EVENT_DEFINITION where KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR})
   </select>
   
   <select id="selectEventDefinitionByNativeQuery" parameterType="java.util.Map" resultMap="eventDefinitionResultMap">
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDeployment.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDeployment.xml
index f580641bec9..ca3fb5fefa0 100644
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDeployment.xml
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventDeployment.xml
@@ -59,7 +59,7 @@
   <!-- DEPLOYMENT DELETE -->
   
   <delete id="deleteEventDeployment" parameterType="string">
-    delete from ${prefix}FLW_EVENT_DEPLOYMENT where ID_ = #{id}
+    delete from ${prefix}FLW_EVENT_DEPLOYMENT where ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <!-- DEPLOYMENT RESULTMAP -->
@@ -92,25 +92,25 @@
     from ${prefix}FLW_EVENT_DEPLOYMENT RES
     <where>
       <if test="deploymentId != null">
-        RES.ID_ = #{deploymentId}
+        RES.ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )  
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -118,28 +118,28 @@
       <if test="eventDefinitionKey != null || eventDefinitionKeyLike != null">
           and exists(select 1 from ${prefix}FLW_EVENT_DEFINITION EVENT where RES.ID_ = EVENT.DEPLOYMENT_ID_ 
         <if test="eventDefinitionKey != null">
-          and EVENT.KEY_ = #{eventDefinitionKey}
+          and EVENT.KEY_ = #{eventDefinitionKey, jdbcType=VARCHAR}
         </if>
         <if test="eventDefinitionKeyLike != null">
-          and EVENT.KEY_ like #{eventDefinitionKeyLike}
+          and EVENT.KEY_ like #{eventDefinitionKeyLike, jdbcType=VARCHAR}
         </if>
         )
       </if>
       <if test="channelDefinitionKey != null || channelDefinitionKeyLike != null">
           and exists(select 1 from ${prefix}FLW_CHANNEL_DEFINITION CHANNEL where RES.ID_ = CHANNEL.DEPLOYMENT_ID_ 
         <if test="channelDefinitionKey != null">
-          and CHANNEL.KEY_ = #{channelDefinitionKey}
+          and CHANNEL.KEY_ = #{channelDefinitionKey, jdbcType=VARCHAR}
         </if>
         <if test="channelDefinitionKeyLike != null">
-          and CHANNEL.KEY_ like #{channelDefinitionKeyLike}
+          and CHANNEL.KEY_ like #{channelDefinitionKeyLike, jdbcType=VARCHAR}
         </if>
         )
       </if>
       <if test="parentDeploymentId != null">
-        and RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId}
+        and RES.PARENT_DEPLOYMENT_ID_ = #{parentDeploymentId, jdbcType=VARCHAR}
       </if>
       <if test="parentDeploymentIdLike != null">
-        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike}
+        and RES.PARENT_DEPLOYMENT_ID_ like #{parentDeploymentIdLike, jdbcType=VARCHAR}
       </if>
     </where>
   </sql>
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventResource.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventResource.xml
index 1442c43f893..742934fd828 100644
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventResource.xml
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/entity/EventResource.xml
@@ -13,22 +13,22 @@
 
   <insert id="bulkInsertEventResource" parameterType="java.util.List">
     INSERT INTO ${prefix}FLW_EVENT_RESOURCE(ID_, NAME_, RESOURCE_BYTES_, DEPLOYMENT_ID_) VALUES 
-      <foreach collection="list" item="byteArr" index="index" separator=","> 
-        (#{byteArr.id, jdbcType=VARCHAR},
-         #{byteArr.name, jdbcType=VARCHAR},
-         #{byteArr.bytes, jdbcType=${blobType}},
-         #{byteArr.deploymentId, jdbcType=VARCHAR})
+      <foreach collection="list" item="eventResource" index="index" separator=","> 
+        (#{eventResource.id, jdbcType=VARCHAR},
+         #{eventResource.name, jdbcType=VARCHAR},
+         #{eventResource.bytes, jdbcType=${blobType}},
+         #{eventResource.deploymentId, jdbcType=VARCHAR})
       </foreach>
   </insert>
 
   <insert id="bulkInsertEventResource" databaseId="oracle" parameterType="java.util.List">
     INSERT ALL
-      <foreach collection="list" item="resource" index="index"> 
+      <foreach collection="list" item="eventResource" index="index"> 
         INTO ${prefix}FLW_EVENT_RESOURCE(ID_, NAME_, RESOURCE_BYTES_, DEPLOYMENT_ID_) VALUES 
-        (#{resource.id, jdbcType=VARCHAR},
-         #{resource.name, jdbcType=VARCHAR},
-         #{resource.bytes, jdbcType=${blobType}},
-         #{resource.deploymentId, jdbcType=VARCHAR})
+        (#{eventResource.id, jdbcType=VARCHAR},
+         #{eventResource.name, jdbcType=VARCHAR},
+         #{eventResource.bytes, jdbcType=${blobType}},
+         #{eventResource.deploymentId, jdbcType=VARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -46,11 +46,11 @@
   <!-- RESOURCE DELETE -->
   
   <delete id="deleteEventResource" parameterType="string">
-    delete from ${prefix}FLW_EVENT_RESOURCE where ID_ = #{id}
+    delete from ${prefix}FLW_EVENT_RESOURCE where ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <delete id="deleteEventResourcesByDeploymentId" parameterType="string">
-    delete from ${prefix}FLW_EVENT_RESOURCE where DEPLOYMENT_ID_ = #{id}
+    delete from ${prefix}FLW_EVENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR}
   </delete>
   
   <!-- RESOURCE RESULTMAP -->
@@ -64,17 +64,17 @@
   <!-- RESOURCE SELECT -->
 
   <select id="selectEventResourceNamesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
-    select NAME_ from ${prefix}FLW_EVENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select NAME_ from ${prefix}FLW_EVENT_RESOURCE where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <select id="selectEventResourceByDeploymentIdAndResourceName" parameterType="map" resultMap="eventResourceResultMap">
     select * from ${prefix}FLW_EVENT_RESOURCE 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-          AND NAME_ = #{resourceName}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+          AND NAME_ = #{resourceName, jdbcType=VARCHAR}
   </select>
 
   <select id="selectEventResourcesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="eventResourceResultMap">
-    select * from ${prefix}FLW_EVENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select * from ${prefix}FLW_EVENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
   
   <select id="selectEventResource" parameterType="string" resultMap="eventResourceResultMap">
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml
index 2375015b386..05ebe301d15 100644
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml
+++ b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml
@@ -13,24 +13,24 @@
     when none of the values in the discriminator match.
   -->
   <resultMap id="eventSubscriptionResultMap" type="org.flowable.eventsubscription.service.impl.persistence.entity.GenericEventSubscriptionEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="eventType" column="EVENT_TYPE_" jdbcType="VARCHAR" />
-    <result property="eventName" column="EVENT_NAME_" jdbcType="VARCHAR" />
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="activityId" column="ACTIVITY_ID_" jdbcType="VARCHAR" />
-    <result property="configuration" column="CONFIGURATION_" jdbcType="VARCHAR" />
+    <result property="eventType" column="EVENT_TYPE_" jdbcType="NVARCHAR" />
+    <result property="eventName" column="EVENT_NAME_" jdbcType="NVARCHAR" />
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="activityId" column="ACTIVITY_ID_" jdbcType="NVARCHAR" />
+    <result property="configuration" column="CONFIGURATION_" jdbcType="NVARCHAR" />
     <result property="created" column="CREATED_" jdbcType="TIMESTAMP" />   
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR" />
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR" />
-    <result property="scopeDefinitionKey" column="SCOPE_DEFINITION_KEY_" jdbcType="VARCHAR" />
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeDefinitionKey" column="SCOPE_DEFINITION_KEY_" jdbcType="NVARCHAR" />
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR" />
     <result property="lockTime" column="LOCK_TIME_" jdbcType="TIMESTAMP" />
-    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
     <discriminator javaType="string" column="EVENT_TYPE_">
       <case value="message" resultMap="messageResultMap"/> 
       <case value="signal" resultMap="signalResultMap"/> 
@@ -45,7 +45,7 @@
   <!-- SELECT -->  
 
   <select id="selectEventSubscription" parameterType="string" resultMap="eventSubscriptionResultMap">
-    select * from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectEventSubscriptionByQueryCriteria" parameterType="org.flowable.eventsubscription.service.impl.EventSubscriptionQueryImpl" resultMap="eventSubscriptionResultMap">
@@ -65,78 +65,78 @@
     from ${prefix}ACT_RU_EVENT_SUBSCR RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="eventType != null">
-        and RES.EVENT_TYPE_ = #{eventType}
+        and RES.EVENT_TYPE_ = #{eventType, jdbcType=NVARCHAR}
       </if>
       <if test="eventName != null">
-        and RES.EVENT_NAME_ = #{eventName}
+        and RES.EVENT_NAME_ = #{eventName, jdbcType=NVARCHAR}
       </if>
       <if test="executionId != null">
-        and RES.EXECUTION_ID_ = #{executionId}
+        and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceId != null">
-        and RES.PROC_INST_ID_ = #{processInstanceId}
+        and RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="withoutProcessInstanceId">
         and RES.PROC_INST_ID_ IS NULL
       </if>
       <if test="processDefinitionId != null">
-        and RES.PROC_DEF_ID_ = #{processDefinitionId}
+        and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="withoutProcessDefinitionId">
         and RES.PROC_DEF_ID_ IS NULL
       </if>
       <if test="activityId != null">
-        and RES.ACTIVITY_ID_ = #{activityId}
+        and RES.ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR}
       </if>
       <if test="subScopeId != null">
-        and RES.SUB_SCOPE_ID_ = #{subScopeId}
+        and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeId != null">
-        and RES.SCOPE_ID_ = #{scopeId}
+        and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
       </if>
       <if test="withoutScopeId">
         and RES.SCOPE_ID_ IS NULL
       </if>
       <if test="scopeDefinitionId != null">
-        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="withoutScopeDefinitionId">
         and RES.SCOPE_DEFINITION_ID_ IS NULL
       </if>
       <if test="scopeDefinitionKey != null">
-        and RES.SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey}
+        and RES.SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR}
       </if>
       <if test="scopeType != null">
-        and RES.SCOPE_TYPE_ = #{scopeType}
+        and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
       </if>
       <if test="createdBefore != null">
-		and RES.CREATED_ &lt; #{createdBefore}
+		and RES.CREATED_ &lt; #{createdBefore, jdbcType=TIMESTAMP}
 	  </if>
 	  <if test="createdAfter != null">
-		and RES.CREATED_ &gt; #{createdAfter}
+		and RES.CREATED_ &gt; #{createdAfter, jdbcType=TIMESTAMP}
 	  </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIds != null and !tenantIds.empty">
         and RES.TENANT_ID_ in
-        <foreach item="item" index="index" collection="tenantIds" open="(" separator="," close=")">
-            #{item}
+        <foreach item="tenantId" index="index" collection="tenantIds" open="(" separator="," close=")">
+            #{tenantId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>        
       <if test="configuration != null">
-          and RES.CONFIGURATION_ = #{configuration}
+          and RES.CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR}
       </if>
       <if test="configurations != null and !configurations.empty">
           and RES.CONFIGURATION_ in
-          <foreach item="item" index="index" collection="configurations" open="(" separator="," close=")">
-              #{item}
+          <foreach item="configuration" index="index" collection="configurations" open="(" separator="," close=")">
+              #{configuration, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="withoutConfiguration">
@@ -146,78 +146,78 @@
           and
           <trim prefix="(" prefixOverrides="OR" suffix=")">
               <if test="orQueryObject.id != null">
-                  RES.ID_ = #{orQueryObject.id}
+                  RES.ID_ = #{orQueryObject.id, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.eventType != null">
-                  or RES.EVENT_TYPE_ = #{orQueryObject.eventType}
+                  or RES.EVENT_TYPE_ = #{orQueryObject.eventType, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.eventName != null">
-                  or RES.EVENT_NAME_ = #{orQueryObject.eventName}
+                  or RES.EVENT_NAME_ = #{orQueryObject.eventName, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.executionId != null">
-                  or RES.EXECUTION_ID_ = #{orQueryObject.executionId}
+                  or RES.EXECUTION_ID_ = #{orQueryObject.executionId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.processInstanceId != null">
-                  or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId}
+                  or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.withoutProcessInstanceId">
                   or RES.PROC_INST_ID_ IS NULL
               </if>
               <if test="orQueryObject.processDefinitionId != null">
-                  or RES.PROC_DEF_ID_ = #{orQueryObject.processDefinitionId}
+                  or RES.PROC_DEF_ID_ = #{orQueryObject.processDefinitionId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.withoutProcessDefinitionId">
                   or RES.PROC_DEF_ID_ IS NULL
               </if>
               <if test="orQueryObject.activityId != null">
-                  or RES.ACTIVITY_ID_ = #{orQueryObject.activityId}
+                  or RES.ACTIVITY_ID_ = #{orQueryObject.activityId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.subScopeId != null">
-                  or RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId}
+                  or RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.scopeId != null">
-                  or RES.SCOPE_ID_ = #{orQueryObject.scopeId}
+                  or RES.SCOPE_ID_ = #{orQueryObject.scopeId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.withoutScopeId">
                   or RES.SCOPE_ID_ IS NULL
               </if>
               <if test="orQueryObject.scopeDefinitionId != null">
-                  or RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId}
+                  or RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.withoutScopeDefinitionId">
                   or RES.SCOPE_DEFINITION_ID_ IS NULL
               </if>
               <if test="orQueryObject.scopeDefinitionKey != null">
-                  or RES.SCOPE_DEFINITION_KEY_ = #{orQueryObject.scopeDefinitionKey}
+                  or RES.SCOPE_DEFINITION_KEY_ = #{orQueryObject.scopeDefinitionKey, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.scopeType != null">
-                  or RES.SCOPE_TYPE_ = #{orQueryObject.scopeType}
+                  or RES.SCOPE_TYPE_ = #{orQueryObject.scopeType, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.createdBefore != null">
-                  or RES.CREATED_ &lt; #{orQueryObject.createdBefore}
+                  or RES.CREATED_ &lt; #{orQueryObject.createdBefore, jdbcType=TIMESTAMP}
               </if>
               <if test="orQueryObject.createdAfter != null">
-                  or RES.CREATED_ &gt; #{orQueryObject.createdAfter}
+                  or RES.CREATED_ &gt; #{orQueryObject.createdAfter, jdbcType=TIMESTAMP}
               </if>
               <if test="orQueryObject.tenantId != null">
-                  or RES.TENANT_ID_ = #{orQueryObject.tenantId}
+                  or RES.TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.tenantIds != null and !orQueryObject.tenantIds.empty">
                   or RES.TENANT_ID_ in
-                  <foreach item="item" index="index" collection="orQueryObject.tenantIds" open="(" separator="," close=")">
-                      #{item}
+                  <foreach item="tenantId" index="index" collection="orQueryObject.tenantIds" open="(" separator="," close=")">
+                      #{tenantId, jdbcType=NVARCHAR}
                   </foreach>
               </if>
               <if test="orQueryObject.withoutTenantId">
                   or (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
               </if>
               <if test="orQueryObject.configuration != null">
-                  or RES.CONFIGURATION_ = #{orQueryObject.configuration}
+                  or RES.CONFIGURATION_ = #{orQueryObject.configuration, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.configurations != null and !orQueryObject.configurations.empty">
                   or RES.CONFIGURATION_ in
-                  <foreach item="item" index="index" collection="orQueryObject.configurations" open="(" separator="," close=")">
-                      #{item}
+                  <foreach item="configuration" index="index" collection="orQueryObject.configurations" open="(" separator="," close=")">
+                      #{configuration, jdbcType=NVARCHAR}
                   </foreach>
               </if>
               <if test="orQueryObject.withoutConfiguration">
@@ -232,8 +232,8 @@
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR EVT
     where (EVENT_TYPE_ = 'message')
-        and EVENT_NAME_ = #{parameter.eventName}  
-        and PROC_INST_ID_ = #{parameter.processInstanceId}
+        and EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR}  
+        and PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectSignalEventSubscriptionsByEventName" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
@@ -241,14 +241,14 @@
     from ${prefix}ACT_RU_EVENT_SUBSCR EVT
     left outer join ${prefix}ACT_RU_EXECUTION EXC on EVT.EXECUTION_ID_ = EXC.ID_
     where EVENT_TYPE_ = 'signal'
-      and EVENT_NAME_ = #{parameter.eventName}
+      and EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR}
       and (
        (EVT.EXECUTION_ID_ is null) 
        or 
        (EVT.EXECUTION_ID_ is not null AND EXC.SUSPENSION_STATE_ = 1) 
       )
     <if test="parameter.tenantId != null">
-        and EVT.TENANT_ID_ = #{parameter.tenantId}
+        and EVT.TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
     </if>  
     <if test="parameter.tenantId == null">
         and (EVT.TENANT_ID_ = '' or EVT.TENANT_ID_ is null)
@@ -259,67 +259,67 @@
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR EVT
     where (EVENT_TYPE_ = 'signal')
-        and EVENT_NAME_ = #{parameter.eventName}  
-        and PROC_INST_ID_ = #{parameter.processInstanceId}
+        and EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR}  
+        and PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectSignalEventSubscriptionsByScopeAndEventName" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR EVT
     where (EVENT_TYPE_ = 'signal')
-        and EVENT_NAME_ = #{parameter.eventName}  
-        and SCOPE_ID_ = #{parameter.scopeId}
-        and SCOPE_TYPE_ = #{parameter.scopeType}
+        and EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR}  
+        and SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR}
+        and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select> 
   
   <select id="selectSignalEventSubscriptionsByNameAndExecution" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
     where (EVENT_TYPE_ = 'signal')
-    	and (EXECUTION_ID_ = #{parameter.executionId})
-    	and (EVENT_NAME_ = #{parameter.eventName})
+    	and (EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR})
+    	and (EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsByExecution" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EXECUTION_ID_ = #{parameter})
+    where (EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR})
   </select>
       
   <select id="selectEventSubscriptionsByExecutionAndType" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (EXECUTION_ID_ = #{parameter.executionId})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsByProcessInstanceAndType" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (PROC_INST_ID_ = #{parameter.processInstanceId})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsByExecutionTypeAndActivity" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (EXECUTION_ID_ = #{parameter.executionId})
-    	and (ACTIVITY_ID_ = #{parameter.activityId})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR})
+    	and (ACTIVITY_ID_ = #{parameter.activityId, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsByProcessInstanceTypeAndActivity" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (PROC_INST_ID_ = #{parameter.processInstanceId})
-    	and (ACTIVITY_ID_ = #{parameter.activityId})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR})
+    	and (ACTIVITY_ID_ = #{parameter.activityId, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsBySubScopeId" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (SUB_SCOPE_ID_ = #{parameter})
+    where (SUB_SCOPE_ID_ = #{parameter, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsByTypeAndProcessDefinitionId" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
@@ -327,13 +327,13 @@
     from ${prefix}ACT_RU_EVENT_SUBSCR
     <where>
       <if test="parameter.eventType != null">
-        (EVENT_TYPE_ = #{parameter.eventType})
+        (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
       </if>
-        and PROC_DEF_ID_ = #{parameter.processDefinitionId}
+        and PROC_DEF_ID_ = #{parameter.processDefinitionId, jdbcType=NVARCHAR}
         and EXECUTION_ID_ is null 
         and PROC_INST_ID_ is null
        <if test="parameter.tenantId != null">
-          and TENANT_ID_ = #{parameter.tenantId}
+          and TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
       </if>  
       <if test="parameter.tenantId == null">
           and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -344,17 +344,17 @@
   <select id="selectEventSubscriptionsByScopeIdAndType" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (SCOPE_ID_ = #{parameter.scopeId})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR})
   </select>
   
   <select id="selectEventSubscriptionsByName" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (EVENT_NAME_ = #{parameter.eventName})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR})
     <if test="parameter.tenantId != null">
-        and TENANT_ID_ = #{parameter.tenantId}
+        and TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
     </if>  
     <if test="parameter.tenantId == null">
         and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -364,19 +364,19 @@
   <select id="selectEventSubscriptionsByNameAndExecution" resultMap="eventSubscriptionResultMap" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
-    where (EVENT_TYPE_ = #{parameter.eventType})
-    	and (EVENT_NAME_ = #{parameter.eventName})
-    	and (EXECUTION_ID_ = #{parameter.executionId})
+    where (EVENT_TYPE_ = #{parameter.eventType, jdbcType=NVARCHAR})
+    	and (EVENT_NAME_ = #{parameter.eventName, jdbcType=NVARCHAR})
+    	and (EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR})
   </select>
   
    <select id="selectMessageStartEventSubscriptionByName" resultMap="eventSubscriptionResultMap" parameterType="map">
     select * 
     from ${prefix}ACT_RU_EVENT_SUBSCR
     where (EVENT_TYPE_ = 'message')
-    	and (EVENT_NAME_ = #{eventName})
+    	and (EVENT_NAME_ = #{eventName, jdbcType=NVARCHAR})
     	and EXECUTION_ID_ is null
     <if test="tenantId != null">
-        and TENANT_ID_ = #{tenantId}
+        and TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
     </if>  
     <if test="tenantId == null">
         and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -404,21 +404,21 @@
             SCOPE_TYPE_,
            	TENANT_ID_
     )
-    values (#{id, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
             1, 'message',
-            #{eventName, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{activityId, jdbcType=VARCHAR},
-            #{configuration, jdbcType=VARCHAR},
+            #{eventName, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{activityId, jdbcType=NVARCHAR},
+            #{configuration, jdbcType=NVARCHAR},
             #{created, jdbcType=TIMESTAMP},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{scopeDefinitionKey, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{tenantId, jdbcType=VARCHAR}
+            #{processDefinitionId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{scopeDefinitionKey, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{tenantId, jdbcType=NVARCHAR}
     )
   </insert>
   
@@ -443,21 +443,21 @@
     )
     values 
       <foreach collection="list" item="messageEventSubscription" index="index" separator=",">
-          (#{messageEventSubscription.id, jdbcType=VARCHAR},
-           1, #{messageEventSubscription.eventType, jdbcType=VARCHAR},
-           #{messageEventSubscription.eventName, jdbcType=VARCHAR},
-           #{messageEventSubscription.executionId, jdbcType=VARCHAR},
-           #{messageEventSubscription.processInstanceId, jdbcType=VARCHAR},
-           #{messageEventSubscription.activityId, jdbcType=VARCHAR},
-           #{messageEventSubscription.configuration, jdbcType=VARCHAR},
+          (#{messageEventSubscription.id, jdbcType=NVARCHAR},
+           1, #{messageEventSubscription.eventType, jdbcType=NVARCHAR},
+           #{messageEventSubscription.eventName, jdbcType=NVARCHAR},
+           #{messageEventSubscription.executionId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.processInstanceId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.activityId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.configuration, jdbcType=NVARCHAR},
            #{messageEventSubscription.created, jdbcType=TIMESTAMP},
-           #{messageEventSubscription.processDefinitionId, jdbcType=VARCHAR},
-           #{messageEventSubscription.subScopeId, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeId, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeType, jdbcType=VARCHAR},
-           #{messageEventSubscription.tenantId, jdbcType=VARCHAR})
+           #{messageEventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.subScopeId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeType, jdbcType=NVARCHAR},
+           #{messageEventSubscription.tenantId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
   
@@ -482,21 +482,21 @@
             SCOPE_TYPE_,
             TENANT_ID_
           ) VALUES 
-          (#{messageEventSubscription.id, jdbcType=VARCHAR},
-           1, #{messageEventSubscription.eventType, jdbcType=VARCHAR},
-           #{messageEventSubscription.eventName, jdbcType=VARCHAR},
-           #{messageEventSubscription.executionId, jdbcType=VARCHAR},
-           #{messageEventSubscription.processInstanceId, jdbcType=VARCHAR},
-           #{messageEventSubscription.activityId, jdbcType=VARCHAR},
-           #{messageEventSubscription.configuration, jdbcType=VARCHAR},
+          (#{messageEventSubscription.id, jdbcType=NVARCHAR},
+           1, #{messageEventSubscription.eventType, jdbcType=NVARCHAR},
+           #{messageEventSubscription.eventName, jdbcType=NVARCHAR},
+           #{messageEventSubscription.executionId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.processInstanceId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.activityId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.configuration, jdbcType=NVARCHAR},
            #{messageEventSubscription.created, jdbcType=TIMESTAMP},
-           #{messageEventSubscription.processDefinitionId, jdbcType=VARCHAR},
-           #{messageEventSubscription.subScopeId, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeId, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-           #{messageEventSubscription.scopeType, jdbcType=VARCHAR},
-           #{messageEventSubscription.tenantId, jdbcType=VARCHAR})
+           #{messageEventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.subScopeId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+           #{messageEventSubscription.scopeType, jdbcType=NVARCHAR},
+           #{messageEventSubscription.tenantId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -508,52 +508,52 @@
     <set>
        REV_ =  #{revisionNext, jdbcType=INTEGER},
        <if test="originalPersistentState.eventName != eventName">
-           EVENT_NAME_ = #{eventName, jdbcType=VARCHAR},
+           EVENT_NAME_ = #{eventName, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.executionId != executionId">
-           EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+           EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.processInstanceId != processInstanceId">
-           PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR},
+           PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.activityId != activityId">
-           ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR},
+           ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.configuration != configuration">
-           CONFIGURATION_ = #{configuration, jdbcType=VARCHAR},  
+           CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR},  
       </if>
       <if test="originalPersistentState.created != created">
            CREATED_ = #{created, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-           PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+           PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.subScopeId != subScopeId">
-           SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+           SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeId != scopeId">
-           SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+           SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-           SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+           SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionKey != scopeDefinitionKey">
-           SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=VARCHAR},
+           SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeType != scopeType">
-           SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+           SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.lockOwner != lockOwner">
-           LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+           LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.lockTime != lockTime">
            LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.tenantId != tenantId">
-           TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
+           TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
       </if>
     </set>
-    where ID_= #{id, jdbcType=VARCHAR}
+    where ID_= #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
@@ -578,21 +578,21 @@
             SCOPE_TYPE_,
            	TENANT_ID_
     )
-    values (#{id, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
             1, 'signal',
-            #{eventName, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{activityId, jdbcType=VARCHAR},
-            #{configuration, jdbcType=VARCHAR},
+            #{eventName, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{activityId, jdbcType=NVARCHAR},
+            #{configuration, jdbcType=NVARCHAR},
             #{created, jdbcType=TIMESTAMP},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{scopeDefinitionKey, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{tenantId, jdbcType=VARCHAR}         
+            #{processDefinitionId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{scopeDefinitionKey, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{tenantId, jdbcType=NVARCHAR}         
     )
   </insert>
   
@@ -617,21 +617,21 @@
     )
     values 
       <foreach collection="list" item="signalEventSubscription" index="index" separator=",">
-        (#{signalEventSubscription.id, jdbcType=VARCHAR},
-         1, #{signalEventSubscription.eventType, jdbcType=VARCHAR},
-         #{signalEventSubscription.eventName, jdbcType=VARCHAR},
-         #{signalEventSubscription.executionId, jdbcType=VARCHAR},
-         #{signalEventSubscription.processInstanceId, jdbcType=VARCHAR},
-         #{signalEventSubscription.activityId, jdbcType=VARCHAR},
-         #{signalEventSubscription.configuration, jdbcType=VARCHAR},
+        (#{signalEventSubscription.id, jdbcType=NVARCHAR},
+         1, #{signalEventSubscription.eventType, jdbcType=NVARCHAR},
+         #{signalEventSubscription.eventName, jdbcType=NVARCHAR},
+         #{signalEventSubscription.executionId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.processInstanceId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.activityId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.configuration, jdbcType=NVARCHAR},
          #{signalEventSubscription.created, jdbcType=TIMESTAMP},
-         #{signalEventSubscription.processDefinitionId, jdbcType=VARCHAR},
-         #{signalEventSubscription.subScopeId, jdbcType=VARCHAR},
-         #{signalEventSubscription.scopeId, jdbcType=VARCHAR},
-         #{signalEventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-         #{signalEventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-         #{signalEventSubscription.scopeType, jdbcType=VARCHAR},
-         #{signalEventSubscription.tenantId, jdbcType=VARCHAR})
+         #{signalEventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.subScopeId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.scopeId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+         #{signalEventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+         #{signalEventSubscription.scopeType, jdbcType=NVARCHAR},
+         #{signalEventSubscription.tenantId, jdbcType=NVARCHAR})
      </foreach>
   </insert>
 
@@ -657,21 +657,21 @@
           TENANT_ID_
           )
           VALUES 
-          (#{signalEventSubscription.id, jdbcType=VARCHAR},
-           1, #{signalEventSubscription.eventType, jdbcType=VARCHAR},
-           #{signalEventSubscription.eventName, jdbcType=VARCHAR},
-           #{signalEventSubscription.executionId, jdbcType=VARCHAR},
-           #{signalEventSubscription.processInstanceId, jdbcType=VARCHAR},
-           #{signalEventSubscription.activityId, jdbcType=VARCHAR},
-           #{signalEventSubscription.configuration, jdbcType=VARCHAR},
+          (#{signalEventSubscription.id, jdbcType=NVARCHAR},
+           1, #{signalEventSubscription.eventType, jdbcType=NVARCHAR},
+           #{signalEventSubscription.eventName, jdbcType=NVARCHAR},
+           #{signalEventSubscription.executionId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.processInstanceId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.activityId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.configuration, jdbcType=NVARCHAR},
            #{signalEventSubscription.created, jdbcType=TIMESTAMP},
-           #{signalEventSubscription.processDefinitionId, jdbcType=VARCHAR},
-           #{signalEventSubscription.subScopeId, jdbcType=VARCHAR},
-           #{signalEventSubscription.scopeId, jdbcType=VARCHAR},
-           #{signalEventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-           #{signalEventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-           #{signalEventSubscription.scopeType, jdbcType=VARCHAR},
-           #{signalEventSubscription.tenantId, jdbcType=VARCHAR})
+           #{signalEventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.subScopeId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.scopeId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+           #{signalEventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+           #{signalEventSubscription.scopeType, jdbcType=NVARCHAR},
+           #{signalEventSubscription.tenantId, jdbcType=NVARCHAR})
      </foreach>
     SELECT * FROM dual
   </insert>
@@ -683,49 +683,49 @@
     <set>
        REV_ =  #{revisionNext, jdbcType=INTEGER},
        <if test="originalPersistentState.eventName != eventName">
-           EVENT_NAME_ = #{eventName, jdbcType=VARCHAR},
+           EVENT_NAME_ = #{eventName, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.executionId != executionId">
-           EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+           EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.processInstanceId != processInstanceId">
-           PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR},
+           PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.activityId != activityId">
-           ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR},
+           ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.configuration != configuration">
-           CONFIGURATION_ = #{configuration, jdbcType=VARCHAR},  
+           CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR},  
       </if>
       <if test="originalPersistentState.subScopeId != subScopeId">
-           SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+           SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeId != scopeId">
-           SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+           SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-           SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+           SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionKey != scopeDefinitionKey">
-           SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=VARCHAR},
+           SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeType != scopeType">
-           SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+           SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.created != created">
            CREATED_ = #{created, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.lockOwner != lockOwner">
-           LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+           LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.lockTime != lockTime">
            LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.tenantId != tenantId">
-           TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+           TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
     </set>
-    where ID_= #{id, jdbcType=VARCHAR}
+    where ID_= #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
@@ -750,21 +750,21 @@
             SCOPE_TYPE_,
            	TENANT_ID_
     )
-    values (#{id, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
             1, 'compensate',
-            #{eventName, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{activityId, jdbcType=VARCHAR},
-            #{configuration, jdbcType=VARCHAR},
+            #{eventName, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{activityId, jdbcType=NVARCHAR},
+            #{configuration, jdbcType=NVARCHAR},
             #{created, jdbcType=TIMESTAMP},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{scopeDefinitionKey, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{tenantId, jdbcType=VARCHAR}
+            #{processDefinitionId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{scopeDefinitionKey, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{tenantId, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -789,21 +789,21 @@
     )
     values 
       <foreach collection="list" item="compensateEventSubscription" index="index" separator=",">
-        (#{compensateEventSubscription.id, jdbcType=VARCHAR},
-         1, #{compensateEventSubscription.eventType, jdbcType=VARCHAR},
-         #{compensateEventSubscription.eventName, jdbcType=VARCHAR},
-         #{compensateEventSubscription.executionId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.processInstanceId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.activityId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.configuration, jdbcType=VARCHAR},
+        (#{compensateEventSubscription.id, jdbcType=NVARCHAR},
+         1, #{compensateEventSubscription.eventType, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.eventName, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.executionId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.processInstanceId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.activityId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.configuration, jdbcType=NVARCHAR},
          #{compensateEventSubscription.created, jdbcType=TIMESTAMP},
-         #{compensateEventSubscription.processDefinitionId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.subScopeId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeType, jdbcType=VARCHAR},
-         #{compensateEventSubscription.tenantId, jdbcType=VARCHAR})
+         #{compensateEventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.subScopeId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeType, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.tenantId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -829,21 +829,21 @@
           TENANT_ID_
         )
         VALUES
-        (#{compensateEventSubscription.id, jdbcType=VARCHAR},
-         1, #{compensateEventSubscription.eventType, jdbcType=VARCHAR},
-         #{compensateEventSubscription.eventName, jdbcType=VARCHAR},
-         #{compensateEventSubscription.executionId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.processInstanceId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.activityId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.configuration, jdbcType=VARCHAR},
+        (#{compensateEventSubscription.id, jdbcType=NVARCHAR},
+         1, #{compensateEventSubscription.eventType, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.eventName, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.executionId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.processInstanceId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.activityId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.configuration, jdbcType=NVARCHAR},
          #{compensateEventSubscription.created, jdbcType=TIMESTAMP},
-         #{compensateEventSubscription.processDefinitionId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.subScopeId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-         #{compensateEventSubscription.scopeType, jdbcType=VARCHAR},
-         #{compensateEventSubscription.tenantId, jdbcType=VARCHAR})
+         #{compensateEventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.subScopeId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.scopeType, jdbcType=NVARCHAR},
+         #{compensateEventSubscription.tenantId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -855,49 +855,49 @@
     <set>
        REV_ =  #{revisionNext, jdbcType=INTEGER},
        <if test="originalPersistentState.eventName != eventName">
-           EVENT_NAME_ = #{eventName, jdbcType=VARCHAR},
+           EVENT_NAME_ = #{eventName, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.executionId != executionId">
-           EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+           EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.processInstanceId != processInstanceId">
-           PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR},
+           PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.activityId != activityId">
-           ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR},
+           ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.configuration != configuration">
-           CONFIGURATION_ = #{configuration, jdbcType=VARCHAR},  
+           CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR},  
       </if>
       <if test="originalPersistentState.subScopeId != subScopeId">
-           SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+           SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeId != scopeId">
-           SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+           SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-           SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+           SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionKey != scopeDefinitionKey">
-           SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=VARCHAR},
+           SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeType != scopeType">
-           SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+           SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.created != created">
            CREATED_ = #{created, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.lockOwner != lockOwner">
-           LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+           LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.lockTime != lockTime">
            LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.tenantId != tenantId">
-           TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+           TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
     </set>
-    where ID_= #{id, jdbcType=VARCHAR}
+    where ID_= #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
@@ -922,21 +922,21 @@
             SCOPE_TYPE_,
            	TENANT_ID_
     )
-    values (#{id, jdbcType=VARCHAR},
-            1, #{eventType, jdbcType=VARCHAR},
-            #{eventName, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{activityId, jdbcType=VARCHAR},
-            #{configuration, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
+            1, #{eventType, jdbcType=NVARCHAR},
+            #{eventName, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{activityId, jdbcType=NVARCHAR},
+            #{configuration, jdbcType=NVARCHAR},
             #{created, jdbcType=TIMESTAMP},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{scopeDefinitionKey, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{tenantId, jdbcType=VARCHAR}
+            #{processDefinitionId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{scopeDefinitionKey, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{tenantId, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -961,21 +961,21 @@
         )
         values
         <foreach collection="list" item="eventSubscription" index="index" separator=",">
-            (#{eventSubscription.id, jdbcType=VARCHAR},
-            1, #{eventSubscription.eventType, jdbcType=VARCHAR},
-            #{eventSubscription.eventName, jdbcType=VARCHAR},
-            #{eventSubscription.executionId, jdbcType=VARCHAR},
-            #{eventSubscription.processInstanceId, jdbcType=VARCHAR},
-            #{eventSubscription.activityId, jdbcType=VARCHAR},
-            #{eventSubscription.configuration, jdbcType=VARCHAR},
+            (#{eventSubscription.id, jdbcType=NVARCHAR},
+            1, #{eventSubscription.eventType, jdbcType=NVARCHAR},
+            #{eventSubscription.eventName, jdbcType=NVARCHAR},
+            #{eventSubscription.executionId, jdbcType=NVARCHAR},
+            #{eventSubscription.processInstanceId, jdbcType=NVARCHAR},
+            #{eventSubscription.activityId, jdbcType=NVARCHAR},
+            #{eventSubscription.configuration, jdbcType=NVARCHAR},
             #{eventSubscription.created, jdbcType=TIMESTAMP},
-            #{eventSubscription.processDefinitionId, jdbcType=VARCHAR},
-            #{eventSubscription.subScopeId, jdbcType=VARCHAR},
-            #{eventSubscription.scopeId, jdbcType=VARCHAR},
-            #{eventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-            #{eventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-            #{eventSubscription.scopeType, jdbcType=VARCHAR},
-            #{eventSubscription.tenantId, jdbcType=VARCHAR})
+            #{eventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+            #{eventSubscription.subScopeId, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeId, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeType, jdbcType=NVARCHAR},
+            #{eventSubscription.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
@@ -1001,21 +1001,21 @@
             TENANT_ID_
             )
             VALUES
-            (#{eventSubscription.id, jdbcType=VARCHAR},
-            1, #{eventSubscription.eventType, jdbcType=VARCHAR},
-            #{eventSubscription.eventName, jdbcType=VARCHAR},
-            #{eventSubscription.executionId, jdbcType=VARCHAR},
-            #{eventSubscription.processInstanceId, jdbcType=VARCHAR},
-            #{eventSubscription.activityId, jdbcType=VARCHAR},
-            #{eventSubscription.configuration, jdbcType=VARCHAR},
+            (#{eventSubscription.id, jdbcType=NVARCHAR},
+            1, #{eventSubscription.eventType, jdbcType=NVARCHAR},
+            #{eventSubscription.eventName, jdbcType=NVARCHAR},
+            #{eventSubscription.executionId, jdbcType=NVARCHAR},
+            #{eventSubscription.processInstanceId, jdbcType=NVARCHAR},
+            #{eventSubscription.activityId, jdbcType=NVARCHAR},
+            #{eventSubscription.configuration, jdbcType=NVARCHAR},
             #{eventSubscription.created, jdbcType=TIMESTAMP},
-            #{eventSubscription.processDefinitionId, jdbcType=VARCHAR},
-            #{eventSubscription.subScopeId, jdbcType=VARCHAR},
-            #{eventSubscription.scopeId, jdbcType=VARCHAR},
-            #{eventSubscription.scopeDefinitionId, jdbcType=VARCHAR},
-            #{eventSubscription.scopeDefinitionKey, jdbcType=VARCHAR},
-            #{eventSubscription.scopeType, jdbcType=VARCHAR},
-            #{eventSubscription.tenantId, jdbcType=VARCHAR})
+            #{eventSubscription.processDefinitionId, jdbcType=NVARCHAR},
+            #{eventSubscription.subScopeId, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeId, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeDefinitionKey, jdbcType=NVARCHAR},
+            #{eventSubscription.scopeType, jdbcType=NVARCHAR},
+            #{eventSubscription.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -1027,52 +1027,52 @@
         <set>
             REV_ =  #{revisionNext, jdbcType=INTEGER},
             <if test="originalPersistentState.eventName != eventName">
-                EVENT_NAME_ = #{eventName, jdbcType=VARCHAR},
+                EVENT_NAME_ = #{eventName, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.eventType != eventType">
-                EVENT_TYPE_ = #{eventType, jdbcType=VARCHAR},
+                EVENT_TYPE_ = #{eventType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.executionId != executionId">
-                EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+                EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.processInstanceId != processInstanceId">
-                PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR},
+                PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.activityId != activityId">
-                ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR},
+                ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.configuration != configuration">
-                CONFIGURATION_ = #{configuration, jdbcType=VARCHAR},
+                CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.subScopeId != subScopeId">
-                SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+                SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeId != scopeId">
-                SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+                SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-                SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+                SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeDefinitionKey != scopeDefinitionKey">
-                SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=VARCHAR},
+                SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeType != scopeType">
-                SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+                SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.created != created">
                 CREATED_ = #{created, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.lockOwner != lockOwner">
-                LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+                LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.lockTime != lockTime">
                 LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.tenantId != tenantId">
-                TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+                TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
@@ -1080,36 +1080,36 @@
    <update id="updateTenantIdOfEventSubscriptions" parameterType="map">
     update ${prefix}ACT_RU_EVENT_SUBSCR
     <set>
-      TENANT_ID_ = #{newTenantId, jdbcType=VARCHAR}
+      TENANT_ID_ = #{newTenantId, jdbcType=NVARCHAR}
     </set>
-    where TENANT_ID_ = #{oldTenantId, jdbcType=VARCHAR}
+    where TENANT_ID_ = #{oldTenantId, jdbcType=NVARCHAR}
   </update>
 
  <!-- process definition id update -->
    <update id="updateManualProcessStartEventSubscriptionWithProcessDefinitionId" parameterType="map">
     update ${prefix}ACT_RU_EVENT_SUBSCR
-    set PROC_DEF_ID_ = #{newProcessDefinitionId, jdbcType=VARCHAR}
-    where PROC_DEF_ID_ = #{oldProcessDefinitionId, jdbcType=VARCHAR}
-    and EVENT_TYPE_ = #{eventType, jdbcType=VARCHAR}
-    and ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR}
+    set PROC_DEF_ID_ = #{newProcessDefinitionId, jdbcType=NVARCHAR}
+    where PROC_DEF_ID_ = #{oldProcessDefinitionId, jdbcType=NVARCHAR}
+    and EVENT_TYPE_ = #{eventType, jdbcType=NVARCHAR}
+    and ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR}
     <if test="scopeDefinitionKey != null">
-        and SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=VARCHAR}
+        and SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR}
     </if>
     <if test="configuration != null">
-        and CONFIGURATION_ = #{configuration, jdbcType=VARCHAR}
+        and CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR}
     </if>
    </update> <!-- process definition id update -->
 
    <update id="updateManualScopeStartEventSubscriptionWithScopeDefinitionId" parameterType="map">
     update ${prefix}ACT_RU_EVENT_SUBSCR
-    set SCOPE_DEFINITION_ID_ = #{newScopeDefinitionId, jdbcType=VARCHAR}
-    where SCOPE_DEFINITION_ID_ = #{oldScopeDefinitionId, jdbcType=VARCHAR}
-    and EVENT_TYPE_ = #{eventType, jdbcType=VARCHAR}
+    set SCOPE_DEFINITION_ID_ = #{newScopeDefinitionId, jdbcType=NVARCHAR}
+    where SCOPE_DEFINITION_ID_ = #{oldScopeDefinitionId, jdbcType=NVARCHAR}
+    and EVENT_TYPE_ = #{eventType, jdbcType=NVARCHAR}
     <if test="scopeDefinitionKey != null">
-        and SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=VARCHAR}
+        and SCOPE_DEFINITION_KEY_ = #{scopeDefinitionKey, jdbcType=NVARCHAR}
     </if>
     <if test="configuration != null">
-        and CONFIGURATION_ = #{configuration, jdbcType=VARCHAR}
+        and CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR}
     </if>
    </update>
 
@@ -1117,9 +1117,9 @@
     update ${prefix}ACT_RU_EVENT_SUBSCR
     set
         LOCK_TIME_ = #{lockTime, jdbcType=TIMESTAMP},
-        LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}
-    where ID_ = #{id}
-    and (LOCK_TIME_ is null OR LOCK_TIME_ &lt; #{currentTime})
+        LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}
+    where ID_ = #{id, jdbcType=NVARCHAR}
+    and (LOCK_TIME_ is null OR LOCK_TIME_ &lt; #{currentTime, jdbcType=TIMESTAMP})
   </update>
 
   <update id="clearEventSubscriptionLockTime" parameterType="java.util.Map">
@@ -1127,70 +1127,70 @@
     set
         LOCK_TIME_ = null,
         LOCK_OWNER_ = null
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
   </update>
 
   <!-- DELETE -->
 
   <delete id="deleteSignalEventSubscription" parameterType="org.flowable.eventsubscription.service.impl.persistence.entity.EventSubscriptionEntityImpl">
-    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <delete id="deleteCompensateEventSubscription" parameterType="org.flowable.eventsubscription.service.impl.persistence.entity.EventSubscriptionEntityImpl">
-    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <delete id="deleteMessageEventSubscription" parameterType="org.flowable.eventsubscription.service.impl.persistence.entity.EventSubscriptionEntityImpl">
-    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <delete id="deleteGenericEventSubscription" parameterType="org.flowable.eventsubscription.service.impl.persistence.entity.GenericEventSubscriptionEntityImpl">
-    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RU_EVENT_SUBSCR where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <delete id="deleteEventSubscriptionsForProcessDefinition" parameterType="string">
     delete from ${prefix}ACT_RU_EVENT_SUBSCR 
-    where PROC_DEF_ID_ = #{processDefinitionId} 
+    where PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR} 
     and EXECUTION_ID_ is null
     and PROC_INST_ID_ is null
   </delete>
   
   <delete id="deleteEventSubscriptionsByExecutionId" parameterType="string">
-     delete from ${prefix}ACT_RU_EVENT_SUBSCR where EXECUTION_ID_ = #{id}
+     delete from ${prefix}ACT_RU_EVENT_SUBSCR where EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteEventSubscriptionsForScopeIdAndType" parameterType="map">
-     delete from ${prefix}ACT_RU_EVENT_SUBSCR where SCOPE_ID_ = #{scopeId} and SCOPE_TYPE_ = #{scopeType}
+     delete from ${prefix}ACT_RU_EVENT_SUBSCR where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteEventSubscriptionsForScopeDefinitionIdAndType" parameterType="map">
-     delete from ${prefix}ACT_RU_EVENT_SUBSCR where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId} and SCOPE_TYPE_ = #{scopeType}
+     delete from ${prefix}ACT_RU_EVENT_SUBSCR where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteEventSubscriptionsForScopeDefinitionIdAndTypeAndNullScopeId" parameterType="map">
      delete from ${prefix}ACT_RU_EVENT_SUBSCR where
-     SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
-     and SCOPE_TYPE_ = #{scopeType}
+     SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
+     and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
      and SCOPE_ID_ is null
   </delete>
 
  <!-- delete manual subscriptions for process start -->
   <delete id="deleteManualProcessStartEventSubscriptions" parameterType="map">
     delete from ${prefix}ACT_RU_EVENT_SUBSCR where
-    PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR}
-    and EVENT_TYPE_ = #{eventType, jdbcType=VARCHAR}
-    and ACTIVITY_ID_ = #{activityId, jdbcType=VARCHAR}
+    PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
+    and EVENT_TYPE_ = #{eventType, jdbcType=NVARCHAR}
+    and ACTIVITY_ID_ = #{activityId, jdbcType=NVARCHAR}
     <if test="configuration != null">
-        and CONFIGURATION_ = #{configuration, jdbcType=VARCHAR}
+        and CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR}
     </if>
   </delete>
 
   <delete id="deleteManualScopeStartEventSubscriptions" parameterType="map">
     delete from ${prefix}ACT_RU_EVENT_SUBSCR where
-    SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR}
-    and EVENT_TYPE_ = #{eventType, jdbcType=VARCHAR}
+    SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
+    and EVENT_TYPE_ = #{eventType, jdbcType=NVARCHAR}
     <if test="configuration != null">
-        and CONFIGURATION_ = #{configuration, jdbcType=VARCHAR}
+        and CONFIGURATION_ = #{configuration, jdbcType=NVARCHAR}
     </if>
   </delete>
 
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/HistoricIdentityLink.xml b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/HistoricIdentityLink.xml
index 6289e41ca4e..a1ad5bb86c1 100644
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/HistoricIdentityLink.xml
+++ b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/HistoricIdentityLink.xml
@@ -22,16 +22,16 @@
   
   <insert id="insertHistoricIdentityLink" parameterType="org.flowable.identitylink.service.impl.persistence.entity.HistoricIdentityLinkEntityImpl">
     insert into ${prefix}ACT_HI_IDENTITYLINK (ID_, TYPE_, USER_ID_, GROUP_ID_, TASK_ID_, PROC_INST_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, CREATE_TIME_)
-    values (#{id, jdbcType=VARCHAR},
-            #{type, jdbcType=VARCHAR},
-            #{userId, jdbcType=VARCHAR},
-            #{groupId, jdbcType=VARCHAR},
-            #{taskId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
+            #{type, jdbcType=NVARCHAR},
+            #{userId, jdbcType=NVARCHAR},
+            #{groupId, jdbcType=NVARCHAR},
+            #{taskId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
             #{createTime, jdbcType=TIMESTAMP})
   </insert>
   
@@ -39,16 +39,16 @@
     insert into ${prefix}ACT_HI_IDENTITYLINK (ID_, TYPE_, USER_ID_, GROUP_ID_, TASK_ID_, PROC_INST_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, CREATE_TIME_)
     values 
       <foreach collection="list" item="historicIdentityLink" index="index" separator=",">
-        (#{historicIdentityLink.id, jdbcType=VARCHAR},
-         #{historicIdentityLink.type, jdbcType=VARCHAR},
-         #{historicIdentityLink.userId, jdbcType=VARCHAR},
-         #{historicIdentityLink.groupId, jdbcType=VARCHAR},
-         #{historicIdentityLink.taskId, jdbcType=VARCHAR},
-         #{historicIdentityLink.processInstanceId, jdbcType=VARCHAR},
-         #{historicIdentityLink.scopeId, jdbcType=VARCHAR},
-         #{historicIdentityLink.subScopeId, jdbcType=VARCHAR},
-         #{historicIdentityLink.scopeType, jdbcType=VARCHAR},
-         #{historicIdentityLink.scopeDefinitionId, jdbcType=VARCHAR},
+        (#{historicIdentityLink.id, jdbcType=NVARCHAR},
+         #{historicIdentityLink.type, jdbcType=NVARCHAR},
+         #{historicIdentityLink.userId, jdbcType=NVARCHAR},
+         #{historicIdentityLink.groupId, jdbcType=NVARCHAR},
+         #{historicIdentityLink.taskId, jdbcType=NVARCHAR},
+         #{historicIdentityLink.processInstanceId, jdbcType=NVARCHAR},
+         #{historicIdentityLink.scopeId, jdbcType=NVARCHAR},
+         #{historicIdentityLink.subScopeId, jdbcType=NVARCHAR},
+         #{historicIdentityLink.scopeType, jdbcType=NVARCHAR},
+         #{historicIdentityLink.scopeDefinitionId, jdbcType=NVARCHAR},
          #{historicIdentityLink.createTime, jdbcType=TIMESTAMP})
       </foreach>
   </insert>
@@ -57,16 +57,16 @@
     INSERT ALL 
       <foreach collection="list" item="historicIdentityLink" index="index">
         INTO ${prefix}ACT_HI_IDENTITYLINK (ID_, TYPE_, USER_ID_, GROUP_ID_, TASK_ID_, PROC_INST_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, CREATE_TIME_) VALUES 
-          (#{historicIdentityLink.id, jdbcType=VARCHAR},
-           #{historicIdentityLink.type, jdbcType=VARCHAR},
-           #{historicIdentityLink.userId, jdbcType=VARCHAR},
-           #{historicIdentityLink.groupId, jdbcType=VARCHAR},
-           #{historicIdentityLink.taskId, jdbcType=VARCHAR},
-           #{historicIdentityLink.processInstanceId, jdbcType=VARCHAR},
-           #{historicIdentityLink.scopeId, jdbcType=VARCHAR},
-           #{historicIdentityLink.subScopeId, jdbcType=VARCHAR},
-           #{historicIdentityLink.scopeType, jdbcType=VARCHAR},
-           #{historicIdentityLink.scopeDefinitionId, jdbcType=VARCHAR},
+          (#{historicIdentityLink.id, jdbcType=NVARCHAR},
+           #{historicIdentityLink.type, jdbcType=NVARCHAR},
+           #{historicIdentityLink.userId, jdbcType=NVARCHAR},
+           #{historicIdentityLink.groupId, jdbcType=NVARCHAR},
+           #{historicIdentityLink.taskId, jdbcType=NVARCHAR},
+           #{historicIdentityLink.processInstanceId, jdbcType=NVARCHAR},
+           #{historicIdentityLink.scopeId, jdbcType=NVARCHAR},
+           #{historicIdentityLink.subScopeId, jdbcType=NVARCHAR},
+           #{historicIdentityLink.scopeType, jdbcType=NVARCHAR},
+           #{historicIdentityLink.scopeDefinitionId, jdbcType=NVARCHAR},
            #{historicIdentityLink.createTime, jdbcType=TIMESTAMP})
       </foreach>
     SELECT * FROM dual
@@ -75,22 +75,22 @@
   <!-- HISTORIC IDENTITY LINK DELETE -->
   
   <delete id="deleteHistoricIdentityLink" parameterType="string">
-    delete from ${prefix}ACT_HI_IDENTITYLINK where ID_ = #{id}
+    delete from ${prefix}ACT_HI_IDENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricIdentityLink" parameterType="java.util.Collection">
     delete from ${prefix}ACT_HI_IDENTITYLINK where  
     <foreach item="identityLink" collection="list" index="index" separator=" or ">
-        ID_ = #{identityLink.id, jdbcType=VARCHAR}
+        ID_ = #{identityLink.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
   
   <delete id="deleteHistoricIdentityLinksByScopeIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_HI_IDENTITYLINK where SCOPE_ID_ = #{scopeId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_HI_IDENTITYLINK where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteHistoricIdentityLinksByScopeDefinitionIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_HI_IDENTITYLINK where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_HI_IDENTITYLINK where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricIdentityLinksForProcessInstanceIds" parameterType="java.util.Collection">
@@ -100,8 +100,8 @@
         or
         </if>
         PROC_INST_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -113,8 +113,8 @@
         or
         </if>
         TASK_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{taskId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -126,11 +126,11 @@
         or
         </if>
         SCOPE_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{scopeId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>)
-    and SCOPE_TYPE_ = #{scopeType}
+    and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricProcessIdentityLinks" parameterType="java.util.Map">
@@ -195,39 +195,39 @@
 
   <!-- HISTORIC IDENTITY LINK RESULTMAP -->
   <resultMap id="historicIdentityLinkResultMap" type="org.flowable.identitylink.service.impl.persistence.entity.HistoricIdentityLinkEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
-    <result property="groupId" column="GROUP_ID_" jdbcType="VARCHAR" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
+    <result property="groupId" column="GROUP_ID_" jdbcType="NVARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
     <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />       
   </resultMap>
 
   <!-- HISTORIC IDENTITY LINK SELECT -->
 
   <select id="selectHistoricIdentityLink" parameterType="string" resultMap="historicIdentityLinkResultMap">
-    select * from ${prefix}ACT_HI_IDENTITYLINK where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_HI_IDENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricIdentityLinksByTask" parameterType="string" resultMap="historicIdentityLinkResultMap">
-    select * from ${prefix}ACT_HI_IDENTITYLINK where TASK_ID_ = #{parameter}
+    select * from ${prefix}ACT_HI_IDENTITYLINK where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricIdentityLinksByProcessInstance" parameterType="string" resultMap="historicIdentityLinkResultMap">
-    select * from ${prefix}ACT_HI_IDENTITYLINK where PROC_INST_ID_ = #{parameter}
+    select * from ${prefix}ACT_HI_IDENTITYLINK where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricIdentityLinksByScopeIdAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicIdentityLinkResultMap">
-    select * from ${prefix}ACT_HI_IDENTITYLINK where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    select * from ${prefix}ACT_HI_IDENTITYLINK where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricIdentityLinksBySubScopeIdAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicIdentityLinkResultMap">
-    select * from ${prefix}ACT_HI_IDENTITYLINK where SUB_SCOPE_ID_ = #{parameter.subScopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    select * from ${prefix}ACT_HI_IDENTITYLINK where SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
   
  <select id="selectIdentityLinks" resultMap="historicIdentityLinkResultMap">
@@ -237,15 +237,15 @@
   <select id="selectHistoricIdentityLinkByTaskUserGroupAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicIdentityLinkResultMap">
     select * 
     from ${prefix}ACT_HI_IDENTITYLINK 
-    where TASK_ID_ = #{parameter.taskId}
+    where TASK_ID_ = #{parameter.taskId, jdbcType=NVARCHAR}
       <if test="parameter.userId != null">
-        and USER_ID_ = #{parameter.userId}
+        and USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.groupId != null">
-        and GROUP_ID_ = #{parameter.groupId}
+        and GROUP_ID_ = #{parameter.groupId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.type != null">
-        and TYPE_ = #{parameter.type}
+        and TYPE_ = #{parameter.type, jdbcType=NVARCHAR}
       </if>
   </select>
 </mapper>
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/IdentityLink.xml b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/IdentityLink.xml
index c389824371d..bfc857aade5 100644
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/IdentityLink.xml
+++ b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/mapping/entity/IdentityLink.xml
@@ -8,17 +8,17 @@
   
   <insert id="insertIdentityLink" parameterType="org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl">
     insert into ${prefix}ACT_RU_IDENTITYLINK (ID_, REV_, TYPE_, USER_ID_, GROUP_ID_, TASK_ID_, PROC_INST_ID_, PROC_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_)
-    values (#{id, jdbcType=VARCHAR},
-            1, #{type, jdbcType=VARCHAR},
-            #{userId, jdbcType=VARCHAR},
-            #{groupId, jdbcType=VARCHAR},
-            #{taskId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{processDefId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR})
+    values (#{id, jdbcType=NVARCHAR},
+            1, #{type, jdbcType=NVARCHAR},
+            #{userId, jdbcType=NVARCHAR},
+            #{groupId, jdbcType=NVARCHAR},
+            #{taskId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{processDefId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR})
             
   </insert>
   
@@ -26,17 +26,17 @@
     insert into ${prefix}ACT_RU_IDENTITYLINK (ID_, REV_, TYPE_, USER_ID_, GROUP_ID_, TASK_ID_, PROC_INST_ID_, PROC_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_)
     values 
     <foreach collection="list" item="identityLink" index="index" separator=","> 
-      (#{identityLink.id, jdbcType=VARCHAR},
-        1, #{identityLink.type, jdbcType=VARCHAR},
-        #{identityLink.userId, jdbcType=VARCHAR},
-        #{identityLink.groupId, jdbcType=VARCHAR},
-        #{identityLink.taskId, jdbcType=VARCHAR},
-        #{identityLink.processInstanceId, jdbcType=VARCHAR},
-        #{identityLink.processDefId, jdbcType=VARCHAR},
-        #{identityLink.scopeId, jdbcType=VARCHAR},
-        #{identityLink.subScopeId, jdbcType=VARCHAR},
-        #{identityLink.scopeType, jdbcType=VARCHAR},
-        #{identityLink.scopeDefinitionId, jdbcType=VARCHAR})
+      (#{identityLink.id, jdbcType=NVARCHAR},
+        1, #{identityLink.type, jdbcType=NVARCHAR},
+        #{identityLink.userId, jdbcType=NVARCHAR},
+        #{identityLink.groupId, jdbcType=NVARCHAR},
+        #{identityLink.taskId, jdbcType=NVARCHAR},
+        #{identityLink.processInstanceId, jdbcType=NVARCHAR},
+        #{identityLink.processDefId, jdbcType=NVARCHAR},
+        #{identityLink.scopeId, jdbcType=NVARCHAR},
+        #{identityLink.subScopeId, jdbcType=NVARCHAR},
+        #{identityLink.scopeType, jdbcType=NVARCHAR},
+        #{identityLink.scopeDefinitionId, jdbcType=NVARCHAR})
     </foreach>
   </insert>
   
@@ -44,17 +44,17 @@
     INSERT ALL
       <foreach collection="list" item="identityLink" index="index">
         into ${prefix}ACT_RU_IDENTITYLINK (ID_, REV_, TYPE_, USER_ID_, GROUP_ID_, TASK_ID_, PROC_INST_ID_, PROC_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_) VALUES
-           (#{identityLink.id, jdbcType=VARCHAR},
-            1, #{identityLink.type, jdbcType=VARCHAR},
-            #{identityLink.userId, jdbcType=VARCHAR},
-            #{identityLink.groupId, jdbcType=VARCHAR},
-            #{identityLink.taskId, jdbcType=VARCHAR},
-            #{identityLink.processInstanceId, jdbcType=VARCHAR},
-            #{identityLink.processDefId, jdbcType=VARCHAR},
-            #{identityLink.scopeId, jdbcType=VARCHAR},
-            #{identityLink.subScopeId, jdbcType=VARCHAR},
-            #{identityLink.scopeType, jdbcType=VARCHAR},
-            #{identityLink.scopeDefinitionId, jdbcType=VARCHAR})
+           (#{identityLink.id, jdbcType=NVARCHAR},
+            1, #{identityLink.type, jdbcType=NVARCHAR},
+            #{identityLink.userId, jdbcType=NVARCHAR},
+            #{identityLink.groupId, jdbcType=NVARCHAR},
+            #{identityLink.taskId, jdbcType=NVARCHAR},
+            #{identityLink.processInstanceId, jdbcType=NVARCHAR},
+            #{identityLink.processDefId, jdbcType=NVARCHAR},
+            #{identityLink.scopeId, jdbcType=NVARCHAR},
+            #{identityLink.subScopeId, jdbcType=NVARCHAR},
+            #{identityLink.scopeType, jdbcType=NVARCHAR},
+            #{identityLink.scopeDefinitionId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -65,70 +65,70 @@
     update ${prefix}ACT_RU_IDENTITYLINK
     <set>
         <if test="originalPersistentState.type != type">
-            TYPE_ = #{type, jdbcType=VARCHAR},
+            TYPE_ = #{type, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.userId != userId">
-            USER_ID_ = #{userId, jdbcType=VARCHAR},
+            USER_ID_ = #{userId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.groupId != groupId">
-            GROUP_ID_ = #{groupId, jdbcType=VARCHAR},
+            GROUP_ID_ = #{groupId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.taskId != taskId">
-            TASK_ID_ = #{taskId, jdbcType=VARCHAR},
+            TASK_ID_ = #{taskId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.processInstanceId != processInstanceId">
-            PROC_INST_ID_ = #{processInstanceId, jdbcType=VARCHAR},
+            PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-            PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+            PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.scopeId != scopeId">
-            SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+            SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.subScopeId != subScopeId">
-            SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+            SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.scopeType != scopeType">
-            SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+            SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
         </if>
         <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-            SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+            SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
         </if>
     </set>
-    where ID_= #{id, jdbcType=VARCHAR}
+    where ID_= #{id, jdbcType=NVARCHAR}
   </update>
   
   <!-- IDENTITY LINK DELETE -->
   
   <delete id="deleteIdentityLink" parameterType="string">
-    delete from ${prefix}ACT_RU_IDENTITYLINK where ID_ = #{id}
+    delete from ${prefix}ACT_RU_IDENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteIdentityLink" parameterType="java.util.Collection">
     delete from ${prefix}ACT_RU_IDENTITYLINK where 
     <foreach item="identityLink" collection="list" index="index" separator=" or ">
-        ID_ = #{identityLink.id, jdbcType=VARCHAR}
+        ID_ = #{identityLink.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
   
   <delete id="deleteIdentityLinksByTaskId" parameterType="string">
-    delete from ${prefix}ACT_RU_IDENTITYLINK where TASK_ID_ = #{id}
+    delete from ${prefix}ACT_RU_IDENTITYLINK where TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteIdentityLinksByProcDef" parameterType="string">
-    delete from ${prefix}ACT_RU_IDENTITYLINK where PROC_DEF_ID_ = #{id}
+    delete from ${prefix}ACT_RU_IDENTITYLINK where PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteIdentityLinksByProcessInstanceId" parameterType="string">
-    delete from ${prefix}ACT_RU_IDENTITYLINK where PROC_INST_ID_ = #{id}
+    delete from ${prefix}ACT_RU_IDENTITYLINK where PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteIdentityLinksByScopeIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_ID_ = #{scopeId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteIdentityLinksByScopeDefinitionIdAndScopeType" parameterType="java.util.Map">
-    delete from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId} and SCOPE_TYPE_ = #{scopeType}
+    delete from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="bulkDeleteIdentityLinksForScopeIdsAndScopeType" parameterType="map">
@@ -138,57 +138,57 @@
         or
         </if>
         SCOPE_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{scopeId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>)
-    and SCOPE_TYPE_ = #{scopeType}
+    and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>  
 
   <!-- IDENTITY LINK RESULTMAP -->
 
   <resultMap id="identityLinkResultMap" type="org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
-    <result property="groupId" column="GROUP_ID_" jdbcType="VARCHAR" />
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />    
-    <result property="processDefId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
+    <result property="groupId" column="GROUP_ID_" jdbcType="NVARCHAR" />
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />    
+    <result property="processDefId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
   </resultMap>
 
   <!-- IDENTITY LINK SELECT -->
 
   <select id="selectIdentityLink" parameterType="string" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityLinksByTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where TASK_ID_ = #{parameter}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityLinksByProcessInstance" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where PROC_INST_ID_ = #{parameter}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityLinksByScopeIdAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityLinksBySubScopeIdAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where SUB_SCOPE_ID_ = #{parameter.subScopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityLinksByProcessDefinition" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where PROC_DEF_ID_ = #{parameter}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where PROC_DEF_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityLinksByScopeDefinitionAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
-    select * from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    select * from ${prefix}ACT_RU_IDENTITYLINK where SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
   
  <select id="selectIdentityLinks" resultMap="identityLinkResultMap">
@@ -198,69 +198,69 @@
   <select id="selectIdentityLinkByTaskUserGroupAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
     select * 
     from ${prefix}ACT_RU_IDENTITYLINK 
-    where TASK_ID_ = #{parameter.taskId}
+    where TASK_ID_ = #{parameter.taskId, jdbcType=NVARCHAR}
       <if test="parameter.userId != null">
-        and USER_ID_ = #{parameter.userId}
+        and USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.groupId != null">
-        and GROUP_ID_ = #{parameter.groupId}
+        and GROUP_ID_ = #{parameter.groupId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.type != null">
-        and TYPE_ = #{parameter.type}
+        and TYPE_ = #{parameter.type, jdbcType=NVARCHAR}
       </if>
   </select>
   
   <select id="selectIdentityLinkByProcessInstanceUserGroupAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
     select * 
     from ${prefix}ACT_RU_IDENTITYLINK 
-    where PROC_INST_ID_ = #{parameter.processInstanceId}
+    where PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
       <if test="parameter.userId != null">
-        and USER_ID_ = #{parameter.userId}
+        and USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.groupId != null">
-        and GROUP_ID_ = #{parameter.groupId}
+        and GROUP_ID_ = #{parameter.groupId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.type != null">
-        and TYPE_ = #{parameter.type}
+        and TYPE_ = #{parameter.type, jdbcType=NVARCHAR}
       </if>
   </select>
   
   <select id="selectIdentityLinkByScopeIdScopeTypeUserGroupAndType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
     select * 
     from ${prefix}ACT_RU_IDENTITYLINK 
-    where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
       <if test="parameter.userId != null">
-        and USER_ID_ = #{parameter.userId}
+        and USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.groupId != null">
-        and GROUP_ID_ = #{parameter.groupId}
+        and GROUP_ID_ = #{parameter.groupId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.type != null">
-        and TYPE_ = #{parameter.type}
+        and TYPE_ = #{parameter.type, jdbcType=NVARCHAR}
       </if>
   </select>
   
   <select id="selectIdentityLinkByProcessDefinitionUserAndGroup" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
     select * 
     from ${prefix}ACT_RU_IDENTITYLINK 
-    where PROC_DEF_ID_ = #{parameter.processDefinitionId}
+    where PROC_DEF_ID_ = #{parameter.processDefinitionId, jdbcType=NVARCHAR}
       <if test="parameter.userId != null">
-        and USER_ID_ = #{parameter.userId}
+        and USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.groupId != null">
-        and GROUP_ID_ = #{parameter.groupId}
+        and GROUP_ID_ = #{parameter.groupId, jdbcType=NVARCHAR}
       </if>
   </select>
   
   <select id="selectIdentityLinkByScopeDefinitionScopeTypeUserAndGroup" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="identityLinkResultMap">
     select * 
     from ${prefix}ACT_RU_IDENTITYLINK 
-    where SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId} and SCOPE_TYPE_ = #{parameter.scopeType}
+    where SCOPE_DEFINITION_ID_ = #{parameter.scopeDefinitionId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
       <if test="parameter.userId != null">
-        and USER_ID_ = #{parameter.userId}
+        and USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       </if>
       <if test="parameter.groupId != null">
-        and GROUP_ID_ = #{parameter.groupId}
+        and GROUP_ID_ = #{parameter.groupId, jdbcType=NVARCHAR}
       </if>
   </select>
   
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Group.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Group.xml
index 988c21c0891..a7e03323e46 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Group.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Group.xml
@@ -9,9 +9,9 @@
   <insert id="insertGroup" parameterType="org.flowable.idm.engine.impl.persistence.entity.GroupEntityImpl">
     insert into ${prefix}ACT_ID_GROUP (ID_, REV_, NAME_, TYPE_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      1, #{name ,jdbcType=VARCHAR},
-      #{type ,jdbcType=VARCHAR}
+      #{id, jdbcType=NVARCHAR},
+      1, #{name, jdbcType=NVARCHAR},
+      #{type, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -19,9 +19,9 @@
     insert into ${prefix}ACT_ID_GROUP (ID_, REV_, NAME_, TYPE_)
     values 
       <foreach collection="list" item="group" index="index" separator=",">
-        (#{group.id ,jdbcType=VARCHAR},
-         1, #{group.name ,jdbcType=VARCHAR},
-         #{group.type ,jdbcType=VARCHAR})
+        (#{group.id, jdbcType=NVARCHAR},
+         1, #{group.name, jdbcType=NVARCHAR},
+         #{group.type, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -29,9 +29,9 @@
     INSERT ALL 
       <foreach collection="list" item="group" index="index">
         INTO ${prefix}ACT_ID_GROUP (ID_, REV_, NAME_, TYPE_) VALUES 
-            (#{group.id ,jdbcType=VARCHAR},
-             1, #{group.name ,jdbcType=VARCHAR},
-             #{group.type ,jdbcType=VARCHAR})
+            (#{group.id, jdbcType=NVARCHAR},
+             1, #{group.name, jdbcType=NVARCHAR},
+             #{group.type, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -41,49 +41,49 @@
   <update id="updateGroup" parameterType="org.flowable.idm.engine.impl.persistence.entity.GroupEntityImpl">
     update ${prefix}ACT_ID_GROUP
     <set>
-      REV_ = #{revisionNext ,jdbcType=INTEGER},
-      NAME_ = #{name ,jdbcType=VARCHAR},
-      TYPE_ = #{type ,jdbcType=VARCHAR},
+      REV_ = #{revisionNext, jdbcType=INTEGER},
+      NAME_ = #{name, jdbcType=NVARCHAR},
+      TYPE_ = #{type, jdbcType=NVARCHAR},
     </set>
-    where ID_ = #{id}
-       and REV_ = #{revision}
+    where ID_ = #{id, jdbcType=NVARCHAR}
+       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
   <!-- GROUP DELETE -->
 
   <delete id="deleteGroup" parameterType="org.flowable.idm.engine.impl.persistence.entity.GroupEntityImpl">
-    delete from ${prefix}ACT_ID_GROUP where ID_ = #{id} and REV_ = #{revision} 
+    delete from ${prefix}ACT_ID_GROUP where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <!-- GROUP RESULTMAP -->
 
   <resultMap id="groupResultMap" type="org.flowable.idm.engine.impl.persistence.entity.GroupEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR" />
   </resultMap>
   
   <!-- GROUP SELECT -->
 
   <select id="selectGroup" parameterType="string" resultMap="groupResultMap">
-    select * from ${prefix}ACT_ID_GROUP where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_GROUP where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
     
   <select id="selectGroupsByUserId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="groupResultMap">
     select g.*
     from ${prefix}ACT_ID_GROUP g, ${prefix}ACT_ID_MEMBERSHIP membership
     where g.ID_ = membership.GROUP_ID_
-      and membership.USER_ID_ = #{parameter}
+      and membership.USER_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectGroupsByUserIdAndGroupType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="groupResultMap">
     select g.*
     from ${prefix}ACT_ID_GROUP g, ${prefix}ACT_ID_MEMBERSHIP membership
     where g.ID_ = membership.GROUP_ID_
-      and membership.USER_ID_ = #{parameter.userId}
+      and membership.USER_ID_ = #{parameter.userId, jdbcType=NVARCHAR}
       <if test="groupType != null">
-         and g.TYPE_ = #{parameter.groupType}
+         and g.TYPE_ = #{parameter.groupType, jdbcType=NVARCHAR}
       </if>
   </select>
   
@@ -104,33 +104,33 @@
     from ${prefix}ACT_ID_GROUP RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="ids != null &amp;&amp; !ids.empty">
         and RES.ID_ IN
         <foreach item="id" index="index" collection="ids" 
                  open="(" separator="," close=")">
-          #{id}
+          #{id, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like #{nameLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.NAME_) like #{nameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="type != null">
-        and RES.TYPE_ = #{type}
+        and RES.TYPE_ = #{type, jdbcType=NVARCHAR}
       </if>
       <if test="userId != null">
-        and exists(select 1 from ${prefix}ACT_ID_MEMBERSHIP M where M.GROUP_ID_ = RES.ID_ and M.USER_ID_ = #{userId})
+        and exists(select 1 from ${prefix}ACT_ID_MEMBERSHIP M where M.GROUP_ID_ = RES.ID_ and M.USER_ID_ = #{userId, jdbcType=NVARCHAR})
       </if>
       <if test="userIds != null &amp;&amp; !userIds.empty">
         and exists(select 1 from ${prefix}ACT_ID_MEMBERSHIP M where M.GROUP_ID_ = RES.ID_ and M.USER_ID_ in  
-            <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">#{userId}</foreach>)
+            <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">#{userId, jdbcType=NVARCHAR}</foreach>)
       </if>
     </where>
   </sql>
@@ -147,7 +147,7 @@
     select RES.* from ${prefix}ACT_ID_GROUP RES
     inner join ${prefix}ACT_ID_PRIV_MAPPING MAPPING on MAPPING.GROUP_ID_ = RES.ID_
     inner join ${prefix}ACT_ID_PRIV PRIV on PRIV.ID_ = MAPPING.PRIV_ID_
-    where PRIV.ID_ = #{parameter}
+    where PRIV.ID_ = #{parameter, jdbcType=NVARCHAR}
     order by RES.NAME_
   </select>
   
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdentityInfo.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdentityInfo.xml
index e6d04e281c7..94b4146cc11 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdentityInfo.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdentityInfo.xml
@@ -9,13 +9,13 @@
   <insert id="insertIdentityInfo" parameterType="org.flowable.idm.engine.impl.persistence.entity.IdentityInfoEntityImpl">
     insert into ${prefix}ACT_ID_INFO (ID_, REV_, USER_ID_, TYPE_, KEY_, VALUE_, PASSWORD_, PARENT_ID_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      1, #{userId ,jdbcType=VARCHAR},
-      #{type ,jdbcType=VARCHAR},
-      #{key ,jdbcType=VARCHAR},
-      #{value ,jdbcType=VARCHAR},
-      #{passwordBytes ,jdbcType=${blobType}},
-      #{parentId ,jdbcType=VARCHAR}
+      #{id, jdbcType=NVARCHAR},
+      1, #{userId, jdbcType=NVARCHAR},
+      #{type, jdbcType=NVARCHAR},
+      #{key, jdbcType=NVARCHAR},
+      #{value, jdbcType=NVARCHAR},
+      #{passwordBytes, jdbcType=${blobType}},
+      #{parentId, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -23,13 +23,13 @@
     insert into ${prefix}ACT_ID_INFO (ID_, REV_, USER_ID_, TYPE_, KEY_, VALUE_, PASSWORD_, PARENT_ID_)
     values 
       <foreach collection="list" item="identityInfo" index="index" separator=",">
-        (#{identityInfo.id ,jdbcType=VARCHAR},
-         1, #{identityInfo.userId ,jdbcType=VARCHAR},
-         #{identityInfo.type ,jdbcType=VARCHAR},
-         #{identityInfo.key ,jdbcType=VARCHAR},
-         #{identityInfo.value ,jdbcType=VARCHAR},
-         #{identityInfo.passwordBytes ,jdbcType=${blobType}},
-         #{identityInfo.parentId ,jdbcType=VARCHAR})
+        (#{identityInfo.id, jdbcType=NVARCHAR},
+         1, #{identityInfo.userId, jdbcType=NVARCHAR},
+         #{identityInfo.type, jdbcType=NVARCHAR},
+         #{identityInfo.key, jdbcType=NVARCHAR},
+         #{identityInfo.value, jdbcType=NVARCHAR},
+         #{identityInfo.passwordBytes, jdbcType=${blobType}},
+         #{identityInfo.parentId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -37,13 +37,13 @@
     INSERT ALL 
       <foreach collection="list" item="identityInfo" index="index">
         INTO ${prefix}ACT_ID_INFO (ID_, REV_, USER_ID_, TYPE_, KEY_, VALUE_, PASSWORD_, PARENT_ID_) VALUES 
-          (#{identityInfo.id ,jdbcType=VARCHAR},
-           1, #{identityInfo.userId ,jdbcType=VARCHAR},
-           #{identityInfo.type ,jdbcType=VARCHAR},
-           #{identityInfo.key ,jdbcType=VARCHAR},
-           #{identityInfo.value ,jdbcType=VARCHAR},
-           #{identityInfo.passwordBytes ,jdbcType=${blobType}},
-           #{identityInfo.parentId ,jdbcType=VARCHAR})
+          (#{identityInfo.id, jdbcType=NVARCHAR},
+           1, #{identityInfo.userId, jdbcType=NVARCHAR},
+           #{identityInfo.type, jdbcType=NVARCHAR},
+           #{identityInfo.key, jdbcType=NVARCHAR},
+           #{identityInfo.value, jdbcType=NVARCHAR},
+           #{identityInfo.passwordBytes, jdbcType=${blobType}},
+           #{identityInfo.parentId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -52,60 +52,60 @@
   <update id="updateIdentityInfo" parameterType="org.flowable.idm.engine.impl.persistence.entity.IdentityInfoEntityImpl">
     update ${prefix}ACT_ID_INFO 
     <set>
-        REV_ = #{revisionNext ,jdbcType=INTEGER},
-        VALUE_ = #{value ,jdbcType=VARCHAR},
-        PASSWORD_ = #{passwordBytes ,jdbcType=${blobType}},
+        REV_ = #{revisionNext, jdbcType=INTEGER},
+        VALUE_ = #{value, jdbcType=NVARCHAR},
+        PASSWORD_ = #{passwordBytes, jdbcType=${blobType}},
     </set>
-    where ID_ = #{id}
-      and REV_ = #{revision}
+    where ID_ = #{id, jdbcType=NVARCHAR}
+      and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
   <!-- INFO DELETE -->
 
   <delete id="deleteIdentityInfo" parameterType="org.flowable.idm.engine.impl.persistence.entity.IdentityInfoEntityImpl">
     delete from ${prefix}ACT_ID_INFO 
-    where ID_ = #{id} and REV_ = #{revision}
+    where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <!-- INFO RESULTMAP -->
 
   <resultMap id="identityInfoResultMap" type="org.flowable.idm.engine.impl.persistence.entity.IdentityInfoEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR" />
-    <result property="key" column="KEY_" jdbcType="VARCHAR" />
-    <result property="value" column="VALUE_" jdbcType="VARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR" />
+    <result property="key" column="KEY_" jdbcType="NVARCHAR" />
+    <result property="value" column="VALUE_" jdbcType="NVARCHAR" />
     <result property="passwordBytes" column="PASSWORD_" jdbcType="${blobType}" />
-    <result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR" />
+    <result property="parentId" column="PARENT_ID_" jdbcType="NVARCHAR" />
   </resultMap>
   
   <!-- INFO SELECT -->
 
   <select id="selectIdentityInfoById" parameterType="string" resultMap="identityInfoResultMap">
-    select * from ${prefix}ACT_ID_INFO where ID_ = #{id,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_INFO where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityInfoByUserIdAndKey" parameterType="map" resultMap="identityInfoResultMap">
     select * from ${prefix}ACT_ID_INFO 
-    where USER_ID_ = #{userId,jdbcType=VARCHAR}
-      and KEY_ =  #{key,jdbcType=VARCHAR}
+    where USER_ID_ = #{userId, jdbcType=NVARCHAR}
+      and KEY_ =  #{key, jdbcType=NVARCHAR}
       and PARENT_ID_ is null
   </select>
   
   <select id="selectIdentityInfoKeysByUserIdAndType" parameterType="map" resultType="string">
     select KEY_ from ${prefix}ACT_ID_INFO 
-    where USER_ID_ = #{userId,jdbcType=VARCHAR}
-      and TYPE_ =  #{type,jdbcType=VARCHAR}
+    where USER_ID_ = #{userId, jdbcType=NVARCHAR}
+      and TYPE_ =  #{type, jdbcType=NVARCHAR}
       and PARENT_ID_ is null
   </select>
   
   <select id="selectIdentityInfoByUserId" parameterType="string" resultMap="identityInfoResultMap">
-    select * from ${prefix}ACT_ID_INFO where USER_ID_ = #{parameter,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_INFO where USER_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdentityInfoDetails" parameterType="string" resultMap="identityInfoResultMap">
-    select * from ${prefix}ACT_ID_INFO where PARENT_ID_ = #{parameter,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_INFO where PARENT_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmByteArray.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmByteArray.xml
index 24e943f4a05..cd893592760 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmByteArray.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmByteArray.xml
@@ -9,8 +9,8 @@
   <insert id="insertIdmByteArray" parameterType="org.flowable.idm.engine.impl.persistence.entity.IdmByteArrayEntityImpl">
     insert into ${prefix}ACT_ID_BYTEARRAY(ID_, REV_, NAME_, BYTES_)
     values (
-      #{id, jdbcType=VARCHAR},
-      1, #{name, jdbcType=VARCHAR},
+      #{id, jdbcType=NVARCHAR},
+      1, #{name, jdbcType=NVARCHAR},
       #{bytes, jdbcType=${blobType}}
     )  
   </insert>
@@ -19,8 +19,8 @@
     insert into ${prefix}ACT_ID_BYTEARRAY(ID_, REV_, NAME_, BYTES_)
     values
       <foreach collection="list" item="byteArray" index="index" separator=","> 
-         (#{byteArray.id, jdbcType=VARCHAR},
-          1, #{byteArray.name, jdbcType=VARCHAR},
+         (#{byteArray.id, jdbcType=NVARCHAR},
+          1, #{byteArray.name, jdbcType=NVARCHAR},
           #{byteArray.bytes, jdbcType=${blobType}})
       </foreach>
   </insert>
@@ -29,8 +29,8 @@
     INSERT ALL 
       <foreach collection="list" item="byteArray" index="index">
         into ${prefix}ACT_ID_BYTEARRAY(ID_, REV_, NAME_, BYTES_) VALUES 
-         (#{byteArray.id, jdbcType=VARCHAR},
-          1, #{byteArray.name, jdbcType=VARCHAR},
+         (#{byteArray.id, jdbcType=NVARCHAR},
+          1, #{byteArray.name, jdbcType=NVARCHAR},
           #{byteArray.bytes, jdbcType=${blobType}})
       </foreach>
     SELECT * FROM dual
@@ -44,30 +44,30 @@
       REV_ = #{revisionNext, jdbcType=INTEGER},
       BYTES_ = #{bytes, jdbcType=${blobType}},
     </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
   
   <!-- BYTE ARRAY DELETE -->
 
   <select id="selectBytesOfIdmByteArray" parameterType="string" resultType="hashmap">
-    select BYTES_ from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id} and REV_ = #{revision}
+    select BYTES_ from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </select>
   
   <delete id="deleteIdmByteArray" parameterType="org.flowable.idm.engine.impl.persistence.entity.IdmByteArrayEntityImpl">
-    delete from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
   
   <delete id="deleteIdmByteArrayNoRevisionCheck" parameterType="string">
-    delete from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id}
+    delete from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <!-- BYTE ARRAY RESULTMAP -->
   
   <resultMap id="idmByteArrayResultMap" type="org.flowable.idm.engine.impl.persistence.entity.IdmByteArrayEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="NVARCHAR"/>
     <result property="bytes" column="BYTES_" jdbcType="${blobType}"/>
   </resultMap>
 
@@ -78,7 +78,7 @@
   </select>
   
   <select id="selectIdmByteArray" parameterType="string" resultMap="idmByteArrayResultMap">
-   select * from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id, jdbcType=VARCHAR}
+   select * from ${prefix}ACT_ID_BYTEARRAY where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
 
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmProperty.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmProperty.xml
index b387fe54f62..8d8a42f2f7e 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmProperty.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/IdmProperty.xml
@@ -12,8 +12,8 @@
         VALUE_,
         REV_
       ) values (
-        #{name ,jdbcType=VARCHAR},
-        #{value, jdbcType=VARCHAR},
+        #{name, jdbcType=NVARCHAR},
+        #{value, jdbcType=NVARCHAR},
         1
       )
   </insert>
@@ -21,8 +21,8 @@
   <insert id="bulkInsertIdmProperty" parameterType="java.util.List">
       INSERT INTO ${prefix}ACT_ID_PROPERTY (NAME_, VALUE_, REV_) VALUES 
       <foreach collection="list" item="property" index="index" separator=","> 
-        (#{property.name ,jdbcType=VARCHAR},
-         #{property.value, jdbcType=VARCHAR},
+        (#{property.name, jdbcType=NVARCHAR},
+         #{property.value, jdbcType=NVARCHAR},
          1)
       </foreach>
   </insert>
@@ -31,8 +31,8 @@
     INSERT ALL 
     <foreach collection="list" item="property" index="index">
       INTO ${prefix}ACT_ID_PROPERTY (NAME_, VALUE_, REV_) VALUES
-      (#{property.name ,jdbcType=VARCHAR},
-       #{property.value, jdbcType=VARCHAR},
+      (#{property.name, jdbcType=NVARCHAR},
+       #{property.value, jdbcType=NVARCHAR},
        1)
     </foreach>
     SELECT * FROM dual
@@ -44,24 +44,24 @@
     update ${prefix}ACT_ID_PROPERTY
     <set>
       REV_ = #{revisionNext, jdbcType=INTEGER},
-      VALUE_ = #{value, jdbcType=VARCHAR},
+      VALUE_ = #{value, jdbcType=NVARCHAR},
     </set>
-    where NAME_ = #{name, jdbcType=VARCHAR}
+    where NAME_ = #{name, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <!-- PROPERTY DELETE -->
   
   <delete id="deleteIdmProperty" parameterType="org.flowable.idm.engine.impl.persistence.entity.IdmPropertyEntityImpl">
-    delete from ${prefix}ACT_ID_PROPERTY where NAME_ = #{name} and REV_ = #{revision}
+    delete from ${prefix}ACT_ID_PROPERTY where NAME_ = #{name, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
 
   <!-- PROPERTY SELECT -->
   
   <resultMap id="idmPropertyResultMap" type="org.flowable.idm.engine.impl.persistence.entity.IdmPropertyEntityImpl">
-    <id property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="value" column="VALUE_" jdbcType="VARCHAR" />
+    <id property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="value" column="VALUE_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
   </resultMap>
   
@@ -70,7 +70,7 @@
   </select>
 
   <select id="selectIdmProperty" parameterType="string" resultMap="idmPropertyResultMap">
-    select * from ${prefix}ACT_ID_PROPERTY where NAME_ = #{name, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_PROPERTY where NAME_ = #{name, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectIdmProperties" resultMap="idmPropertyResultMap">
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Membership.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Membership.xml
index 55c6e1547be..cc52b41da3c 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Membership.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Membership.xml
@@ -9,8 +9,8 @@
   <insert id="insertMembership" parameterType="map">
     insert into ${prefix}ACT_ID_MEMBERSHIP (USER_ID_, GROUP_ID_)
     values (
-      #{userId ,jdbcType=VARCHAR},
-      #{groupId ,jdbcType=VARCHAR}
+      #{userId, jdbcType=NVARCHAR},
+      #{groupId, jdbcType=NVARCHAR}
     )
   </insert>
 
@@ -18,8 +18,8 @@
     INSERT INTO ${prefix}ACT_ID_MEMBERSHIP (USER_ID_, GROUP_ID_)
     VALUES 
     <foreach collection="list" item="membership" index="index" separator=","> 
-      (#{membership.userId ,jdbcType=VARCHAR},
-       #{membership.groupId ,jdbcType=VARCHAR})
+      (#{membership.userId, jdbcType=NVARCHAR},
+       #{membership.groupId, jdbcType=NVARCHAR})
     </foreach>
   </insert>
 
@@ -27,8 +27,8 @@
     INSERT ALL 
     <foreach collection="list" item="membership" index="index">
       INTO ${prefix}ACT_ID_MEMBERSHIP (USER_ID_, GROUP_ID_) VALUES  
-        (#{membership.userId ,jdbcType=VARCHAR},
-         #{membership.groupId ,jdbcType=VARCHAR})
+        (#{membership.userId, jdbcType=NVARCHAR},
+         #{membership.groupId, jdbcType=NVARCHAR})
     </foreach>
     SELECT * FROM dual
   </insert>
@@ -39,13 +39,13 @@
 
   <delete id="deleteMembershipsByUserId" parameterType="string">
     delete from ${prefix}ACT_ID_MEMBERSHIP 
-    where USER_ID_ = #{userId} 
+    where USER_ID_ = #{userId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteMembership" parameterType="map">
     delete from ${prefix}ACT_ID_MEMBERSHIP 
-    where USER_ID_ = #{userId}
-      and GROUP_ID_ = #{groupId} 
+    where USER_ID_ = #{userId, jdbcType=NVARCHAR}
+      and GROUP_ID_ = #{groupId, jdbcType=NVARCHAR}
   </delete>
 
   <!-- MEMBERSHIP RESULTMAP -->
@@ -54,7 +54,7 @@
 
   <delete id="deleteMembershipsByGroupId" parameterType="string">
     delete from ${prefix}ACT_ID_MEMBERSHIP 
-    where GROUP_ID_ = #{groupId} 
+    where GROUP_ID_ = #{groupId, jdbcType=NVARCHAR}
   </delete>
   
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Privilege.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Privilege.xml
index 84d9379c1a9..6324c02a9d8 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Privilege.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Privilege.xml
@@ -5,23 +5,23 @@
 <mapper namespace="org.flowable.idm.engine.impl.persistence.entity.PrivilegeEntityImpl">
 
   <resultMap id="privilegeResultMap" type="org.flowable.idm.engine.impl.persistence.entity.PrivilegeEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <insert id="insertPrivilege" parameterType="org.flowable.idm.engine.impl.persistence.entity.PrivilegeEntityImpl">
     insert into ${prefix}ACT_ID_PRIV (ID_, NAME_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      #{name ,jdbcType=VARCHAR}
+      #{id, jdbcType=NVARCHAR},
+      #{name, jdbcType=NVARCHAR}
     )
   </insert>
 
   <insert id="bulkInsertPrivilege" parameterType="java.util.List">
     insert into ${prefix}ACT_ID_PRIV (ID_, NAME_) VALUES 
       <foreach collection="list" item="privilege" index="index" separator=",">
-        (#{privilege.id ,jdbcType=VARCHAR},
-         #{privilege.name ,jdbcType=VARCHAR}
+        (#{privilege.id, jdbcType=NVARCHAR},
+         #{privilege.name, jdbcType=NVARCHAR}
       </foreach>
   </insert>
 
@@ -29,18 +29,18 @@
     INSERT ALL 
       <foreach collection="list" item="privilege" index="index">
         insert into ${prefix}ACT_ID_PRIV (ID_, NAME_) VALUES 
-        (#{privilege.id ,jdbcType=VARCHAR},
-         #{privilege.name ,jdbcType=VARCHAR}
+        (#{privilege.id, jdbcType=NVARCHAR},
+         #{privilege.name, jdbcType=NVARCHAR}
       </foreach>
     SELECT * FROM dual
   </insert>
 
   <delete id="deletePrivilege" parameterType="org.flowable.idm.engine.impl.persistence.entity.PrivilegeEntityImpl">
-    delete from ${prefix}ACT_ID_PRIV where ID_ = #{id}
+    delete from ${prefix}ACT_ID_PRIV where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <select id="selectPrivilege" parameterType="string" resultMap="privilegeResultMap">
-    select * from ${prefix}ACT_ID_PRIV where ID_ = #{id,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_PRIV where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectPrivilegeByQueryCriteria" parameterType="org.flowable.idm.engine.impl.PrivilegeQueryImpl" resultMap="privilegeResultMap">
@@ -60,27 +60,27 @@
     from ${prefix}ACT_ID_PRIV RES 
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="ids != null &amp;&amp; !ids.empty">
         and RES.ID_ IN
         <foreach item="id" index="index" collection="ids"
                  open="(" separator="," close=")">
-          #{id}
+          #{id, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="userId != null">
-        and exists(select 1 from ${prefix}ACT_ID_PRIV_MAPPING mapping where RES.ID_ = mapping.PRIV_ID_ and mapping.USER_ID_ = #{userId})
+        and exists(select 1 from ${prefix}ACT_ID_PRIV_MAPPING mapping where RES.ID_ = mapping.PRIV_ID_ and mapping.USER_ID_ = #{userId, jdbcType=NVARCHAR})
       </if>
       <if test="groupId != null">
-        and exists(select 1 from ${prefix}ACT_ID_PRIV_MAPPING mapping where RES.ID_ = mapping.PRIV_ID_ and mapping.GROUP_ID_ = #{groupId})
+        and exists(select 1 from ${prefix}ACT_ID_PRIV_MAPPING mapping where RES.ID_ = mapping.PRIV_ID_ and mapping.GROUP_ID_ = #{groupId, jdbcType=NVARCHAR})
       </if>
       <if test="groupIds != null &amp;&amp; !groupIds.empty">
         and exists(select 1 from ${prefix}ACT_ID_PRIV_MAPPING mapping where RES.ID_ = mapping.PRIV_ID_ and mapping.GROUP_ID_ in  
-            <foreach item="groupId" index="index" collection="groupIds" open="(" separator="," close=")">#{groupId}</foreach>)
+            <foreach item="groupId" index="index" collection="groupIds" open="(" separator="," close=")">#{groupId, jdbcType=NVARCHAR}</foreach>)
       </if>
     </where>
   </sql>
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/PrivilegeMapping.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/PrivilegeMapping.xml
index e0084a753c0..2c4d61e25c3 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/PrivilegeMapping.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/PrivilegeMapping.xml
@@ -5,66 +5,66 @@
 <mapper namespace="org.flowable.idm.engine.impl.persistence.entity.PrivilegeMappingEntityImpl">
 
   <resultMap id="privilegeMappingResultMap" type="org.flowable.idm.engine.impl.persistence.entity.PrivilegeMappingEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="privilegeId" column="PRIV_ID_" jdbcType="VARCHAR" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
-    <result property="groupId" column="GROUP_ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
+    <result property="privilegeId" column="PRIV_ID_" jdbcType="NVARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
+    <result property="groupId" column="GROUP_ID_" jdbcType="NVARCHAR" />
   </resultMap>
 
   <insert id="insertPrivilegeMapping" parameterType="org.flowable.idm.engine.impl.persistence.entity.PrivilegeMappingEntityImpl">
     insert into ${prefix}ACT_ID_PRIV_MAPPING (ID_, PRIV_ID_, USER_ID_, GROUP_ID_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      #{privilegeId ,jdbcType=VARCHAR},
-      #{userId ,jdbcType=VARCHAR},
-      #{groupId ,jdbcType=VARCHAR}
+      #{id, jdbcType=NVARCHAR},
+      #{privilegeId, jdbcType=NVARCHAR},
+      #{userId, jdbcType=NVARCHAR},
+      #{groupId, jdbcType=NVARCHAR}
     )
   </insert>
 
   <insert id="bulkInsertPrivilegeMapping" parameterType="java.util.List">
     insert into ${prefix}ACT_ID_PRIV_MAPPING (ID_, PRIV_ID_, USER_ID_, GROUP_ID_) VALUES 
-      <foreach collection="list" item="privilege" index="index" separator=",">
-        (#{privilege.id ,jdbcType=VARCHAR},
-         #{privilege.privilegeId ,jdbcType=VARCHAR},
-         #{privilege.userId ,jdbcType=VARCHAR},
-         #{privilege.groupId ,jdbcType=VARCHAR})
+      <foreach collection="list" item="privilegeMapping" index="index" separator=",">
+        (#{privilegeMapping.id, jdbcType=NVARCHAR},
+         #{privilegeMapping.privilegeId, jdbcType=NVARCHAR},
+         #{privilegeMapping.userId, jdbcType=NVARCHAR},
+         #{privilegeMapping.groupId, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
   <insert id="bulkInsertPrivilegeMapping" databaseId="oracle" parameterType="java.util.List">
     INSERT ALL 
-      <foreach collection="list" item="privilege" index="index">
+      <foreach collection="list" item="privilegeMapping" index="index">
         insert into ${prefix}ACT_ID_PRIV_MAPPING (ID_, PRIV_ID_, USER_ID_, GROUP_ID_) VALUES 
-        (#{privilege.id ,jdbcType=VARCHAR},
-         #{privilege.privilegeId ,jdbcType=VARCHAR},
-         #{privilege.userId ,jdbcType=VARCHAR},
-         #{privilege.groupId ,jdbcType=VARCHAR})
+        (#{privilegeMapping.id, jdbcType=NVARCHAR},
+         #{privilegeMapping.privilegeId, jdbcType=NVARCHAR},
+         #{privilegeMapping.userId, jdbcType=NVARCHAR},
+         #{privilegeMapping.groupId, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
 
   <delete id="deletePrivilegeMapping" parameterType="org.flowable.idm.engine.impl.persistence.entity.PrivilegeMappingEntityImpl">
-    delete from ${prefix}ACT_ID_PRIV_MAPPING where ID_ = #{id}
+    delete from ${prefix}ACT_ID_PRIV_MAPPING where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteByPrivilegeId" parameterType="string">
-    delete from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{id}
+    delete from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="deleteByPrivilegeIdAndUserId" parameterType="map">
-    delete from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{privilegeId} and USER_ID_ = #{userId}
+    delete from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{privilegeId, jdbcType=NVARCHAR} and USER_ID_ = #{userId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteByPrivilegeIdAndGroupId" parameterType="map">
-    delete from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{privilegeId} and GROUP_ID_ = #{groupId}
+    delete from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{privilegeId, jdbcType=NVARCHAR} and GROUP_ID_ = #{groupId, jdbcType=NVARCHAR}
   </delete>
 
   <select id="selectPrivilegeMapping" parameterType="string" resultMap="privilegeMappingResultMap">
-    select * from ${prefix}ACT_ID_PRIV_MAPPING where ID_ = #{id,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_PRIV_MAPPING where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectPrivilegeMappingsByPrivilegeId" parameterType="string" resultMap="privilegeMappingResultMap">
-    select * from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{parameter,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_PRIV_MAPPING where PRIV_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
 </mapper>
\ No newline at end of file
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Token.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Token.xml
index ad852832ae2..5426f46e947 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Token.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/Token.xml
@@ -17,13 +17,13 @@
         USER_ID_,
         TOKEN_DATA_
       ) values (
-        #{id ,jdbcType=VARCHAR},
-        1, #{tokenValue, jdbcType=VARCHAR},
+        #{id, jdbcType=NVARCHAR},
+        1, #{tokenValue, jdbcType=NVARCHAR},
         #{tokenDate, jdbcType=TIMESTAMP},
-        #{ipAddress, jdbcType=VARCHAR},
-        #{userAgent, jdbcType=VARCHAR},
-        #{userId, jdbcType=VARCHAR},
-        #{tokenData, jdbcType=VARCHAR}
+        #{ipAddress, jdbcType=NVARCHAR},
+        #{userAgent, jdbcType=NVARCHAR},
+        #{userId, jdbcType=NVARCHAR},
+        #{tokenData, jdbcType=NVARCHAR}
       )
   </insert>
   
@@ -40,13 +40,13 @@
       ) values 
       <foreach collection="list" item="token" index="index" separator=",">
       (
-        #{token.id ,jdbcType=VARCHAR},
-        1, #{token.tokenValue, jdbcType=VARCHAR},
+        #{token.id, jdbcType=NVARCHAR},
+        1, #{token.tokenValue, jdbcType=NVARCHAR},
         #{token.tokenDate, jdbcType=TIMESTAMP},
-        #{token.ipAddress, jdbcType=VARCHAR},
-        #{token.userAgent, jdbcType=VARCHAR},
-        #{token.userId, jdbcType=VARCHAR},
-        #{token.tokenData, jdbcType=VARCHAR}
+        #{token.ipAddress, jdbcType=NVARCHAR},
+        #{token.userAgent, jdbcType=NVARCHAR},
+        #{token.userId, jdbcType=NVARCHAR},
+        #{token.tokenData, jdbcType=NVARCHAR}
       )
       </foreach>
   </insert>
@@ -64,13 +64,13 @@
             USER_ID_,
             TOKEN_DATA_
       ) VALUES (
-        #{token.id ,jdbcType=VARCHAR},
-        1, #{token.tokenValue, jdbcType=VARCHAR},
+        #{token.id, jdbcType=NVARCHAR},
+        1, #{token.tokenValue, jdbcType=NVARCHAR},
         #{token.tokenDate, jdbcType=TIMESTAMP},
-        #{token.ipAddress, jdbcType=VARCHAR},
-        #{token.userAgent, jdbcType=VARCHAR},
-        #{token.userId, jdbcType=VARCHAR},
-        #{token.tokenData, jdbcType=VARCHAR}
+        #{token.ipAddress, jdbcType=NVARCHAR},
+        #{token.userAgent, jdbcType=NVARCHAR},
+        #{token.userId, jdbcType=NVARCHAR},
+        #{token.tokenData, jdbcType=NVARCHAR}
       )
       </foreach>
       SELECT * FROM dual
@@ -83,38 +83,38 @@
     update ${prefix}ACT_ID_TOKEN
     <set>
       REV_ = #{revisionNext, jdbcType=INTEGER},
-      TOKEN_VALUE_ = #{tokenValue, jdbcType=VARCHAR},
+      TOKEN_VALUE_ = #{tokenValue, jdbcType=NVARCHAR},
       TOKEN_DATE_ = #{tokenDate, jdbcType=TIMESTAMP},
-      IP_ADDRESS_ = #{ipAddress, jdbcType=VARCHAR},
-      USER_AGENT_ = #{userAgent, jdbcType=VARCHAR},
-      USER_ID_ = #{userId, jdbcType=VARCHAR},
-      TOKEN_DATA_ = #{tokenData, jdbcType=VARCHAR},
+      IP_ADDRESS_ = #{ipAddress, jdbcType=NVARCHAR},
+      USER_AGENT_ = #{userAgent, jdbcType=NVARCHAR},
+      USER_ID_ = #{userId, jdbcType=NVARCHAR},
+      TOKEN_DATA_ = #{tokenData, jdbcType=NVARCHAR},
     </set>
-    where ID_ = #{id, jdbcType=VARCHAR} AND REV_ = #{revision, jdbcType=INTEGER}
+    where ID_ = #{id, jdbcType=NVARCHAR} AND REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <!-- TOKEN DELETE -->
   
   <delete id="deleteToken" parameterType="org.flowable.idm.engine.impl.persistence.entity.TokenEntityImpl">
-    delete from ${prefix}ACT_ID_TOKEN where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision}
+    delete from ${prefix}ACT_ID_TOKEN where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
 
   <!-- TOKEN SELECT -->
   
   <resultMap id="tokenResultMap" type="org.flowable.idm.engine.impl.persistence.entity.TokenEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="tokenValue" column="TOKEN_VALUE_" jdbcType="VARCHAR" />
+    <result property="tokenValue" column="TOKEN_VALUE_" jdbcType="NVARCHAR" />
     <result property="tokenDate" column="TOKEN_DATE_" jdbcType="TIMESTAMP" />
-    <result property="ipAddress" column="IP_ADDRESS_" jdbcType="VARCHAR" />
-    <result property="userAgent" column="USER_AGENT_" jdbcType="VARCHAR" />
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
-    <result property="tokenData" column="TOKEN_DATA_" jdbcType="VARCHAR" />
+    <result property="ipAddress" column="IP_ADDRESS_" jdbcType="NVARCHAR" />
+    <result property="userAgent" column="USER_AGENT_" jdbcType="NVARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
+    <result property="tokenData" column="TOKEN_DATA_" jdbcType="NVARCHAR" />
   </resultMap>
   
   <select id="selectToken" parameterType="string" resultMap="tokenResultMap">
-    select * from ${prefix}ACT_ID_TOKEN where ID_ = #{id, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_TOKEN where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectTokenByQueryCriteria" parameterType="org.flowable.idm.engine.impl.TokenQueryImpl" resultMap="tokenResultMap">
@@ -134,50 +134,50 @@
     from ${prefix}ACT_ID_TOKEN RES 
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="ids != null &amp;&amp; !ids.empty">
         and RES.ID_ IN
         <foreach item="id" index="index" collection="ids" 
                  open="(" separator="," close=")">
-          #{id}
+          #{id, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="tokenValue != null">
-        and RES.TOKEN_VALUE_ = #{tokenValue}
+        and RES.TOKEN_VALUE_ = #{tokenValue, jdbcType=NVARCHAR}
       </if>
       <if test="tokenDate != null">
-        and RES.TOKEN_DATE_ = #{tokenDate}
+        and RES.TOKEN_DATE_ = #{tokenDate, jdbcType=TIMESTAMP}
       </if>
       <if test="tokenDateBefore != null">
-        and RES.TOKEN_DATE_ &lt; #{tokenDateBefore}
+        and RES.TOKEN_DATE_ &lt; #{tokenDateBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="tokenDateAfter != null">
-        and RES.TOKEN_DATE_ &gt; #{tokenDateAfter}
+        and RES.TOKEN_DATE_ &gt; #{tokenDateAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="ipAddress != null">
-        and RES.IP_ADDRESS_ = #{ipAddress}
+        and RES.IP_ADDRESS_ = #{ipAddress, jdbcType=NVARCHAR}
       </if>
       <if test="ipAddressLike != null">
-        and RES.IP_ADDRESS_ like #{ipAddressLike}${wildcardEscapeClause}
+        and RES.IP_ADDRESS_ like #{ipAddressLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="userAgent != null">
-        and RES.USER_AGENT_ = #{userAgent}
+        and RES.USER_AGENT_ = #{userAgent, jdbcType=NVARCHAR}
       </if>
       <if test="userAgentLike != null">
-        and RES.USER_AGENT_ like #{userAgentLike}${wildcardEscapeClause}
+        and RES.USER_AGENT_ like #{userAgentLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="userId != null">
-        and RES.USER_ID_ = #{userId}
+        and RES.USER_ID_ = #{userId, jdbcType=NVARCHAR}
       </if>
       <if test="userIdLike != null">
-        and RES.USER_ID_ like #{userIdLike}${wildcardEscapeClause}
+        and RES.USER_ID_ like #{userIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="tokenData != null">
-        and RES.TOKEN_DATA_ = #{tokenData}
+        and RES.TOKEN_DATA_ = #{tokenData, jdbcType=NVARCHAR}
       </if>
       <if test="tokenDataLike != null">
-        and RES.TOKEN_DATA_ like #{tokenDataLike}${wildcardEscapeClause}
+        and RES.TOKEN_DATA_ like #{tokenDataLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
     </where>
   </sql>
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/User.xml b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/User.xml
index 32062d151e1..169637b48ef 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/User.xml
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/mapping/entity/User.xml
@@ -9,26 +9,26 @@
   <insert id="insertUser" parameterType="org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl">
     insert into ${prefix}ACT_ID_USER (ID_, REV_, FIRST_, LAST_, DISPLAY_NAME_, EMAIL_, TENANT_ID_, PWD_)
     values (
-      #{id ,jdbcType=VARCHAR},
-      1, #{firstName ,jdbcType=VARCHAR},
-      #{lastName ,jdbcType=VARCHAR},
-      #{displayName ,jdbcType=VARCHAR},
-      #{email ,jdbcType=VARCHAR},
-      #{tenantId ,jdbcType=VARCHAR},
-      #{password ,jdbcType=VARCHAR}
+      #{id, jdbcType=NVARCHAR},
+      1, #{firstName, jdbcType=NVARCHAR},
+      #{lastName, jdbcType=NVARCHAR},
+      #{displayName, jdbcType=NVARCHAR},
+      #{email, jdbcType=NVARCHAR},
+      #{tenantId, jdbcType=NVARCHAR},
+      #{password, jdbcType=NVARCHAR}
     )
   </insert>
 
   <insert id="bulkInsertUser" parameterType="java.util.List">
     INSERT INTO ${prefix}ACT_ID_USER (ID_, REV_, FIRST_, LAST_, DISPLAY_NAME_, EMAIL_, TENANT_ID_, PWD_) VALUES
       <foreach collection="list" item="user" index="index" separator=",">
-        (#{user.id ,jdbcType=VARCHAR},
-         1, #{user.firstName ,jdbcType=VARCHAR},
-         #{user.lastName ,jdbcType=VARCHAR},
-         #{user.displayName ,jdbcType=VARCHAR},
-         #{user.email ,jdbcType=VARCHAR},
-         #{user.tenantId ,jdbcType=VARCHAR},
-         #{user.password ,jdbcType=VARCHAR})
+        (#{user.id, jdbcType=NVARCHAR},
+         1, #{user.firstName, jdbcType=NVARCHAR},
+         #{user.lastName, jdbcType=NVARCHAR},
+         #{user.displayName, jdbcType=NVARCHAR},
+         #{user.email, jdbcType=NVARCHAR},
+         #{user.tenantId, jdbcType=NVARCHAR},
+         #{user.password, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -36,13 +36,13 @@
     INSERT ALL
       <foreach collection="list" item="user" index="index">
         INTO ${prefix}ACT_ID_USER (ID_, REV_, FIRST_, LAST_, DISPLAY_NAME_, EMAIL_, TENANT_ID_, PWD_) VALUES
-        (#{user.id ,jdbcType=VARCHAR},
-         1, #{user.firstName ,jdbcType=VARCHAR},
-         #{user.lastName ,jdbcType=VARCHAR},
-         #{user.displayName ,jdbcType=VARCHAR},
-         #{user.email ,jdbcType=VARCHAR},
-         #{user.tenantId ,jdbcType=VARCHAR},
-         #{user.password ,jdbcType=VARCHAR})
+        (#{user.id, jdbcType=NVARCHAR},
+         1, #{user.firstName, jdbcType=NVARCHAR},
+         #{user.lastName, jdbcType=NVARCHAR},
+         #{user.displayName, jdbcType=NVARCHAR},
+         #{user.email, jdbcType=NVARCHAR},
+         #{user.tenantId, jdbcType=NVARCHAR},
+         #{user.password, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -52,55 +52,55 @@
   <update id="updateUser" parameterType="org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl">
     update ${prefix}ACT_ID_USER
     <set>
-      REV_ = #{revisionNext ,jdbcType=INTEGER},
+      REV_ = #{revisionNext, jdbcType=INTEGER},
       <if test="originalPersistentState.firstName != firstName">
-        FIRST_ = #{firstName, jdbcType=VARCHAR},
+        FIRST_ = #{firstName, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.lastName != lastName">
-        LAST_ = #{lastName ,jdbcType=VARCHAR},
+        LAST_ = #{lastName, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.displayName != displayName">
-        DISPLAY_NAME_ = #{displayName ,jdbcType=VARCHAR},
+        DISPLAY_NAME_ = #{displayName, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.email != email">
-        EMAIL_ = #{email ,jdbcType=VARCHAR},
+        EMAIL_ = #{email, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.tenantId != tenantId">
-        TENANT_ID_ = #{tenantId ,jdbcType=VARCHAR},
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.password != password">
-        PWD_ = #{password ,jdbcType=VARCHAR},
+        PWD_ = #{password, jdbcType=NVARCHAR},
       </if>
       PICTURE_ID_ = #{pictureByteArrayRef ,typeHandler=IdmByteArrayRefTypeHandler}
     </set>
-    where ID_ = #{id}
-      and REV_ = #{revision}
+    where ID_ = #{id, jdbcType=NVARCHAR}
+      and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <!-- USER DELETE -->
 
   <delete id="deleteUser" parameterType="org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl">
-    delete from ${prefix}ACT_ID_USER where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_ID_USER where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <!-- USER RESULTMAP -->
 
   <resultMap id="userResultMap" type="org.flowable.idm.engine.impl.persistence.entity.UserEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER" />
-    <result property="firstName" column="FIRST_" jdbcType="VARCHAR" />
-    <result property="lastName" column="LAST_" jdbcType="VARCHAR" />
-    <result property="displayName" column="DISPLAY_NAME_" jdbcType="VARCHAR" />
-    <result property="email" column="EMAIL_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="password" column="PWD_" jdbcType="VARCHAR" />
+    <result property="firstName" column="FIRST_" jdbcType="NVARCHAR" />
+    <result property="lastName" column="LAST_" jdbcType="NVARCHAR" />
+    <result property="displayName" column="DISPLAY_NAME_" jdbcType="NVARCHAR" />
+    <result property="email" column="EMAIL_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="password" column="PWD_" jdbcType="NVARCHAR" />
     <result property="pictureByteArrayRef" column="PICTURE_ID_" typeHandler="IdmByteArrayRefTypeHandler" />
   </resultMap>
 
   <!-- USER SELECT -->
 
   <select id="selectUser" parameterType="string" resultMap="userResultMap">
-    select * from ${prefix}ACT_ID_USER where ID_ = #{id,jdbcType=VARCHAR}
+    select * from ${prefix}ACT_ID_USER where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectUserByQueryCriteria" parameterType="org.flowable.idm.engine.impl.UserQueryImpl" resultMap="userResultMap">
@@ -120,66 +120,66 @@
     from ${prefix}ACT_ID_USER RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=NVARCHAR}
       </if>
       <if test="ids != null &amp;&amp; !ids.empty">
         and RES.ID_ IN
         <foreach item="id" index="index" collection="ids"
                  open="(" separator="," close=")">
-          #{id}
+          #{id, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="idIgnoreCase != null">
-        and lower(RES.ID_) = #{idIgnoreCase}
+        and lower(RES.ID_) = #{idIgnoreCase, jdbcType=NVARCHAR}
       </if>
       <if test="firstName != null">
-        and RES.FIRST_ = #{firstName}
+        and RES.FIRST_ = #{firstName, jdbcType=NVARCHAR}
       </if>
       <if test="firstNameLike != null">
-        and RES.FIRST_ like #{firstNameLike}${wildcardEscapeClause}
+        and RES.FIRST_ like #{firstNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="firstNameLikeIgnoreCase != null">
-        and lower(RES.FIRST_) like #{firstNameLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.FIRST_) like #{firstNameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="lastName != null">
-        and RES.LAST_ = #{lastName}
+        and RES.LAST_ = #{lastName, jdbcType=NVARCHAR}
       </if>
       <if test="lastNameLike != null">
-        and RES.LAST_ like #{lastNameLike}${wildcardEscapeClause}
+        and RES.LAST_ like #{lastNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="lastNameLikeIgnoreCase != null">
-        and lower(RES.LAST_) like #{lastNameLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.LAST_) like #{lastNameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="fullNameLike != null">
-        and (CONCAT(CONCAT(RES.FIRST_, ' '), RES.LAST_) like #{fullNameLike}${wildcardEscapeClause})
+        and (CONCAT(CONCAT(RES.FIRST_, ' '), RES.LAST_) like #{fullNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause})
       </if>
       <if test="fullNameLikeIgnoreCase != null">
-        and (lower(CONCAT(CONCAT(RES.FIRST_ , ' '), RES.LAST_)) like #{fullNameLikeIgnoreCase}${wildcardEscapeClause})
+        and (lower(CONCAT(CONCAT(RES.FIRST_ , ' '), RES.LAST_)) like #{fullNameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause})
       </if>
       <if test="displayName != null">
-        and RES.DISPLAY_NAME_ = #{displayName}
+        and RES.DISPLAY_NAME_ = #{displayName, jdbcType=NVARCHAR}
       </if>
       <if test="displayNameLike != null">
-        and RES.DISPLAY_NAME_ like #{displayNameLike}${wildcardEscapeClause}
+        and RES.DISPLAY_NAME_ like #{displayNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="displayNameLikeIgnoreCase != null">
-        and lower(RES.DISPLAY_NAME_) like #{displayNameLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.DISPLAY_NAME_) like #{displayNameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="email != null">
-        and RES.EMAIL_ = #{email}
+        and RES.EMAIL_ = #{email, jdbcType=NVARCHAR}
       </if>
       <if test="emailLike != null">
-        and RES.EMAIL_ like #{emailLike}${wildcardEscapeClause}
+        and RES.EMAIL_ like #{emailLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="groupId != null">
-        and exists(select 1 from ${prefix}ACT_ID_MEMBERSHIP M where M.USER_ID_ = RES.ID_ and M.GROUP_ID_ = #{groupId})
+        and exists(select 1 from ${prefix}ACT_ID_MEMBERSHIP M where M.USER_ID_ = RES.ID_ and M.GROUP_ID_ = #{groupId, jdbcType=NVARCHAR})
       </if>
       <if test="groupIds != null &amp;&amp; !groupIds.empty">
         and exists(select 1 from ${prefix}ACT_ID_MEMBERSHIP M where M.USER_ID_ = RES.ID_ and M.GROUP_ID_ in  
-            <foreach item="groupId" index="index" collection="groupIds" open="(" separator="," close=")">#{groupId}</foreach>)
+            <foreach item="groupId" index="index" collection="groupIds" open="(" separator="," close=")">#{groupId, jdbcType=NVARCHAR}</foreach>)
       </if>
     </where>
   </sql>
@@ -196,7 +196,7 @@
     select RES.* from ${prefix}ACT_ID_USER RES
     inner join ${prefix}ACT_ID_PRIV_MAPPING MAPPING on MAPPING.USER_ID_ = RES.ID_
     inner join ${prefix}ACT_ID_PRIV PRIV on PRIV.ID_ = MAPPING.PRIV_ID_
-    where PRIV.ID_ = #{parameter}
+    where PRIV.ID_ = #{parameter, jdbcType=NVARCHAR}
     order by RES.LAST_
   </select>
 
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
index 55ccc930bb1..737bf39afbb 100644
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
@@ -5,60 +5,60 @@
 <mapper namespace="org.flowable.job.service.impl.persistence.entity.DeadLetterJobEntityImpl">
 
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.DeadLetterJobEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-        <result property="jobType" column="TYPE_" jdbcType="VARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-        <result property="elementId" column="ELEMENT_ID_" jdbcType="VARCHAR" />
-        <result property="elementName" column="ELEMENT_NAME_" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-        <result property="correlationId" column="CORRELATION_ID_" jdbcType="VARCHAR"/>
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+        <result property="elementId" column="ELEMENT_ID_" jdbcType="NVARCHAR" />
+        <result property="elementName" column="ELEMENT_NAME_" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+        <result property="correlationId" column="CORRELATION_ID_" jdbcType="NVARCHAR"/>
         <result property="exceptionByteArrayRef" column="EXCEPTION_STACK_ID_" typeHandler="JobByteArrayRefTypeHandler" />
-        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="VARCHAR" />
-        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="VARCHAR" />
-        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="VARCHAR" />
+        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="NVARCHAR" />
         <result property="customValuesByteArrayRef" column="CUSTOM_VALUES_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
         <result property="duedate" column="DUEDATE_" jdbcType="TIMESTAMP" />
-        <result property="repeat" column="REPEAT_" jdbcType="VARCHAR" />
+        <result property="repeat" column="REPEAT_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <delete id="deleteDeadLetterJob" parameterType="org.flowable.job.service.impl.persistence.entity.DeadLetterJobEntityImpl">
-        delete from ${prefix}ACT_RU_DEADLETTER_JOB where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_DEADLETTER_JOB where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
     
     <delete id="deleteDeadLetterJobsByExecutionId" parameterType="string">
-        delete from ${prefix}ACT_RU_DEADLETTER_JOB where PROCESS_INSTANCE_ID_ = #{id}
+        delete from ${prefix}ACT_RU_DEADLETTER_JOB where PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
     </delete>
 
     <select id="selectDeadLetterJob" parameterType="string" resultMap="jobResultMap">
-        select * from ${prefix}ACT_RU_DEADLETTER_JOB where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_DEADLETTER_JOB where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectDeadLetterJobByCorrelationId" parameterType="string" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_DEADLETTER_JOB
-        where CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR}
+        where CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectDeadLetterJobsByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_DEADLETTER_JOB J
-        where J.EXECUTION_ID_ = #{parameter}
+        where J.EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectDeadLetterJobsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_DEADLETTER_JOB J
-        where J.PROCESS_INSTANCE_ID_ = #{parameter}
+        where J.PROCESS_INSTANCE_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <!-- TIMER INSERT -->
@@ -89,30 +89,30 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
             TENANT_ID_)
-    values (#{id, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
     		#{revision, jdbcType=INTEGER},
-    		#{category, jdbcType=VARCHAR},
-            #{jobType, jdbcType=VARCHAR},
+    		#{category, jdbcType=NVARCHAR},
+            #{jobType, jdbcType=NVARCHAR},
             #{exclusive, jdbcType=BOOLEAN},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{elementId, jdbcType=VARCHAR},
-            #{elementName, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{correlationId, jdbcType=VARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{processDefinitionId, jdbcType=NVARCHAR},
+            #{elementId, jdbcType=NVARCHAR},
+            #{elementName, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{correlationId, jdbcType=NVARCHAR},
             #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{exceptionMessage, jdbcType=VARCHAR},
+            #{exceptionMessage, jdbcType=NVARCHAR},
             #{duedate, jdbcType=TIMESTAMP},
-            #{repeat, jdbcType=VARCHAR},
-            #{jobHandlerType, jdbcType=VARCHAR},
-            #{jobHandlerConfiguration, jdbcType=VARCHAR},
+            #{repeat, jdbcType=NVARCHAR},
+            #{jobHandlerType, jdbcType=NVARCHAR},
+            #{jobHandlerConfiguration, jdbcType=NVARCHAR},
             #{customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             #{createTime, jdbcType=TIMESTAMP},
-            #{tenantId, jdbcType=VARCHAR}
+            #{tenantId, jdbcType=NVARCHAR}
     )
   	</insert>
 
@@ -142,37 +142,37 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
             TENANT_ID_) VALUES
-	    <foreach collection="list" item="job" index="index" separator=",">
-	        (#{job.id, jdbcType=VARCHAR},
-	         #{job.revision, jdbcType=INTEGER},
-	         #{job.category, jdbcType=VARCHAR},
-	         #{job.jobType, jdbcType=VARCHAR},
-	         #{job.exclusive, jdbcType=BOOLEAN},
-	         #{job.executionId, jdbcType=VARCHAR},
-	         #{job.processInstanceId, jdbcType=VARCHAR},
-	         #{job.processDefinitionId, jdbcType=VARCHAR},
-             #{job.elementId, jdbcType=VARCHAR},
-             #{job.elementName, jdbcType=VARCHAR},
-             #{job.scopeId, jdbcType=VARCHAR},
-             #{job.subScopeId, jdbcType=VARCHAR},
-             #{job.scopeType, jdbcType=VARCHAR},
-             #{job.scopeDefinitionId, jdbcType=VARCHAR},
-             #{job.correlationId, jdbcType=VARCHAR},
-	         #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-	         #{job.exceptionMessage, jdbcType=VARCHAR},
-	         #{job.duedate, jdbcType=TIMESTAMP},
-	         #{job.repeat, jdbcType=VARCHAR},
-	         #{job.jobHandlerType, jdbcType=VARCHAR},
-	         #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-	         #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-             #{job.createTime, jdbcType=TIMESTAMP},
-	         #{job.tenantId, jdbcType=VARCHAR})
+	    <foreach collection="list" item="deadLetterJob" index="index" separator=",">
+	        (#{deadLetterJob.id, jdbcType=NVARCHAR},
+	         #{deadLetterJob.revision, jdbcType=INTEGER},
+	         #{deadLetterJob.category, jdbcType=NVARCHAR},
+	         #{deadLetterJob.jobType, jdbcType=NVARCHAR},
+	         #{deadLetterJob.exclusive, jdbcType=BOOLEAN},
+	         #{deadLetterJob.executionId, jdbcType=NVARCHAR},
+	         #{deadLetterJob.processInstanceId, jdbcType=NVARCHAR},
+	         #{deadLetterJob.processDefinitionId, jdbcType=NVARCHAR},
+             #{deadLetterJob.elementId, jdbcType=NVARCHAR},
+             #{deadLetterJob.elementName, jdbcType=NVARCHAR},
+             #{deadLetterJob.scopeId, jdbcType=NVARCHAR},
+             #{deadLetterJob.subScopeId, jdbcType=NVARCHAR},
+             #{deadLetterJob.scopeType, jdbcType=NVARCHAR},
+             #{deadLetterJob.scopeDefinitionId, jdbcType=NVARCHAR},
+             #{deadLetterJob.correlationId, jdbcType=NVARCHAR},
+	         #{deadLetterJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+	         #{deadLetterJob.exceptionMessage, jdbcType=NVARCHAR},
+	         #{deadLetterJob.duedate, jdbcType=TIMESTAMP},
+	         #{deadLetterJob.repeat, jdbcType=NVARCHAR},
+	         #{deadLetterJob.jobHandlerType, jdbcType=NVARCHAR},
+	         #{deadLetterJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+	         #{deadLetterJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+             #{deadLetterJob.createTime, jdbcType=TIMESTAMP},
+	         #{deadLetterJob.tenantId, jdbcType=NVARCHAR})
 	    </foreach>
   	</insert>
 
   	<insert id="bulkInsertDeadLetterJob" databaseId="oracle" parameterType="java.util.List">
     	INSERT ALL
-    	<foreach collection="list" item="job" index="index">
+    	<foreach collection="list" item="deadLetterJob" index="index">
       		INTO ${prefix}ACT_RU_DEADLETTER_JOB (
       		ID_,
       		REV_,
@@ -198,30 +198,30 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
       		TENANT_ID_) VALUES
-      		(#{job.id, jdbcType=VARCHAR},
-       		#{job.revision, jdbcType=INTEGER},
-       		#{job.category, jdbcType=VARCHAR},
-       		#{job.jobType, jdbcType=VARCHAR},
-       		#{job.exclusive, jdbcType=BOOLEAN},
-       		#{job.executionId, jdbcType=VARCHAR},
-       		#{job.processInstanceId, jdbcType=VARCHAR},
-       		#{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-       		#{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-       		#{job.exceptionMessage, jdbcType=VARCHAR},
-       		#{job.duedate, jdbcType=TIMESTAMP},
-       		#{job.repeat, jdbcType=VARCHAR},
-       		#{job.jobHandlerType, jdbcType=VARCHAR},
-       		#{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-       		#{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-       		#{job.tenantId, jdbcType=VARCHAR})
+      		(#{deadLetterJob.id, jdbcType=NVARCHAR},
+       		#{deadLetterJob.revision, jdbcType=INTEGER},
+       		#{deadLetterJob.category, jdbcType=NVARCHAR},
+       		#{deadLetterJob.jobType, jdbcType=NVARCHAR},
+       		#{deadLetterJob.exclusive, jdbcType=BOOLEAN},
+       		#{deadLetterJob.executionId, jdbcType=NVARCHAR},
+       		#{deadLetterJob.processInstanceId, jdbcType=NVARCHAR},
+       		#{deadLetterJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{deadLetterJob.elementId, jdbcType=NVARCHAR},
+            #{deadLetterJob.elementName, jdbcType=NVARCHAR},
+            #{deadLetterJob.scopeId, jdbcType=NVARCHAR},
+            #{deadLetterJob.subScopeId, jdbcType=NVARCHAR},
+            #{deadLetterJob.scopeType, jdbcType=NVARCHAR},
+            #{deadLetterJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{deadLetterJob.correlationId, jdbcType=NVARCHAR},
+       		#{deadLetterJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+       		#{deadLetterJob.exceptionMessage, jdbcType=NVARCHAR},
+       		#{deadLetterJob.duedate, jdbcType=TIMESTAMP},
+       		#{deadLetterJob.repeat, jdbcType=NVARCHAR},
+       		#{deadLetterJob.jobHandlerType, jdbcType=NVARCHAR},
+       		#{deadLetterJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+       		#{deadLetterJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{deadLetterJob.createTime, jdbcType=TIMESTAMP},
+       		#{deadLetterJob.tenantId, jdbcType=NVARCHAR})
     	</foreach>
     	SELECT * FROM dual
   	</insert>
@@ -243,70 +243,70 @@
         from ${prefix}ACT_RU_DEADLETTER_JOB RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="jobIds != null and !jobIds.empty">
                 AND RES.ID_ IN
-                <foreach item="jobId" index="index" collection="jobIds" open="(" separator="," close=")">
-                    #{jobId}
+                <foreach item="id" index="index" collection="jobIds" open="(" separator="," close=")">
+                    #{id, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processInstanceId != null">
-                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId}
+                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutProcessInstanceId">
                 and RES.PROCESS_INSTANCE_ID_ IS NULL
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="handlerType != null">
-                and RES.HANDLER_TYPE_ = #{handlerType}
+                and RES.HANDLER_TYPE_ = #{handlerType, jdbcType=NVARCHAR}
             </if>
             <if test="handlerTypes != null">
                 and RES.HANDLER_TYPE_ in
-                <foreach item="item" index="index" collection="handlerTypes" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="handlerType" index="index" collection="handlerTypes" open="(" separator="," close=")">
+                    #{handlerType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processDefinitionId != null">
-                and RES.PROC_DEF_ID_ = #{processDefinitionId}
+                and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="processDefinitionKey != null">
-                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey})
+                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category}
+                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
-                and RES.ELEMENT_ID_ = #{elementId}
+                and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
             </if>
             <if test="elementName != null">
-                and RES.ELEMENT_NAME_ = #{elementName}
+                and RES.ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR}
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutScopeId">
                 and RES.SCOPE_ID_ IS NULL
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="scopeDefinitionId != null">
-                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="caseDefinitionKey != null">
-                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey})
+                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR})
             </if>
             <if test="correlationId != null">
-                and RES.CORRELATION_ID_ = #{correlationId}
+                and RES.CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
             </if>
             <if test="executable">
                 and (RES.DUEDATE_ is null or RES.DUEDATE_ &lt;= #{now, jdbcType=TIMESTAMP})
@@ -321,28 +321,28 @@
                 and RES.TYPE_ = 'externalWorker'
             </if>
             <if test="duedateHigherThan != null">
-                and RES.DUEDATE_ &gt; #{duedateHigherThan}
+                and RES.DUEDATE_ &gt; #{duedateHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThan != null">
-                and RES.DUEDATE_ &lt; #{duedateLowerThan}
+                and RES.DUEDATE_ &lt; #{duedateLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateHigherThanOrEqual != null">
-                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual}
+                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThanOrEqual != null">
-                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual}
+                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="withException">
                 and (RES.EXCEPTION_MSG_ is not null or RES.EXCEPTION_STACK_ID_ is not null)
             </if>
             <if test="exceptionMessage">
-                and RES.EXCEPTION_MSG_ = #{exceptionMessage}
+                and RES.EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR}
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -356,13 +356,13 @@
     <!-- JOB UPDATE STATEMENTS -->
     <update id="updateDeadLetterJobTenantIdForDeployment" parameterType="java.util.Map">
         update ${prefix}ACT_RU_DEADLETTER_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
         	SELECT J.ID_ from ${prefix}ACT_RU_DEADLETTER_JOB J
         	inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_  = P.ID_
         	inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        	where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        	where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
         )
     </update>
 
@@ -370,7 +370,7 @@
      Tested this on MySQL 5.6: does NOT use a temporary table (so good performance) -->
     <update id="updateDeadLetterJobTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
         update ${prefix}ACT_RU_DEADLETTER_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
 
@@ -380,7 +380,7 @@
 	        FROM  ${prefix}ACT_RU_DEADLETTER_JOB J
 	        inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_  = P.ID_
 	        inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-	        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+	        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
 
         ) AS tempTask
 
@@ -395,28 +395,28 @@
                 RETRIES_ = #{retries, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=VARCHAR},
+                CATEGORY_ = #{category, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
-                ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR},
+                ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementName != elementName">
-                ELEMENT_NAME_ = #{elementName, jdbcType=VARCHAR},
+                ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.correlationId != correlationId">
-                CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR},
+                CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR},
             </if>
             <if test="(exceptionByteArrayRef != null and originalPersistentState.exceptionByteArrayRef == null) or (exceptionByteArrayRef == null and originalPersistentState.exceptionByteArrayRef != null) or (originalPersistentState.exceptionByteArrayRef != exceptionByteArrayRef)">
                 EXCEPTION_STACK_ID_ = #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             </if>
             <if test="originalPersistentState.exceptionMessage != exceptionMessage">
-                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=VARCHAR},
+                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 </mapper>
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/ExternalWorkerJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/ExternalWorkerJob.xml
index 5da4a88cdb8..9e5fbe413b6 100755
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/ExternalWorkerJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/ExternalWorkerJob.xml
@@ -7,57 +7,57 @@
     <!-- JOB RESULTMAP -->
 
     <resultMap id="externalWorkerJobResultMap" type="org.flowable.job.service.impl.persistence.entity.ExternalWorkerJobEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-        <result property="jobType" column="TYPE_" jdbcType="VARCHAR" />
-        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
+        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-        <result property="elementId" column="ELEMENT_ID_" jdbcType="VARCHAR" />
-        <result property="elementName" column="ELEMENT_NAME_" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-        <result property="correlationId" column="CORRELATION_ID_" jdbcType="VARCHAR"/>
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+        <result property="elementId" column="ELEMENT_ID_" jdbcType="NVARCHAR" />
+        <result property="elementName" column="ELEMENT_NAME_" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+        <result property="correlationId" column="CORRELATION_ID_" jdbcType="NVARCHAR"/>
         <result property="retries" column="RETRIES_" jdbcType="INTEGER" />
         <result property="exceptionByteArrayRef" column="EXCEPTION_STACK_ID_" typeHandler="JobByteArrayRefTypeHandler" />
-        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="VARCHAR" />
-        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="VARCHAR" />
-        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="VARCHAR" />
+        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="NVARCHAR" />
         <result property="customValuesByteArrayRef" column="CUSTOM_VALUES_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
         <result property="duedate" column="DUEDATE_" jdbcType="TIMESTAMP" />
-        <result property="repeat" column="REPEAT_" jdbcType="VARCHAR" />
+        <result property="repeat" column="REPEAT_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <!-- JOB SELECT -->
 
     <select id="selectExternalWorkerJob" parameterType="string" resultMap="externalWorkerJobResultMap">
-        select * from ${prefix}ACT_RU_EXTERNAL_JOB where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_EXTERNAL_JOB where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectExternalWorkerJobByCorrelationId" parameterType="string" resultMap="externalWorkerJobResultMap">
         select *
         from ${prefix}ACT_RU_EXTERNAL_JOB
-        where CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR}
+        where CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectExternalWorkerJobsByWorkerId" parameterType="string" resultMap="externalWorkerJobResultMap">
         select *
         from ${prefix}ACT_RU_EXTERNAL_JOB
-        where LOCK_OWNER_ = #{parameter, jdbcType=VARCHAR}
+        where LOCK_OWNER_ = #{parameter, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectExternalWorkerJobsByWorkerIdAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
         select *
         from ${prefix}ACT_RU_EXTERNAL_JOB
-        where LOCK_OWNER_ = #{parameter.workerId, jdbcType=VARCHAR} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
+        where LOCK_OWNER_ = #{parameter.workerId, jdbcType=NVARCHAR} and TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectExternalWorkerJobsToExecute" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
@@ -65,21 +65,21 @@
         SELECT RES.* <if test="needsPaging">${limitBetween}</if>
         from ${prefix}ACT_RU_EXTERNAL_JOB RES
         <where>
-            and HANDLER_CFG_ = #{parameter.topic, jdbcType=VARCHAR}
+            and HANDLER_CFG_ = #{parameter.topic, jdbcType=NVARCHAR}
             <if test="parameter.scopeType != null">
                 <choose>
                     <when test="parameter.scopeType == 'bpmn'">
                         and PROCESS_INSTANCE_ID_ is not null
                     </when>
                     <otherwise>
-                        and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+                        and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
                     </otherwise>
                 </choose>
             </if>
             <if test="parameter.tenantId != null">
                 <choose>
                     <when test="parameter.tenantId != ''">
-                        and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
+                        and TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
                     </when>
                     <otherwise>
                         and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -88,13 +88,13 @@
             </if>
             <trim prefix="AND (" prefixOverrides="OR" suffix=")">
                 <if test="parameter.authorizedUser != null">
-                    exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK IDN where IDN.SCOPE_ID_ = RES.CORRELATION_ID_ and IDN.SCOPE_TYPE_ = 'externalWorker' and IDN.USER_ID_ = #{parameter.authorizedUser})
+                    exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK IDN where IDN.SCOPE_ID_ = RES.CORRELATION_ID_ and IDN.SCOPE_TYPE_ = 'externalWorker' and IDN.USER_ID_ = #{parameter.authorizedUser, jdbcType=NVARCHAR})
                 </if>
                 <if test="parameter.authorizedGroups != null &amp;&amp; !parameter.authorizedGroups.empty">
                     OR exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK IDN where IDN.SCOPE_ID_ = RES.CORRELATION_ID_ and IDN.SCOPE_TYPE_ = 'externalWorker' and IDN.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="parameter.authorizedGroups"
+                    <foreach item="groupId" index="index" collection="parameter.authorizedGroups"
                              open="(" separator="," close=")">
-                        #{group}
+                        #{groupId, jdbcType=NVARCHAR}
                     </foreach>
                     )
                 </if>
@@ -114,14 +114,14 @@
                 SCOPE_TYPE_ is null
             </if>
             <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope != 'all'">
-                SCOPE_TYPE_ = #{parameter.jobExecutionScope}
+                SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=NVARCHAR}
             </if>
             and LOCK_EXP_TIME_ is not null and LOCK_EXP_TIME_ &lt; #{parameter.now, jdbcType=TIMESTAMP}
 
             <if test="parameter.enabledCategories">
                 and CATEGORY_ in
-                <foreach item="item" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
+                    #{category, jdbcType=NVARCHAR}
                 </foreach>
             </if>
         </where>
@@ -131,32 +131,32 @@
     
     <select id="selectExternalWorkerJobsByTypeAndProcessDefinitionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
         select * from ${prefix}ACT_RU_EXTERNAL_JOB
-        where HANDLER_TYPE_ = #{parameter.handlerType}
-        and PROC_DEF_ID_ = #{parameter.processDefinitionId}
+        where HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and PROC_DEF_ID_ = #{parameter.processDefinitionId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectExternalWorkerJobsByConfiguration" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
         select * from ${prefix}ACT_RU_EXTERNAL_JOB
-        where HANDLER_TYPE_ = #{parameter.handlerType}
-        and HANDLER_CFG_ like #{parameter.handlerConfiguration}${wildcardEscapeClause}
+        where HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and HANDLER_CFG_ like #{parameter.handlerConfiguration, jdbcType=NVARCHAR}${wildcardEscapeClause}
     </select>
 
     <select id="selectExternalWorkerJobsByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
         select *
         from ${prefix}ACT_RU_EXTERNAL_JOB J
-        where J.EXECUTION_ID_ = #{parameter}
+        where J.EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectExternalWorkerJobsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
         select *
         from ${prefix}ACT_RU_EXTERNAL_JOB J
-        where J.PROCESS_INSTANCE_ID_ = #{parameter}
+        where J.PROCESS_INSTANCE_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectExternalWorkerJobsByScopeIdAndSubScopeId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="externalWorkerJobResultMap">
         select *
         from ${prefix}ACT_RU_EXTERNAL_JOB
-        where SCOPE_ID_ = #{parameter.scopeId} and SUB_SCOPE_ID_ = #{parameter.subScopeId}
+        where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectExternalWorkerJobByQueryCriteria" parameterType="org.flowable.job.service.impl.ExternalWorkerJobQueryImpl" resultMap="externalWorkerJobResultMap">
@@ -176,91 +176,91 @@
         from ${prefix}ACT_RU_EXTERNAL_JOB RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="jobIds != null and !jobIds.empty">
                 AND RES.ID_ IN
                 <foreach item="jobId" index="index" collection="jobIds" open="(" separator="," close=")">
-                    #{jobId}
+                    #{jobId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processInstanceId != null">
-                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId}
+                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutProcessInstanceId">
                 and RES.PROCESS_INSTANCE_ID_ IS NULL
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="handlerType != null">
-                and RES.HANDLER_TYPE_ = #{handlerType}
+                and RES.HANDLER_TYPE_ = #{handlerType, jdbcType=NVARCHAR}
             </if>
             <if test="handlerTypes != null">
                 and RES.HANDLER_TYPE_ in
-                <foreach item="item" index="index" collection="handlerTypes" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="handlerType" index="index" collection="handlerTypes" open="(" separator="," close=")">
+                    #{handlerType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processDefinitionId != null">
-                and RES.PROC_DEF_ID_ = #{processDefinitionId}
+                and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="processDefinitionKey != null">
-                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey})
+                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category}
+                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
-                and RES.ELEMENT_ID_ = #{elementId}
+                and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
             </if>
             <if test="elementName != null">
-                and RES.ELEMENT_NAME_ = #{elementName}
+                and RES.ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR}
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutScopeId">
                 and RES.SCOPE_ID_ IS NULL
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="scopeDefinitionId != null">
-                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="caseDefinitionKey != null">
-                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey})
+                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="correlationId != null">
-                and RES.CORRELATION_ID_ = #{correlationId}
+                and RES.CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
             </if>
             <if test="duedateHigherThan != null">
-                and RES.DUEDATE_ &gt; #{duedateHigherThan}
+                and RES.DUEDATE_ &gt; #{duedateHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThan != null">
-                and RES.DUEDATE_ &lt; #{duedateLowerThan}
+                and RES.DUEDATE_ &lt; #{duedateLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateHigherThanOrEqual != null">
-                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual}
+                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThanOrEqual != null">
-                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual}
+                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="withException">
                 and (RES.EXCEPTION_MSG_ is not null or RES.EXCEPTION_STACK_ID_ is not null)
             </if>
             <if test="exceptionMessage">
-                and RES.EXCEPTION_MSG_ = #{exceptionMessage}
+                and RES.EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR}
             </if>
             <if test="lockOwner != null">
-                and RES.LOCK_OWNER_ = #{lockOwner}
+                and RES.LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}
             </if>
             <if test="onlyLocked">
                 and RES.LOCK_EXP_TIME_ is not null
@@ -269,10 +269,10 @@
                 and RES.LOCK_EXP_TIME_ is null
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -282,13 +282,13 @@
             </if>
             <trim prefix="AND (" prefixOverrides="OR" suffix=")">
                 <if test="authorizedUser != null">
-                    exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK IDN where IDN.SCOPE_ID_ = RES.CORRELATION_ID_ and IDN.SCOPE_TYPE_ = 'externalWorker' and IDN.USER_ID_ = #{authorizedUser})
+                    exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK IDN where IDN.SCOPE_ID_ = RES.CORRELATION_ID_ and IDN.SCOPE_TYPE_ = 'externalWorker' and IDN.USER_ID_ = #{authorizedUser, jdbcType=NVARCHAR})
                 </if>
                 <if test="authorizedGroups != null &amp;&amp; !authorizedGroups.empty">
                     OR exists (select ID_ from ${prefix}ACT_RU_IDENTITYLINK IDN where IDN.SCOPE_ID_ = RES.CORRELATION_ID_ and IDN.SCOPE_TYPE_ = 'externalWorker' and IDN.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="authorizedGroups"
+                    <foreach item="groupId" index="index" collection="authorizedGroups"
                              open="(" separator="," close=")">
-                        #{group}
+                        #{groupId, jdbcType=NVARCHAR}
                     </foreach>
                     )
                 </if>
@@ -299,23 +299,23 @@
     <!-- JOB DELETE STATEMENTS -->
 
     <delete id="deleteExternalWorkerJob" parameterType="org.flowable.job.service.impl.persistence.entity.ExternalWorkerJobEntityImpl">
-        delete from ${prefix}ACT_RU_EXTERNAL_JOB where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_EXTERNAL_JOB where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="deleteExternalWorkerJobsByExecutionId" parameterType="string">
-        delete from ${prefix}ACT_RU_EXTERNAL_JOB where PROCESS_INSTANCE_ID_ = #{id}
+        delete from ${prefix}ACT_RU_EXTERNAL_JOB where PROCESS_INSTANCE_ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
 
     <!-- JOB UPDATE STATEMENTS -->
     <update id="updateExternalWorkerJobTenantIdForDeployment" parameterType="java.util.Map">
         update ${prefix}ACT_RU_EXTERNAL_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
         SELECT J.ID_ from ${prefix}ACT_RU_EXTERNAL_JOB J
         inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
         inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
         )
     </update>
 
@@ -323,7 +323,7 @@
         table (so good, performance) -->
     <update id="updateExternalWorkerJobTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
         update ${prefix}ACT_RU_EXTERNAL_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
 
@@ -333,7 +333,7 @@
         FROM ${prefix}ACT_RU_EXTERNAL_JOB J
         inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
         inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
 
         ) AS tempTask
 
@@ -341,10 +341,10 @@
     </update>
 
     <update id="updateExternalWorkerJobLocks" parameterType="java.util.Map">
-        update ${prefix}ACT_RU_EXTERNAL_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
+        update ${prefix}ACT_RU_EXTERNAL_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
         where ID_ in
-        <foreach item="job" index="index" collection="externalWorkerJobs" open="(" separator="," close=")">
-            #{job.id}
+        <foreach item="externalWorkerJob" index="index" collection="externalWorkerJobs" open="(" separator="," close=")">
+            #{externalWorkerJob.id, jdbcType=NVARCHAR}
         </foreach>
     </update>
 
@@ -379,33 +379,33 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_)
-        values (#{id, jdbcType=VARCHAR},
+        values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=VARCHAR},
-        #{jobType, jdbcType=VARCHAR},
-        #{lockOwner, jdbcType=VARCHAR},
+        #{category, jdbcType=NVARCHAR},
+        #{jobType, jdbcType=NVARCHAR},
+        #{lockOwner, jdbcType=NVARCHAR},
         #{lockExpirationTime, jdbcType=TIMESTAMP},
         #{exclusive, jdbcType=BOOLEAN},
-        #{executionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{processDefinitionId, jdbcType=VARCHAR},
-        #{elementId, jdbcType=VARCHAR},
-        #{elementName, jdbcType=VARCHAR},
-        #{scopeId, jdbcType=VARCHAR},
-        #{subScopeId, jdbcType=VARCHAR},
-        #{scopeType, jdbcType=VARCHAR},
-        #{scopeDefinitionId, jdbcType=VARCHAR},
-        #{correlationId, jdbcType=VARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{processDefinitionId, jdbcType=NVARCHAR},
+        #{elementId, jdbcType=NVARCHAR},
+        #{elementName, jdbcType=NVARCHAR},
+        #{scopeId, jdbcType=NVARCHAR},
+        #{subScopeId, jdbcType=NVARCHAR},
+        #{scopeType, jdbcType=NVARCHAR},
+        #{scopeDefinitionId, jdbcType=NVARCHAR},
+        #{correlationId, jdbcType=NVARCHAR},
         #{retries, jdbcType=INTEGER},
         #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-        #{exceptionMessage, jdbcType=VARCHAR},
+        #{exceptionMessage, jdbcType=NVARCHAR},
         #{duedate, jdbcType=TIMESTAMP},
-        #{repeat, jdbcType=VARCHAR},
-        #{jobHandlerType, jdbcType=VARCHAR},
-        #{jobHandlerConfiguration, jdbcType=VARCHAR},
+        #{repeat, jdbcType=NVARCHAR},
+        #{jobHandlerType, jdbcType=NVARCHAR},
+        #{jobHandlerConfiguration, jdbcType=NVARCHAR},
         #{customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
         #{createTime, jdbcType=TIMESTAMP},
-        #{tenantId, jdbcType=VARCHAR}
+        #{tenantId, jdbcType=NVARCHAR}
         )
     </insert>
 
@@ -438,40 +438,40 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_) VALUES
-        <foreach collection="list" item="job" index="index" separator=",">
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.lockOwner, jdbcType=VARCHAR},
-            #{job.lockExpirationTime, jdbcType=TIMESTAMP},
-            #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+        <foreach collection="list" item="externalWorkerJob" index="index" separator=",">
+            (#{externalWorkerJob.id, jdbcType=NVARCHAR},
+            #{externalWorkerJob.revision, jdbcType=INTEGER},
+            #{externalWorkerJob.category, jdbcType=NVARCHAR},
+            #{externalWorkerJob.jobType, jdbcType=NVARCHAR},
+            #{externalWorkerJob.lockOwner, jdbcType=NVARCHAR},
+            #{externalWorkerJob.lockExpirationTime, jdbcType=TIMESTAMP},
+            #{externalWorkerJob.exclusive, jdbcType=BOOLEAN},
+            #{externalWorkerJob.executionId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.processInstanceId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.elementId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.elementName, jdbcType=NVARCHAR},
+            #{externalWorkerJob.scopeId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.subScopeId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.scopeType, jdbcType=NVARCHAR},
+            #{externalWorkerJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.correlationId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.retries, jdbcType=INTEGER},
+            #{externalWorkerJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{externalWorkerJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{externalWorkerJob.duedate, jdbcType=TIMESTAMP},
+            #{externalWorkerJob.repeat, jdbcType=NVARCHAR},
+            #{externalWorkerJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{externalWorkerJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{externalWorkerJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{externalWorkerJob.createTime, jdbcType=TIMESTAMP},
+            #{externalWorkerJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
     <insert id="bulkInsertExternalWorkerJob" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="job" index="index">
+        <foreach collection="list" item="externalWorkerJob" index="index">
             INTO ${prefix}ACT_RU_EXTERNAL_JOB (
             ID_,
             REV_,
@@ -500,33 +500,33 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
             TENANT_ID_) VALUES
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.lockOwner, jdbcType=VARCHAR},
-            #{job.lockExpirationTime, jdbcType=TIMESTAMP},
-            #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+            (#{externalWorkerJob.id, jdbcType=NVARCHAR},
+            #{externalWorkerJob.revision, jdbcType=INTEGER},
+            #{externalWorkerJob.category, jdbcType=NVARCHAR},
+            #{externalWorkerJob.jobType, jdbcType=NVARCHAR},
+            #{externalWorkerJob.lockOwner, jdbcType=NVARCHAR},
+            #{externalWorkerJob.lockExpirationTime, jdbcType=TIMESTAMP},
+            #{externalWorkerJob.exclusive, jdbcType=BOOLEAN},
+            #{externalWorkerJob.executionId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.processInstanceId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.elementId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.elementName, jdbcType=NVARCHAR},
+            #{externalWorkerJob.scopeId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.subScopeId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.scopeType, jdbcType=NVARCHAR},
+            #{externalWorkerJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.correlationId, jdbcType=NVARCHAR},
+            #{externalWorkerJob.retries, jdbcType=INTEGER},
+            #{externalWorkerJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{externalWorkerJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{externalWorkerJob.duedate, jdbcType=TIMESTAMP},
+            #{externalWorkerJob.repeat, jdbcType=NVARCHAR},
+            #{externalWorkerJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{externalWorkerJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{externalWorkerJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{externalWorkerJob.createTime, jdbcType=TIMESTAMP},
+            #{externalWorkerJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -541,50 +541,50 @@
                 LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.lockOwner != lockOwner">
-                LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+                LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=VARCHAR},
+                CATEGORY_ = #{category, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.jobHandlerType != jobHandlerType">
-                HANDLER_TYPE_ = #{jobHandlerType, jdbcType=VARCHAR},
+                HANDLER_TYPE_ = #{jobHandlerType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.retries != retries">
                 RETRIES_ = #{retries, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
-                ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR},
+                ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementName != elementName">
-                ELEMENT_NAME_ = #{elementName, jdbcType=VARCHAR},
+                ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.createTime != createTime">
                 CREATE_TIME_ = #{createTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.correlationId != correlationId">
-                CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR},
+                CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.tenantId != tenantId">
-                TENANT_ID_ = #{tenantId, jdbcType=VARCHAR},
+                TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR},
             </if>
             <if test="(exceptionByteArrayRef != null and originalPersistentState.exceptionByteArrayRef == null) or (exceptionByteArrayRef == null and originalPersistentState.exceptionByteArrayRef != null) or (originalPersistentState.exceptionByteArrayRef != exceptionByteArrayRef)">
                 EXCEPTION_STACK_ID_ = #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             </if>
             <if test="originalPersistentState.exceptionMessage != exceptionMessage">
-                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=VARCHAR},
+                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <update id="resetExpiredExternalWorkerJob" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
         update ${prefix}ACT_RU_EXTERNAL_JOB
         set LOCK_OWNER_ = null, LOCK_EXP_TIME_ = null, CREATE_TIME_ = #{parameter.now, jdbcType=TIMESTAMP}
-        where ID_ = #{parameter.id,jdbcType=VARCHAR}
+        where ID_ = #{parameter.id, jdbcType=NVARCHAR}
     </update>
 
 </mapper>
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/HistoryJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/HistoryJob.xml
index 1c4fc2bae8d..e0b9b1b1574 100755
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/HistoryJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/HistoryJob.xml
@@ -7,26 +7,26 @@
     <!-- JOB RESULTMAP -->
 
     <resultMap id="historyJobResultMap" type="org.flowable.job.service.impl.persistence.entity.HistoryJobEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
+        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
         <result property="retries" column="RETRIES_" jdbcType="INTEGER" />
         <result property="exceptionByteArrayRef" column="EXCEPTION_STACK_ID_" typeHandler="JobByteArrayRefTypeHandler" />
-        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="VARCHAR" />
-        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="VARCHAR" />
-        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="VARCHAR" />
+        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="NVARCHAR" />
         <result property="customValuesByteArrayRef" column="CUSTOM_VALUES_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="advancedJobHandlerConfigurationByteArrayRef" column="ADV_HANDLER_CFG_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR" />
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR" />
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <!-- HISTORY JOB SELECT -->
 
     <select id="selectHistoryJob" parameterType="string" resultMap="historyJobResultMap">
-        select * from ${prefix}ACT_RU_HISTORY_JOB where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_HISTORY_JOB where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectHistoryJobsToExecute" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historyJobResultMap">
@@ -38,7 +38,7 @@
                 SCOPE_TYPE_ is null and LOCK_EXP_TIME_ is null
             </if>
             <if test="parameter != null and parameter != 'all'">
-                SCOPE_TYPE_ = #{parameter, jdbcType=VARCHAR} and LOCK_EXP_TIME_ is null
+                SCOPE_TYPE_ = #{parameter, jdbcType=NVARCHAR} and LOCK_EXP_TIME_ is null
             </if>
             <if test="parameter != null and parameter == 'all'">
                 LOCK_EXP_TIME_ is null
@@ -57,7 +57,7 @@
                 SCOPE_TYPE_ is null
             </if>
             <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope != 'all'">
-                SCOPE_TYPE_ = #{parameter.jobExecutionScope}
+                SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=NVARCHAR}
             </if>
             and (LOCK_EXP_TIME_ is not null and LOCK_EXP_TIME_ &lt; #{parameter.now, jdbcType=TIMESTAMP})
         </where>
@@ -67,8 +67,8 @@
 
     <select id="selectHistoryJobsByConfiguration" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historyJobResultMap">
         select * from ${prefix}ACT_RU_HISTORY_JOB
-        where HANDLER_TYPE_ = #{parameter.handlerType}
-        and HANDLER_CFG_ like #{parameter.handlerConfiguration}${wildcardEscapeClause}
+        where HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and HANDLER_CFG_ like #{parameter.handlerConfiguration, jdbcType=NVARCHAR}${wildcardEscapeClause}
     </select>
 
     <select id="selectHistoryJobByQueryCriteria" parameterType="org.flowable.job.service.impl.HistoryJobQueryImpl" resultMap="historyJobResultMap">
@@ -88,28 +88,28 @@
         from ${prefix}ACT_RU_HISTORY_JOB RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="handlerType != null">
-                and RES.HANDLER_TYPE_ = #{handlerType}
+                and RES.HANDLER_TYPE_ = #{handlerType, jdbcType=NVARCHAR}
             </if>
             <if test="handlerTypes != null">
                 and RES.HANDLER_TYPE_ in
-                <foreach item="item" index="index" collection="handlerTypes" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="handlerType" index="index" collection="handlerTypes" open="(" separator="," close=")">
+                    #{handlerType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="withException">
                 and (RES.EXCEPTION_MSG_ is not null or RES.EXCEPTION_STACK_ID_ is not null)
             </if>
             <if test="exceptionMessage">
-                and RES.EXCEPTION_MSG_ = #{exceptionMessage}
+                and RES.EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="lockOwner != null">
-                and RES.LOCK_OWNER_ = #{lockOwner}
+                and RES.LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}
             </if>
             <if test="onlyLocked">
                 and RES.LOCK_EXP_TIME_ is not null
@@ -118,10 +118,10 @@
                 and RES.LOCK_EXP_TIME_ is null
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -135,13 +135,13 @@
     <!-- JOB DELETE STATEMENTS -->
 
     <delete id="deleteHistoryJob" parameterType="org.flowable.job.service.impl.persistence.entity.HistoryJobEntityImpl">
-        delete from ${prefix}ACT_RU_HISTORY_JOB where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_HISTORY_JOB where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="bulkDeleteHistoryJob" parameterType="java.util.Collection">
         delete from ${prefix}ACT_RU_HISTORY_JOB where
         <foreach item="job" collection="list" index="index" separator=" or ">
-            ID_ = #{job.id, jdbcType=VARCHAR}
+            ID_ = #{job.id, jdbcType=NVARCHAR}
         </foreach>
     </delete>
 
@@ -163,20 +163,20 @@
         CREATE_TIME_,
         SCOPE_TYPE_,
         TENANT_ID_)
-        values (#{id, jdbcType=VARCHAR},
+        values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{lockOwner, jdbcType=VARCHAR},
+        #{lockOwner, jdbcType=NVARCHAR},
         #{lockExpirationTime, jdbcType=TIMESTAMP},
         #{retries, jdbcType=INTEGER},
         #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-        #{exceptionMessage, jdbcType=VARCHAR},
-        #{jobHandlerType, jdbcType=VARCHAR},
-        #{jobHandlerConfiguration, jdbcType=VARCHAR},
+        #{exceptionMessage, jdbcType=NVARCHAR},
+        #{jobHandlerType, jdbcType=NVARCHAR},
+        #{jobHandlerConfiguration, jdbcType=NVARCHAR},
         #{customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
         #{advancedJobHandlerConfigurationByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
         #{createTime, jdbcType=TIMESTAMP},
-        #{scopeType, jdbcType=VARCHAR},
-        #{tenantId, jdbcType=VARCHAR}
+        #{scopeType, jdbcType=NVARCHAR},
+        #{tenantId, jdbcType=NVARCHAR}
         )
     </insert>
 
@@ -197,28 +197,28 @@
         SCOPE_TYPE_,
         TENANT_ID_
         ) VALUES
-        <foreach collection="list" item="job" index="index" separator=",">
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.lockOwner, jdbcType=VARCHAR},
-            #{job.lockExpirationTime, jdbcType=TIMESTAMP},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.advancedJobHandlerConfigurationByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.tenantId, jdbcType=VARCHAR}
+        <foreach collection="list" item="historyJob" index="index" separator=",">
+            (#{historyJob.id, jdbcType=NVARCHAR},
+            #{historyJob.revision, jdbcType=INTEGER},
+            #{historyJob.lockOwner, jdbcType=NVARCHAR},
+            #{historyJob.lockExpirationTime, jdbcType=TIMESTAMP},
+            #{historyJob.retries, jdbcType=INTEGER},
+            #{historyJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{historyJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{historyJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{historyJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{historyJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{historyJob.advancedJobHandlerConfigurationByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{historyJob.createTime, jdbcType=TIMESTAMP},
+            #{historyJob.scopeType, jdbcType=NVARCHAR},
+            #{historyJob.tenantId, jdbcType=NVARCHAR}
             )
         </foreach>
     </insert>
 
     <insert id="bulkInsertHistoryJob" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="job" index="index">
+        <foreach collection="list" item="historyJob" index="index">
             INTO ${prefix}ACT_RU_HISTORY_JOB (
             ID_,
             REV_,
@@ -234,20 +234,20 @@
             CREATE_TIME_,
             SCOPE_TYPE_,
             TENANT_ID_) VALUES
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.lockOwner, jdbcType=VARCHAR},
-            #{job.lockExpirationTime, jdbcType=TIMESTAMP},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.advancedJobHandlerConfigurationByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.tenantId, jdbcType=VARCHAR})
+            (#{historyJob.id, jdbcType=NVARCHAR},
+            #{historyJob.revision, jdbcType=INTEGER},
+            #{historyJob.lockOwner, jdbcType=NVARCHAR},
+            #{historyJob.lockExpirationTime, jdbcType=TIMESTAMP},
+            #{historyJob.retries, jdbcType=INTEGER},
+            #{historyJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{historyJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{historyJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{historyJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{historyJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{historyJob.advancedJobHandlerConfigurationByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{historyJob.createTime, jdbcType=TIMESTAMP},
+            #{historyJob.scopeType, jdbcType=NVARCHAR},
+            #{historyJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -262,10 +262,10 @@
                 LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.lockOwner != lockOwner">
-                LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+                LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.jobHandlerType != jobHandlerType">
-                HANDLER_TYPE_ = #{jobHandlerType, jdbcType=VARCHAR},
+                HANDLER_TYPE_ = #{jobHandlerType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.retries != retries">
                 RETRIES_ = #{retries, jdbcType=INTEGER},
@@ -274,27 +274,27 @@
                 EXCEPTION_STACK_ID_ = #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             </if>
             <if test="originalPersistentState.exceptionMessage != exceptionMessage">
-                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=VARCHAR},
+                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeType != scopeType">
-                SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+                SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <update id="resetExpiredHistoryJob" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
         update ${prefix}ACT_RU_HISTORY_JOB
         set LOCK_OWNER_ = null, LOCK_EXP_TIME_ = null
-        where ID_ = #{id,jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
     </update>
 
     <update id="updateHistoryJobLocks" parameterType="java.util.Map">
-        update ${prefix}ACT_RU_HISTORY_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
+        update ${prefix}ACT_RU_HISTORY_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
         where ID_ in
         <foreach item="job" index="index" collection="historyJobs" open="(" separator="," close=")">
-            #{job.id}
+            #{job.id, jdbcType=NVARCHAR}
         </foreach>
     </update>
 
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
index 7e26c60c606..cbb3c6bba7e 100755
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
@@ -7,45 +7,45 @@
     <!-- JOB RESULTMAP -->
 
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.JobEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-        <result property="jobType" column="TYPE_" jdbcType="VARCHAR" />
-        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
+        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-        <result property="elementId" column="ELEMENT_ID_" jdbcType="VARCHAR" />
-        <result property="elementName" column="ELEMENT_NAME_" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-        <result property="correlationId" column="CORRELATION_ID_" jdbcType="VARCHAR"/>
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+        <result property="elementId" column="ELEMENT_ID_" jdbcType="NVARCHAR" />
+        <result property="elementName" column="ELEMENT_NAME_" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+        <result property="correlationId" column="CORRELATION_ID_" jdbcType="NVARCHAR"/>
         <result property="retries" column="RETRIES_" jdbcType="INTEGER" />
         <result property="exceptionByteArrayRef" column="EXCEPTION_STACK_ID_" typeHandler="JobByteArrayRefTypeHandler" />
-        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="VARCHAR" />
-        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="VARCHAR" />
-        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="VARCHAR" />
+        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="NVARCHAR" />
         <result property="customValuesByteArrayRef" column="CUSTOM_VALUES_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
         <result property="duedate" column="DUEDATE_" jdbcType="TIMESTAMP" />
-        <result property="repeat" column="REPEAT_" jdbcType="VARCHAR" />
+        <result property="repeat" column="REPEAT_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <!-- JOB SELECT -->
 
     <select id="selectJob" parameterType="string" resultMap="jobResultMap">
-        select * from ${prefix}ACT_RU_JOB where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_JOB where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectJobByCorrelationId" parameterType="string" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_JOB
-        where CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR}
+        where CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectJobsToExecute" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
@@ -57,15 +57,15 @@
                 SCOPE_TYPE_ is null and LOCK_EXP_TIME_ is null
             </if>
             <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope != 'all'">
-                SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=VARCHAR} and LOCK_EXP_TIME_ is null
+                SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=NVARCHAR} and LOCK_EXP_TIME_ is null
             </if>
             <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope == 'all'">
                 LOCK_EXP_TIME_ is null
             </if>
             <if test="parameter.enabledCategories != null">
                 and CATEGORY_ in
-                <foreach item="item" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
+                    #{category, jdbcType=NVARCHAR}
                 </foreach>
             </if>
         </where>
@@ -82,13 +82,13 @@
                 SCOPE_TYPE_ is null
             </if>
             <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope != 'all'">
-                SCOPE_TYPE_ = #{parameter.jobExecutionScope}
+                SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=NVARCHAR}
             </if>
               and (LOCK_EXP_TIME_ is not null and LOCK_EXP_TIME_ &lt; #{parameter.now, jdbcType=TIMESTAMP})
             <if test="parameter.enabledCategories">
                 and CATEGORY_ in
-                <foreach item="item" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
+                    #{category, jdbcType=NVARCHAR}
                 </foreach>
             </if>
         </where>
@@ -98,26 +98,26 @@
     
     <select id="selectJobsByTypeAndProcessDefinitionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select * from ${prefix}ACT_RU_JOB
-        where HANDLER_TYPE_ = #{parameter.handlerType}
-        and PROC_DEF_ID_ = #{parameter.processDefinitionId}
+        where HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and PROC_DEF_ID_ = #{parameter.processDefinitionId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectJobsByConfiguration" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select * from ${prefix}ACT_RU_JOB
-        where HANDLER_TYPE_ = #{parameter.handlerType}
-        and HANDLER_CFG_ like #{parameter.handlerConfiguration}${wildcardEscapeClause}
+        where HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and HANDLER_CFG_ like #{parameter.handlerConfiguration, jdbcType=NVARCHAR}${wildcardEscapeClause}
     </select>
 
     <select id="selectJobsByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_JOB J
-        where J.EXECUTION_ID_ = #{parameter}
+        where J.EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectJobsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_JOB J
-        where J.PROCESS_INSTANCE_ID_ = #{parameter}
+        where J.PROCESS_INSTANCE_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectJobByQueryCriteria" parameterType="org.flowable.job.service.impl.JobQueryImpl" resultMap="jobResultMap">
@@ -137,70 +137,70 @@
         from ${prefix}ACT_RU_JOB RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="jobIds != null and !jobIds.empty">
                 AND RES.ID_ IN
                 <foreach item="jobId" index="index" collection="jobIds" open="(" separator="," close=")">
-                    #{jobId}
+                    #{jobId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processInstanceId != null">
-                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId}
+                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutProcessInstanceId">
                 and RES.PROCESS_INSTANCE_ID_ IS NULL
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="handlerType != null">
-                and RES.HANDLER_TYPE_ = #{handlerType}
+                and RES.HANDLER_TYPE_ = #{handlerType, jdbcType=NVARCHAR}
             </if>
             <if test="handlerTypes != null">
                 and RES.HANDLER_TYPE_ in
-                <foreach item="item" index="index" collection="handlerTypes" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="handlerType" index="index" collection="handlerTypes" open="(" separator="," close=")">
+                    #{handlerType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processDefinitionId != null">
-                and RES.PROC_DEF_ID_ = #{processDefinitionId}
+                and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="processDefinitionKey != null">
-                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey})
+                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category}
+                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
-                and RES.ELEMENT_ID_ = #{elementId}
+                and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
             </if>
             <if test="elementName != null">
-                and RES.ELEMENT_NAME_ = #{elementName}
+                and RES.ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR}
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutScopeId">
                 and RES.SCOPE_ID_ IS NULL
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="scopeDefinitionId != null">
-                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="caseDefinitionKey != null">
-                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey})
+                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="correlationId != null">
-                and RES.CORRELATION_ID_ = #{correlationId}
+                and RES.CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
             </if>
             <if test="onlyTimers">
                 and RES.TYPE_ = 'timer'
@@ -209,25 +209,25 @@
                 and RES.TYPE_ = 'message'
             </if>
             <if test="duedateHigherThan != null">
-                and RES.DUEDATE_ &gt; #{duedateHigherThan}
+                and RES.DUEDATE_ &gt; #{duedateHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThan != null">
-                and RES.DUEDATE_ &lt; #{duedateLowerThan}
+                and RES.DUEDATE_ &lt; #{duedateLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateHigherThanOrEqual != null">
-                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual}
+                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThanOrEqual != null">
-                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual}
+                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="withException">
                 and (RES.EXCEPTION_MSG_ is not null or RES.EXCEPTION_STACK_ID_ is not null)
             </if>
             <if test="exceptionMessage">
-                and RES.EXCEPTION_MSG_ = #{exceptionMessage}
+                and RES.EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR}
             </if>
             <if test="lockOwner != null">
-                and RES.LOCK_OWNER_ = #{lockOwner}
+                and RES.LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}
             </if>
             <if test="onlyLocked">
                 and RES.LOCK_EXP_TIME_ is not null
@@ -236,10 +236,10 @@
                 and RES.LOCK_EXP_TIME_ is null
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -253,23 +253,23 @@
     <!-- JOB DELETE STATEMENTS -->
 
     <delete id="deleteJob" parameterType="org.flowable.job.service.impl.persistence.entity.JobEntityImpl">
-        delete from ${prefix}ACT_RU_JOB where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_JOB where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="deleteJobsByExecutionId" parameterType="string">
-        delete from ${prefix}ACT_RU_JOB where EXECUTION_ID_ = #{id}
+        delete from ${prefix}ACT_RU_JOB where EXECUTION_ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
 
     <!-- JOB UPDATE STATEMENTS -->
     <update id="updateJobTenantIdForDeployment" parameterType="java.util.Map">
         update ${prefix}ACT_RU_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
         SELECT J.ID_ from ${prefix}ACT_RU_JOB J
         inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
         inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
         )
     </update>
 
@@ -277,7 +277,7 @@
         table (so good, performance) -->
     <update id="updateJobTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
         update ${prefix}ACT_RU_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
 
@@ -287,7 +287,7 @@
         FROM ${prefix}ACT_RU_JOB J
         inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
         inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
 
         ) AS tempTask
 
@@ -295,10 +295,10 @@
     </update>
 
     <update id="updateJobLocks" parameterType="java.util.Map">
-        update ${prefix}ACT_RU_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
+        update ${prefix}ACT_RU_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
         where ID_ in
         <foreach item="job" index="index" collection="jobs" open="(" separator="," close=")">
-            #{job.id}
+            #{job.id, jdbcType=NVARCHAR}
         </foreach>
     </update>
 
@@ -333,33 +333,33 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_)
-        values (#{id, jdbcType=VARCHAR},
+        values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=VARCHAR},
-        #{jobType, jdbcType=VARCHAR},
-        #{lockOwner, jdbcType=VARCHAR},
+        #{category, jdbcType=NVARCHAR},
+        #{jobType, jdbcType=NVARCHAR},
+        #{lockOwner, jdbcType=NVARCHAR},
         #{lockExpirationTime, jdbcType=TIMESTAMP},
         #{exclusive, jdbcType=BOOLEAN},
-        #{executionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{processDefinitionId, jdbcType=VARCHAR},
-        #{elementId, jdbcType=VARCHAR},
-        #{elementName, jdbcType=VARCHAR},
-        #{scopeId, jdbcType=VARCHAR},
-        #{subScopeId, jdbcType=VARCHAR},
-        #{scopeType, jdbcType=VARCHAR},
-        #{scopeDefinitionId, jdbcType=VARCHAR},
-        #{correlationId, jdbcType=VARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{processDefinitionId, jdbcType=NVARCHAR},
+        #{elementId, jdbcType=NVARCHAR},
+        #{elementName, jdbcType=NVARCHAR},
+        #{scopeId, jdbcType=NVARCHAR},
+        #{subScopeId, jdbcType=NVARCHAR},
+        #{scopeType, jdbcType=NVARCHAR},
+        #{scopeDefinitionId, jdbcType=NVARCHAR},
+        #{correlationId, jdbcType=NVARCHAR},
         #{retries, jdbcType=INTEGER},
         #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-        #{exceptionMessage, jdbcType=VARCHAR},
+        #{exceptionMessage, jdbcType=NVARCHAR},
         #{duedate, jdbcType=TIMESTAMP},
-        #{repeat, jdbcType=VARCHAR},
-        #{jobHandlerType, jdbcType=VARCHAR},
-        #{jobHandlerConfiguration, jdbcType=VARCHAR},
+        #{repeat, jdbcType=NVARCHAR},
+        #{jobHandlerType, jdbcType=NVARCHAR},
+        #{jobHandlerConfiguration, jdbcType=NVARCHAR},
         #{customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
         #{createTime, jdbcType=TIMESTAMP},
-        #{tenantId, jdbcType=VARCHAR}
+        #{tenantId, jdbcType=NVARCHAR}
         )
     </insert>
 
@@ -393,33 +393,33 @@
         CREATE_TIME_,
         TENANT_ID_) VALUES
         <foreach collection="list" item="job" index="index" separator=",">
-            (#{job.id, jdbcType=VARCHAR},
+            (#{job.id, jdbcType=NVARCHAR},
             #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.lockOwner, jdbcType=VARCHAR},
+            #{job.category, jdbcType=NVARCHAR},
+            #{job.jobType, jdbcType=NVARCHAR},
+            #{job.lockOwner, jdbcType=NVARCHAR},
             #{job.lockExpirationTime, jdbcType=TIMESTAMP},
             #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
+            #{job.executionId, jdbcType=NVARCHAR},
+            #{job.processInstanceId, jdbcType=NVARCHAR},
+            #{job.processDefinitionId, jdbcType=NVARCHAR},
+            #{job.elementId, jdbcType=NVARCHAR},
+            #{job.elementName, jdbcType=NVARCHAR},
+            #{job.scopeId, jdbcType=NVARCHAR},
+            #{job.subScopeId, jdbcType=NVARCHAR},
+            #{job.scopeType, jdbcType=NVARCHAR},
+            #{job.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{job.correlationId, jdbcType=NVARCHAR},
             #{job.retries, jdbcType=INTEGER},
             #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
+            #{job.exceptionMessage, jdbcType=NVARCHAR},
             #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
+            #{job.repeat, jdbcType=NVARCHAR},
+            #{job.jobHandlerType, jdbcType=NVARCHAR},
+            #{job.jobHandlerConfiguration, jdbcType=NVARCHAR},
             #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+            #{job.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
@@ -454,33 +454,33 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
             TENANT_ID_) VALUES
-            (#{job.id, jdbcType=VARCHAR},
+            (#{job.id, jdbcType=NVARCHAR},
             #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.lockOwner, jdbcType=VARCHAR},
+            #{job.category, jdbcType=NVARCHAR},
+            #{job.jobType, jdbcType=NVARCHAR},
+            #{job.lockOwner, jdbcType=NVARCHAR},
             #{job.lockExpirationTime, jdbcType=TIMESTAMP},
             #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
+            #{job.executionId, jdbcType=NVARCHAR},
+            #{job.processInstanceId, jdbcType=NVARCHAR},
+            #{job.processDefinitionId, jdbcType=NVARCHAR},
+            #{job.elementId, jdbcType=NVARCHAR},
+            #{job.elementName, jdbcType=NVARCHAR},
+            #{job.scopeId, jdbcType=NVARCHAR},
+            #{job.subScopeId, jdbcType=NVARCHAR},
+            #{job.scopeType, jdbcType=NVARCHAR},
+            #{job.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{job.correlationId, jdbcType=NVARCHAR},
             #{job.retries, jdbcType=INTEGER},
             #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
+            #{job.exceptionMessage, jdbcType=NVARCHAR},
             #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
+            #{job.repeat, jdbcType=NVARCHAR},
+            #{job.jobHandlerType, jdbcType=NVARCHAR},
+            #{job.jobHandlerConfiguration, jdbcType=NVARCHAR},
             #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+            #{job.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -495,47 +495,47 @@
                 LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.lockOwner != lockOwner">
-                LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+                LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=VARCHAR},
+                CATEGORY_ = #{category, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.jobHandlerType != jobHandlerType">
-                HANDLER_TYPE_ = #{jobHandlerType, jdbcType=VARCHAR},
+                HANDLER_TYPE_ = #{jobHandlerType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.retries != retries">
                 RETRIES_ = #{retries, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
-                ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR},
+                ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementName != elementName">
-                ELEMENT_NAME_ = #{elementName, jdbcType=VARCHAR},
+                ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.createTime != createTime">
                 CREATE_TIME_ = #{createTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.correlationId != correlationId">
-                CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR},
+                CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR},
             </if>
             <if test="(exceptionByteArrayRef != null and originalPersistentState.exceptionByteArrayRef == null) or (exceptionByteArrayRef == null and originalPersistentState.exceptionByteArrayRef != null) or (originalPersistentState.exceptionByteArrayRef != exceptionByteArrayRef)">
                 EXCEPTION_STACK_ID_ = #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             </if>
             <if test="originalPersistentState.exceptionMessage != exceptionMessage">
-                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=VARCHAR},
+                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <update id="resetExpiredJob" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject">
         update ${prefix}ACT_RU_JOB
         set LOCK_OWNER_ = null, LOCK_EXP_TIME_ = null, CREATE_TIME_ = #{parameter.now, jdbcType=TIMESTAMP}
-        where ID_ = #{parameter.id,jdbcType=VARCHAR}
+        where ID_ = #{parameter.id, jdbcType=NVARCHAR}
     </update>
 
     <select id="selectTimersByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
@@ -543,7 +543,7 @@
         from ${prefix}ACT_RU_JOB
         where (RETRIES_ &gt; 0)
         and (TYPE_ = 'timer')
-        and (EXECUTION_ID_ = #{parameter})
+        and (EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR})
     </select>
 
 </mapper>
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
index 84a5cb40765..1a17c183af6 100644
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
@@ -5,62 +5,62 @@
 <mapper namespace="org.flowable.job.service.impl.persistence.entity.SuspendedJobEntityImpl">
 
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.SuspendedJobEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-        <result property="jobType" column="TYPE_" jdbcType="VARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-        <result property="elementId" column="ELEMENT_ID_" jdbcType="VARCHAR" />
-        <result property="elementName" column="ELEMENT_NAME_" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-        <result property="correlationId" column="CORRELATION_ID_" jdbcType="VARCHAR"/>
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+        <result property="elementId" column="ELEMENT_ID_" jdbcType="NVARCHAR" />
+        <result property="elementName" column="ELEMENT_NAME_" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+        <result property="correlationId" column="CORRELATION_ID_" jdbcType="NVARCHAR"/>
         <result property="retries" column="RETRIES_" jdbcType="INTEGER" />
         <result property="exceptionByteArrayRef" column="EXCEPTION_STACK_ID_" typeHandler="JobByteArrayRefTypeHandler" />
-        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="VARCHAR" />
-        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="VARCHAR" />
-        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="VARCHAR" />
+        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="NVARCHAR" />
         <result property="customValuesByteArrayRef" column="CUSTOM_VALUES_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
         <result property="duedate" column="DUEDATE_" jdbcType="TIMESTAMP" />
-        <result property="repeat" column="REPEAT_" jdbcType="VARCHAR" />
+        <result property="repeat" column="REPEAT_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <delete id="deleteSuspendedJob" parameterType="org.flowable.job.service.impl.persistence.entity.SuspendedJobEntityImpl">
-        delete from ${prefix}ACT_RU_SUSPENDED_JOB where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_SUSPENDED_JOB where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
     
     <delete id="deleteSuspendedJobsByExecutionId" parameterType="string">
-        delete from ${prefix}ACT_RU_SUSPENDED_JOB where PROCESS_INSTANCE_ID_ = #{id}
+        delete from ${prefix}ACT_RU_SUSPENDED_JOB where PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
     </delete>
 
     <select id="selectSuspendedJob" parameterType="string" resultMap="jobResultMap">
-        select * from ${prefix}ACT_RU_SUSPENDED_JOB where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_SUSPENDED_JOB where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectSuspendedJobByCorrelationId" parameterType="string" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_SUSPENDED_JOB
-        where CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR}
+        where CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectSuspendedJobsByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from
         ${prefix}ACT_RU_SUSPENDED_JOB J
-        where J.EXECUTION_ID_ = #{parameter}
+        where J.EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectSuspendedJobsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_SUSPENDED_JOB J
-        where J.PROCESS_INSTANCE_ID_ = #{parameter}
+        where J.PROCESS_INSTANCE_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <!-- TIMER INSERT -->
@@ -92,31 +92,31 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_)
-        values (#{id, jdbcType=VARCHAR},
+        values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=VARCHAR},
-        #{jobType, jdbcType=VARCHAR},
+        #{category, jdbcType=NVARCHAR},
+        #{jobType, jdbcType=NVARCHAR},
         #{exclusive, jdbcType=BOOLEAN},
-        #{executionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{processDefinitionId, jdbcType=VARCHAR},
-        #{elementId, jdbcType=VARCHAR},
-        #{elementName, jdbcType=VARCHAR},
-        #{scopeId, jdbcType=VARCHAR},
-        #{subScopeId, jdbcType=VARCHAR},
-        #{scopeType, jdbcType=VARCHAR},
-        #{scopeDefinitionId, jdbcType=VARCHAR},
-        #{correlationId, jdbcType=VARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{processDefinitionId, jdbcType=NVARCHAR},
+        #{elementId, jdbcType=NVARCHAR},
+        #{elementName, jdbcType=NVARCHAR},
+        #{scopeId, jdbcType=NVARCHAR},
+        #{subScopeId, jdbcType=NVARCHAR},
+        #{scopeType, jdbcType=NVARCHAR},
+        #{scopeDefinitionId, jdbcType=NVARCHAR},
+        #{correlationId, jdbcType=NVARCHAR},
         #{retries, jdbcType=INTEGER},
         #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-        #{exceptionMessage, jdbcType=VARCHAR},
+        #{exceptionMessage, jdbcType=NVARCHAR},
         #{duedate, jdbcType=TIMESTAMP},
-        #{repeat, jdbcType=VARCHAR},
-        #{jobHandlerType, jdbcType=VARCHAR},
-        #{jobHandlerConfiguration, jdbcType=VARCHAR},
+        #{repeat, jdbcType=NVARCHAR},
+        #{jobHandlerType, jdbcType=NVARCHAR},
+        #{jobHandlerConfiguration, jdbcType=NVARCHAR},
         #{customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
         #{createTime, jdbcType=TIMESTAMP},
-        #{tenantId, jdbcType=VARCHAR}
+        #{tenantId, jdbcType=NVARCHAR}
         )
     </insert>
 
@@ -147,38 +147,38 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_) VALUES
-        <foreach collection="list" item="job" index="index" separator=",">
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+        <foreach collection="list" item="suspendedJob" index="index" separator=",">
+            (#{suspendedJob.id, jdbcType=NVARCHAR},
+            #{suspendedJob.revision, jdbcType=INTEGER},
+            #{suspendedJob.category, jdbcType=NVARCHAR},
+            #{suspendedJob.jobType, jdbcType=NVARCHAR},
+            #{suspendedJob.exclusive, jdbcType=BOOLEAN},
+            #{suspendedJob.executionId, jdbcType=NVARCHAR},
+            #{suspendedJob.processInstanceId, jdbcType=NVARCHAR},
+            #{suspendedJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{suspendedJob.elementId, jdbcType=NVARCHAR},
+            #{suspendedJob.elementName, jdbcType=NVARCHAR},
+            #{suspendedJob.scopeId, jdbcType=NVARCHAR},
+            #{suspendedJob.subScopeId, jdbcType=NVARCHAR},
+            #{suspendedJob.scopeType, jdbcType=NVARCHAR},
+            #{suspendedJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{suspendedJob.correlationId, jdbcType=NVARCHAR},
+            #{suspendedJob.retries, jdbcType=INTEGER},
+            #{suspendedJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{suspendedJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{suspendedJob.duedate, jdbcType=TIMESTAMP},
+            #{suspendedJob.repeat, jdbcType=NVARCHAR},
+            #{suspendedJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{suspendedJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{suspendedJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{suspendedJob.createTime, jdbcType=TIMESTAMP},
+            #{suspendedJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
     <insert id="bulkInsertSuspendedJob" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="job" index="index">
+        <foreach collection="list" item="suspendedJob" index="index">
             INTO ${prefix}ACT_RU_SUSPENDED_JOB (
             ID_,
             REV_,
@@ -205,31 +205,31 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
             TENANT_ID_) VALUES
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+            (#{suspendedJob.id, jdbcType=NVARCHAR},
+            #{suspendedJob.revision, jdbcType=INTEGER},
+            #{suspendedJob.category, jdbcType=NVARCHAR},
+            #{suspendedJob.jobType, jdbcType=NVARCHAR},
+            #{suspendedJob.exclusive, jdbcType=BOOLEAN},
+            #{suspendedJob.executionId, jdbcType=NVARCHAR},
+            #{suspendedJob.processInstanceId, jdbcType=NVARCHAR},
+            #{suspendedJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{suspendedJob.elementId, jdbcType=NVARCHAR},
+            #{suspendedJob.elementName, jdbcType=NVARCHAR},
+            #{suspendedJob.scopeId, jdbcType=NVARCHAR},
+            #{suspendedJob.subScopeId, jdbcType=NVARCHAR},
+            #{suspendedJob.scopeType, jdbcType=NVARCHAR},
+            #{suspendedJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{suspendedJob.correlationId, jdbcType=NVARCHAR},
+            #{suspendedJob.retries, jdbcType=INTEGER},
+            #{suspendedJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{suspendedJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{suspendedJob.duedate, jdbcType=TIMESTAMP},
+            #{suspendedJob.repeat, jdbcType=NVARCHAR},
+            #{suspendedJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{suspendedJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{suspendedJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{suspendedJob.createTime, jdbcType=TIMESTAMP},
+            #{suspendedJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -251,70 +251,70 @@
         from ${prefix}ACT_RU_SUSPENDED_JOB RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="jobIds != null and !jobIds.empty">
                 AND RES.ID_ IN
-                <foreach item="jobId" index="index" collection="jobIds" open="(" separator="," close=")">
-                    #{jobId}
+                <foreach item="id" index="index" collection="jobIds" open="(" separator="," close=")">
+                    #{id, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processInstanceId != null">
-                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId}
+                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutProcessInstanceId">
                 and RES.PROCESS_INSTANCE_ID_ IS NULL
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="handlerType != null">
-                and RES.HANDLER_TYPE_ = #{handlerType}
+                and RES.HANDLER_TYPE_ = #{handlerType, jdbcType=NVARCHAR}
             </if>
             <if test="handlerTypes != null">
                 and RES.HANDLER_TYPE_ in
-                <foreach item="item" index="index" collection="handlerTypes" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="handlerType" index="index" collection="handlerTypes" open="(" separator="," close=")">
+                    #{handlerType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processDefinitionId != null">
-                and RES.PROC_DEF_ID_ = #{processDefinitionId}
+                and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="processDefinitionKey != null">
-                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey})
+                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category}
+                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
-                and RES.ELEMENT_ID_ = #{elementId}
+                and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
             </if>
             <if test="elementName != null">
-                and RES.ELEMENT_NAME_ = #{elementName}
+                and RES.ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR}
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutScopeId">
                 and RES.SCOPE_ID_ IS NULL
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="scopeDefinitionId != null">
-                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="caseDefinitionKey != null">
-                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey})
+                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR})
             </if>
             <if test="correlationId != null">
-                and RES.CORRELATION_ID_ = #{correlationId}
+                and RES.CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
             </if>
             <if test="retriesLeft">
                 and RES.RETRIES_ &gt; 0
@@ -332,28 +332,28 @@
                 and RES.TYPE_ = 'externalWorker'
             </if>
             <if test="duedateHigherThan != null">
-                and RES.DUEDATE_ &gt; #{duedateHigherThan}
+                and RES.DUEDATE_ &gt; #{duedateHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThan != null">
-                and RES.DUEDATE_ &lt; #{duedateLowerThan}
+                and RES.DUEDATE_ &lt; #{duedateLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateHigherThanOrEqual != null">
-                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual}
+                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThanOrEqual != null">
-                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual}
+                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="withException">
                 and (RES.EXCEPTION_MSG_ is not null or RES.EXCEPTION_STACK_ID_ is not null)
             </if>
             <if test="exceptionMessage">
-                and RES.EXCEPTION_MSG_ = #{exceptionMessage}
+                and RES.EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR}
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -367,14 +367,14 @@
     <!-- JOB UPDATE STATEMENTS -->
     <update id="updateSuspendedJobTenantIdForDeployment" parameterType="java.util.Map">
         update ${prefix}ACT_RU_SUSPENDED_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
             SELECT J.ID_ from ${prefix}ACT_RU_SUSPENDED_JOB J
             inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
             inner join
             ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-            where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+            where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
         )
     </update>
 
@@ -383,7 +383,7 @@
     <update id="updateSuspendedJobTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
         update ${prefix}ACT_RU_SUSPENDED_JOB set
         TENANT_ID_ =
-        #{tenantId, jdbcType=VARCHAR}
+        #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
             SELECT tempTask.tempId
@@ -392,7 +392,7 @@
             FROM ${prefix}ACT_RU_SUSPENDED_JOB J
             inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
             inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-            where D.ID_ = #{deploymentId, jdbcType=VARCHAR}) AS tempTask
+            where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}) AS tempTask
         )
     </update>
     
@@ -404,28 +404,28 @@
                 RETRIES_ = #{retries, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=VARCHAR},
+                CATEGORY_ = #{category, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
-                ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR},
+                ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementName != elementName">
-                ELEMENT_NAME_ = #{elementName, jdbcType=VARCHAR},
+                ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.correlationId != correlationId">
-                CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR},
+                CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR},
             </if>
             <if test="(exceptionByteArrayRef != null and originalPersistentState.exceptionByteArrayRef == null) or (exceptionByteArrayRef == null and originalPersistentState.exceptionByteArrayRef != null) or (originalPersistentState.exceptionByteArrayRef != exceptionByteArrayRef)">
                 EXCEPTION_STACK_ID_ = #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             </if>
             <if test="originalPersistentState.exceptionMessage != exceptionMessage">
-                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=VARCHAR},
+                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 </mapper>
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
index 33d4a67dac2..4c8e3971cb5 100644
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
@@ -7,45 +7,45 @@
     <!-- TIMER JOB RESULTMAP -->
 
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.TimerJobEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-        <result property="jobType" column="TYPE_" jdbcType="VARCHAR" />
-        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
+        <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="VARCHAR" />
-        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-        <result property="elementId" column="ELEMENT_ID_" jdbcType="VARCHAR" />
-        <result property="elementName" column="ELEMENT_NAME_" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-        <result property="correlationId" column="CORRELATION_ID_" jdbcType="VARCHAR"/>
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROCESS_INSTANCE_ID_" jdbcType="NVARCHAR" />
+        <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+        <result property="elementId" column="ELEMENT_ID_" jdbcType="NVARCHAR" />
+        <result property="elementName" column="ELEMENT_NAME_" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+        <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+        <result property="correlationId" column="CORRELATION_ID_" jdbcType="NVARCHAR"/>
         <result property="retries" column="RETRIES_" jdbcType="INTEGER" />
         <result property="exceptionByteArrayRef" column="EXCEPTION_STACK_ID_" typeHandler="JobByteArrayRefTypeHandler" />
-        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="VARCHAR" />
-        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="VARCHAR" />
-        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="VARCHAR" />
+        <result property="exceptionMessage" column="EXCEPTION_MSG_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerType" column="HANDLER_TYPE_" jdbcType="NVARCHAR" />
+        <result property="jobHandlerConfiguration" column="HANDLER_CFG_" jdbcType="NVARCHAR" />
         <result property="customValuesByteArrayRef" column="CUSTOM_VALUES_ID_" typeHandler="JobByteArrayRefTypeHandler" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+        <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
         <result property="duedate" column="DUEDATE_" jdbcType="TIMESTAMP" />
-        <result property="repeat" column="REPEAT_" jdbcType="VARCHAR" />
+        <result property="repeat" column="REPEAT_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <!-- TIMER JOB SELECT -->
 
     <select id="selectTimerJob" parameterType="string" resultMap="jobResultMap">
-        select * from ${prefix}ACT_RU_TIMER_JOB where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_TIMER_JOB where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectTimerJobByCorrelationId" parameterType="string" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_TIMER_JOB
-        where CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR}
+        where CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectTimerJobByQueryCriteria" parameterType="org.flowable.job.service.impl.TimerJobQueryImpl" resultMap="jobResultMap">
@@ -65,70 +65,70 @@
         from ${prefix}ACT_RU_TIMER_JOB RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="jobIds != null and !jobIds.empty">
                 AND RES.ID_ IN
-                <foreach item="jobId" index="index" collection="jobIds" open="(" separator="," close=")">
-                    #{jobId}
+                <foreach item="id" index="index" collection="jobIds" open="(" separator="," close=")">
+                    #{id, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processInstanceId != null">
-                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId}
+                and RES.PROCESS_INSTANCE_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutProcessInstanceId">
                 and RES.PROCESS_INSTANCE_ID_ IS NULL
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="handlerType != null">
-                and RES.HANDLER_TYPE_ = #{handlerType}
+                and RES.HANDLER_TYPE_ = #{handlerType, jdbcType=NVARCHAR}
             </if>
             <if test="handlerTypes != null">
                 and RES.HANDLER_TYPE_ in
-                <foreach item="item" index="index" collection="handlerTypes" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="handlerType" index="index" collection="handlerTypes" open="(" separator="," close=")">
+                    #{handlerType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="processDefinitionId != null">
-                and RES.PROC_DEF_ID_ = #{processDefinitionId}
+                and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="processDefinitionKey != null">
-                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey})
+                and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category}
+                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
-                and RES.ELEMENT_ID_ = #{elementId}
+                and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
             </if>
             <if test="elementName != null">
-                and RES.ELEMENT_NAME_ = #{elementName}
+                and RES.ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR}
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="withoutScopeId">
                 and RES.SCOPE_ID_ IS NULL
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="scopeDefinitionId != null">
-                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+                and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="caseDefinitionKey != null">
-                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey})
+                and RES.SCOPE_DEFINITION_ID_ IN (select DEF.ID_ from ${prefix}ACT_CMMN_CASEDEF DEF where DEF.KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR})
             </if>
             <if test="correlationId != null">
-                and RES.CORRELATION_ID_ = #{correlationId}
+                and RES.CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR}
             </if>
             <if test="onlyTimers">
                 and RES.TYPE_ = 'timer'
@@ -140,28 +140,28 @@
                 and RES.DUEDATE_ &lt;= #{now, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateHigherThan != null">
-                and RES.DUEDATE_ &gt; #{duedateHigherThan}
+                and RES.DUEDATE_ &gt; #{duedateHigherThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThan != null">
-                and RES.DUEDATE_ &lt; #{duedateLowerThan}
+                and RES.DUEDATE_ &lt; #{duedateLowerThan, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateHigherThanOrEqual != null">
-                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual}
+                and RES.DUEDATE_ &gt;= #{duedateHigherThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="duedateLowerThanOrEqual != null">
-                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual}
+                and RES.DUEDATE_ &lt;= #{duedateLowerThanOrEqual, jdbcType=TIMESTAMP}
             </if>
             <if test="withException">
                 and (RES.EXCEPTION_MSG_ is not null or RES.EXCEPTION_STACK_ID_ is not null)
             </if>
             <if test="exceptionMessage">
-                and RES.EXCEPTION_MSG_ = #{exceptionMessage}
+                and RES.EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR}
             </if>
             <if test="tenantId != null">
-                and RES.TENANT_ID_ = #{tenantId}
+                and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="tenantIdLike != null">
-                and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+                and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="withoutTenantId">
                 and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -181,14 +181,14 @@
             SCOPE_TYPE_ is null
         </if>
         <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope != 'all'">
-            SCOPE_TYPE_ = #{parameter.jobExecutionScope}
+            SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=NVARCHAR}
         </if>
         and DUEDATE_ &lt;= #{parameter.now, jdbcType=TIMESTAMP}
         and LOCK_OWNER_ is null
         <if test="parameter.enabledCategories != null">
             and CATEGORY_ in
-            <foreach item="item" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                #{item}
+            <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
+                #{category, jdbcType=NVARCHAR}
             </foreach>
         </if>
         ${orderBy}
@@ -204,14 +204,14 @@
                 SCOPE_TYPE_ is null
             </if>
             <if test="parameter.jobExecutionScope != null and parameter.jobExecutionScope != 'all'">
-                SCOPE_TYPE_ = #{parameter.jobExecutionScope}
+                SCOPE_TYPE_ = #{parameter.jobExecutionScope, jdbcType=NVARCHAR}
             </if>
             and LOCK_EXP_TIME_ is not null and LOCK_EXP_TIME_ &lt; #{parameter.now, jdbcType=TIMESTAMP}
 
             <if test="parameter.enabledCategories">
                 and CATEGORY_ in
-                <foreach item="item" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
+                    #{category, jdbcType=NVARCHAR}
                 </foreach>
             </if>
         </where>
@@ -248,31 +248,31 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_)
-        values (#{id, jdbcType=VARCHAR},
+        values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=VARCHAR},
-        #{jobType, jdbcType=VARCHAR},
+        #{category, jdbcType=NVARCHAR},
+        #{jobType, jdbcType=NVARCHAR},
         #{exclusive, jdbcType=BOOLEAN},
-        #{executionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{processDefinitionId, jdbcType=VARCHAR},
-        #{elementId, jdbcType=VARCHAR},
-        #{elementName, jdbcType=VARCHAR},
-        #{scopeId, jdbcType=VARCHAR},
-        #{subScopeId, jdbcType=VARCHAR},
-        #{scopeType, jdbcType=VARCHAR},
-        #{scopeDefinitionId, jdbcType=VARCHAR},
-        #{correlationId, jdbcType=VARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{processDefinitionId, jdbcType=NVARCHAR},
+        #{elementId, jdbcType=NVARCHAR},
+        #{elementName, jdbcType=NVARCHAR},
+        #{scopeId, jdbcType=NVARCHAR},
+        #{subScopeId, jdbcType=NVARCHAR},
+        #{scopeType, jdbcType=NVARCHAR},
+        #{scopeDefinitionId, jdbcType=NVARCHAR},
+        #{correlationId, jdbcType=NVARCHAR},
         #{retries, jdbcType=INTEGER},
         #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-        #{exceptionMessage, jdbcType=VARCHAR},
+        #{exceptionMessage, jdbcType=NVARCHAR},
         #{duedate, jdbcType=TIMESTAMP},
-        #{repeat, jdbcType=VARCHAR},
-        #{jobHandlerType, jdbcType=VARCHAR},
-        #{jobHandlerConfiguration, jdbcType=VARCHAR},
+        #{repeat, jdbcType=NVARCHAR},
+        #{jobHandlerType, jdbcType=NVARCHAR},
+        #{jobHandlerConfiguration, jdbcType=NVARCHAR},
         #{customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
         #{createTime, jdbcType=TIMESTAMP},
-        #{tenantId, jdbcType=VARCHAR}
+        #{tenantId, jdbcType=NVARCHAR}
         )
     </insert>
 
@@ -303,38 +303,38 @@
         CUSTOM_VALUES_ID_,
         CREATE_TIME_,
         TENANT_ID_) VALUES
-        <foreach collection="list" item="job" index="index" separator=",">
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+        <foreach collection="list" item="timerJob" index="index" separator=",">
+            (#{timerJob.id, jdbcType=NVARCHAR},
+            #{timerJob.revision, jdbcType=INTEGER},
+            #{timerJob.category, jdbcType=NVARCHAR},
+            #{timerJob.jobType, jdbcType=NVARCHAR},
+            #{timerJob.exclusive, jdbcType=BOOLEAN},
+            #{timerJob.executionId, jdbcType=NVARCHAR},
+            #{timerJob.processInstanceId, jdbcType=NVARCHAR},
+            #{timerJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{timerJob.elementId, jdbcType=NVARCHAR},
+            #{timerJob.elementName, jdbcType=NVARCHAR},
+            #{timerJob.scopeId, jdbcType=NVARCHAR},
+            #{timerJob.subScopeId, jdbcType=NVARCHAR},
+            #{timerJob.scopeType, jdbcType=NVARCHAR},
+            #{timerJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{timerJob.correlationId, jdbcType=NVARCHAR},
+            #{timerJob.retries, jdbcType=INTEGER},
+            #{timerJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{timerJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{timerJob.duedate, jdbcType=TIMESTAMP},
+            #{timerJob.repeat, jdbcType=NVARCHAR},
+            #{timerJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{timerJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{timerJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{timerJob.createTime, jdbcType=TIMESTAMP},
+            #{timerJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
     </insert>
 
     <insert id="bulkInsertTimerJob" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="job" index="index">
+        <foreach collection="list" item="timerJob" index="index">
             INTO ${prefix}ACT_RU_TIMER_JOB (
             ID_,
             REV_,
@@ -361,31 +361,31 @@
             CUSTOM_VALUES_ID_,
             CREATE_TIME_,
             TENANT_ID_) VALUES
-            (#{job.id, jdbcType=VARCHAR},
-            #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=VARCHAR},
-            #{job.jobType, jdbcType=VARCHAR},
-            #{job.exclusive, jdbcType=BOOLEAN},
-            #{job.executionId, jdbcType=VARCHAR},
-            #{job.processInstanceId, jdbcType=VARCHAR},
-            #{job.processDefinitionId, jdbcType=VARCHAR},
-            #{job.elementId, jdbcType=VARCHAR},
-            #{job.elementName, jdbcType=VARCHAR},
-            #{job.scopeId, jdbcType=VARCHAR},
-            #{job.subScopeId, jdbcType=VARCHAR},
-            #{job.scopeType, jdbcType=VARCHAR},
-            #{job.scopeDefinitionId, jdbcType=VARCHAR},
-            #{job.correlationId, jdbcType=VARCHAR},
-            #{job.retries, jdbcType=INTEGER},
-            #{job.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.exceptionMessage, jdbcType=VARCHAR},
-            #{job.duedate, jdbcType=TIMESTAMP},
-            #{job.repeat, jdbcType=VARCHAR},
-            #{job.jobHandlerType, jdbcType=VARCHAR},
-            #{job.jobHandlerConfiguration, jdbcType=VARCHAR},
-            #{job.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
-            #{job.createTime, jdbcType=TIMESTAMP},
-            #{job.tenantId, jdbcType=VARCHAR})
+            (#{timerJob.id, jdbcType=NVARCHAR},
+            #{timerJob.revision, jdbcType=INTEGER},
+            #{timerJob.category, jdbcType=NVARCHAR},
+            #{timerJob.jobType, jdbcType=NVARCHAR},
+            #{timerJob.exclusive, jdbcType=BOOLEAN},
+            #{timerJob.executionId, jdbcType=NVARCHAR},
+            #{timerJob.processInstanceId, jdbcType=NVARCHAR},
+            #{timerJob.processDefinitionId, jdbcType=NVARCHAR},
+            #{timerJob.elementId, jdbcType=NVARCHAR},
+            #{timerJob.elementName, jdbcType=NVARCHAR},
+            #{timerJob.scopeId, jdbcType=NVARCHAR},
+            #{timerJob.subScopeId, jdbcType=NVARCHAR},
+            #{timerJob.scopeType, jdbcType=NVARCHAR},
+            #{timerJob.scopeDefinitionId, jdbcType=NVARCHAR},
+            #{timerJob.correlationId, jdbcType=NVARCHAR},
+            #{timerJob.retries, jdbcType=INTEGER},
+            #{timerJob.exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{timerJob.exceptionMessage, jdbcType=NVARCHAR},
+            #{timerJob.duedate, jdbcType=TIMESTAMP},
+            #{timerJob.repeat, jdbcType=NVARCHAR},
+            #{timerJob.jobHandlerType, jdbcType=NVARCHAR},
+            #{timerJob.jobHandlerConfiguration, jdbcType=NVARCHAR},
+            #{timerJob.customValuesByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
+            #{timerJob.createTime, jdbcType=TIMESTAMP},
+            #{timerJob.tenantId, jdbcType=NVARCHAR})
         </foreach>
         SELECT * FROM dual
     </insert>
@@ -398,22 +398,22 @@
                 LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.lockOwner != lockOwner">
-                LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR},
+                LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.retries != retries">
                 RETRIES_ = #{retries, jdbcType=INTEGER},
             </if>
             <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+                PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=VARCHAR},
+                CATEGORY_ = #{category, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
-                ELEMENT_ID_ = #{elementId, jdbcType=VARCHAR},
+                ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.elementName != elementName">
-                ELEMENT_NAME_ = #{elementName, jdbcType=VARCHAR},
+                ELEMENT_NAME_ = #{elementName, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.duedate != duedate">
                 DUEDATE_ = #{duedate, jdbcType=TIMESTAMP},
@@ -422,36 +422,36 @@
                 CREATE_TIME_ = #{createTime, jdbcType=TIMESTAMP},
             </if>
             <if test="originalPersistentState.correlationId != correlationId">
-                CORRELATION_ID_ = #{correlationId, jdbcType=VARCHAR},
+                CORRELATION_ID_ = #{correlationId, jdbcType=NVARCHAR},
             </if>
             <if test="(exceptionByteArrayRef != null and originalPersistentState.exceptionByteArrayRef == null) or (exceptionByteArrayRef == null and originalPersistentState.exceptionByteArrayRef != null) or (originalPersistentState.exceptionByteArrayRef != exceptionByteArrayRef)">
                 EXCEPTION_STACK_ID_ = #{exceptionByteArrayRef, typeHandler=JobByteArrayRefTypeHandler},
             </if>
             <if test="originalPersistentState.exceptionMessage != exceptionMessage">
-                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=VARCHAR},
+                EXCEPTION_MSG_ = #{exceptionMessage, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_= #{id, jdbcType=VARCHAR}
+        where ID_= #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <select id="selectTimerJobByTypeAndProcessDefinitionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select J.*
         from ${prefix}ACT_RU_TIMER_JOB J
-        where J.HANDLER_TYPE_ = #{parameter.handlerType}
-        and J.PROC_DEF_ID_ = #{parameter.processDefinitionId}
+        where J.HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and J.PROC_DEF_ID_ = #{parameter.processDefinitionId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectTimerJobsByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_TIMER_JOB J
-        where J.PROCESS_INSTANCE_ID_ = #{parameter}
+        where J.PROCESS_INSTANCE_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectTimerJobsByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select *
         from ${prefix}ACT_RU_TIMER_JOB J
-        where J.EXECUTION_ID_ = #{parameter}
+        where J.EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectTimerJobByTypeAndProcessDefinitionKeyNoTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject"
@@ -459,8 +459,8 @@
         select J.*
         from ${prefix}ACT_RU_TIMER_JOB J
         inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
-        where J.HANDLER_TYPE_ = #{parameter.handlerType}
-        and P.KEY_ = #{parameter.processDefinitionKey}
+        where J.HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and P.KEY_ = #{parameter.processDefinitionKey, jdbcType=NVARCHAR}
         and (P.TENANT_ID_ = '' or P.TENANT_ID_ is null)
     </select>
 
@@ -469,52 +469,52 @@
         select J.*
         from ${prefix}ACT_RU_TIMER_JOB J
         inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
-        where J.HANDLER_TYPE_ = #{parameter.handlerType}
-        and P.KEY_ = #{parameter.processDefinitionKey}
-        and P.TENANT_ID_ = #{parameter.tenantId}
+        where J.HANDLER_TYPE_ = #{parameter.handlerType, jdbcType=NVARCHAR}
+        and P.KEY_ = #{parameter.processDefinitionKey, jdbcType=NVARCHAR}
+        and P.TENANT_ID_ = #{parameter.tenantId, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectTimerJobsByScopeIdAndSubScopeId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="jobResultMap">
         select T.*
         from ${prefix}ACT_RU_TIMER_JOB T
-        where T.SCOPE_ID_ = #{parameter.scopeId} and T.SUB_SCOPE_ID_ = #{parameter.subScopeId}
+        where T.SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and T.SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR}
     </select>
 
     <!-- JOB DELETE STATEMENTS -->
 
     <delete id="deleteTimerJob" parameterType="org.flowable.job.service.impl.persistence.entity.TimerJobEntityImpl">
-        delete from ${prefix}ACT_RU_TIMER_JOB where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_TIMER_JOB where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="deleteTimerJobs" parameterType="java.util.List">
         delete from ${prefix}ACT_RU_TIMER_JOB where ID_ in
         <foreach item="timerJob" index="index" collection="collection" open="(" separator="," close=")">
-            #{timerJob.id}
+            #{timerJob.id, jdbcType=NVARCHAR}
         </foreach>
     </delete>
 
     <delete id="deleteTimerJobsByExecutionId" parameterType="string">
-        delete from ${prefix}ACT_RU_TIMER_JOB where PROCESS_INSTANCE_ID_ = #{id}
+        delete from ${prefix}ACT_RU_TIMER_JOB where PROCESS_INSTANCE_ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
 
     <!-- JOB UPDATE STATEMENTS -->
     <update id="updateTimerJobTenantIdForDeployment" parameterType="java.util.Map">
         update ${prefix}ACT_RU_TIMER_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
             SELECT J.ID_ from ${prefix}ACT_RU_TIMER_JOB J
             inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
             inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-            where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+            where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
         )
     </update>
 
     <update id="updateTimerJobLocks" parameterType="java.util.Map">
-        update ${prefix}ACT_RU_TIMER_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=VARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
+        update ${prefix}ACT_RU_TIMER_JOB set LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR}, LOCK_EXP_TIME_ = #{lockExpirationTime, jdbcType=TIMESTAMP}
         where ID_ in
         <foreach item="timerJob" index="index" collection="timerJobs" open="(" separator="," close=")">
-            #{timerJob.id}
+            #{timerJob.id, jdbcType=NVARCHAR}
         </foreach>
     </update>
 
@@ -522,7 +522,7 @@
         table (so good, performance) -->
     <update id="updateTimerJobTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
         update ${prefix}ACT_RU_TIMER_JOB set
-        TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+        TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
         where
         ID_ in (
 
@@ -532,7 +532,7 @@
             FROM ${prefix}ACT_RU_TIMER_JOB J
             inner join ${prefix}ACT_RE_PROCDEF P on J.PROC_DEF_ID_ = P.ID_
             inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-            where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+            where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
             ) AS tempTask
         )
     </update>
@@ -540,7 +540,7 @@
     <update id="resetExpiredTimerJob" parameterType="map">
         update ${prefix}ACT_RU_TIMER_JOB
         set LOCK_OWNER_ = null, LOCK_EXP_TIME_ = null, CREATE_TIME_ = #{now, jdbcType=TIMESTAMP}
-        where ID_ = #{id,jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
     </update>
 
 </mapper>
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EngineMappingsValidationTest.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EngineMappingsValidationTest.java
index 9872a168763..08bd82fe388 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EngineMappingsValidationTest.java
+++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EngineMappingsValidationTest.java
@@ -13,14 +13,19 @@
 package org.flowable.db;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.flowable.db.EntityParameterTypesOverview.getColumnType;
+import static org.flowable.db.EntityParameterTypesOverview.getParameterType;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.StringReader;
 import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,6 +44,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
@@ -239,6 +245,119 @@ public void verifyUpdateStatements(EntityMappingPackageInformation packageInform
         }
     }
 
+    @ParameterizedTest(name = "Package {0}")
+    @ArgumentsSource(PackageArgumentsProvider.class)
+    public void verifyAllParametersAreTyped(EntityMappingPackageInformation packageInformation) throws IOException {
+        Map<String, String> mappedResources = readMappingFileAsString(packageInformation);
+        assertFalse(mappedResources.isEmpty());
+
+        for (String mappedResource : mappedResources.keySet()) {
+            System.out.println("Checking mapping " + mappedResource);
+            String xmlContent = mappedResources.get(mappedResource);
+
+            int lineCounter = 0;
+            try (BufferedReader reader = new BufferedReader(new StringReader(xmlContent))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+
+                    lineCounter++;
+
+                    // Checking the string replacements (they are passed by ${} )
+                    if (line.contains("${")) {
+
+                        int index = -1;
+                        while ((index = line.indexOf("${", index + 1)) > 0) {
+                            int endIndex = line.indexOf("}", index);
+                            assertThat(endIndex).isGreaterThan(0);
+                            String content = line.substring(index + 2, endIndex);
+
+                            assertThat(content).isIn("prefix", "queryTablePrefix", "queryTablePrefixSelect",
+                                    "limitBefore", "limitBetween", "limitAfter",
+                                    "blobType", "orderBy", "outerJoinOrderBy", "wildcardEscapeClause", "sql");
+                        }
+
+                    }
+
+                    // ResultMap validation
+                    if (line.contains("<result ") || line.contains("<id ")) {
+                        int columnBeginIndex = line.indexOf("column=\"");
+                        String columnName = line.substring(columnBeginIndex + 8, line.indexOf("\"", columnBeginIndex + 8));
+                        assertThat(columnName).withFailMessage("No column set on line " + lineCounter).isNotNull();
+
+                        String expectedColumnType = getColumnType(mappedResource, columnName);
+                        assertThat(expectedColumnType)
+                                .withFailMessage("No jdbcType configured in " + EntityParameterTypesOverview.class + " for column " + columnName
+                                        + " on line " + lineCounter + " for resource " + mappedResource)
+                                .isNotNull();
+
+                        if (!line.contains("typeHandler")) {
+                            int jdbcTypeBeginIndex = line.indexOf("jdbcType=\"");
+                            String columnType = line.substring(jdbcTypeBeginIndex + 10, line.indexOf("\"", jdbcTypeBeginIndex + 10));
+                            assertThat(columnType)
+                                    .withFailMessage("Wrong jdbcType in " + mappedResource + " on line " + lineCounter + " for resource " + mappedResource
+                                            + ", should be " + expectedColumnType + ", but was " + columnType)
+                                    .isEqualTo(expectedColumnType);
+                        }
+
+                    }
+
+                    // The #{...} are the parameters
+                    if (line.contains("#{")) {
+
+                        int index = -1;
+                        while ((index = line.indexOf("#{", index + 1)) > 0) {
+                            int endIndex = line.indexOf("}", index);
+                            String content = line.substring(index + 2, endIndex);
+
+                            if (!content.contains("typeHandler")) { // only checking jdbcTypes, not the typeHandler
+                                assertThat(content)
+                                        .withFailMessage("Missing 'jdbcType' in " + mappedResource
+                                                + " on line " + lineCounter + ": #{" + content + "}" + " for resource " + mappedResource)
+                                        .contains(", jdbcType=");
+
+                                int commaIndex = line.indexOf(",", index);
+                                String parameterName = line.substring(index + 2, commaIndex).trim();
+
+                                int equalsSignIndex = line.indexOf("=", commaIndex);
+                                String jdbcType = line.substring(equalsSignIndex + 1, endIndex).trim();
+
+                                if (jdbcType.contains("blobType")) { // quick-fix for reading ${blobType}
+                                    jdbcType = line.substring(equalsSignIndex + 1, endIndex + 1).trim();
+                                }
+
+                                // Special handling when it's just passing parameter
+                                if ("parameter".equals(parameterName)) {
+
+                                    assertThat(jdbcType)
+                                            .withFailMessage("No jdbcType in " + mappedResource + " on line " + lineCounter + " for resource ")
+                                            .isNotNull();
+
+                                } else {
+
+                                    String expectedParameterType = getParameterType(mappedResource, parameterName);
+                                    assertThat(expectedParameterType)
+                                            .withFailMessage("No jdbcType configured in " + EntityParameterTypesOverview.class + " for parameter '" + parameterName
+                                                    + "' on line " + lineCounter + " for resource " + mappedResource)
+                                            .isNotNull();
+                                    assertThat(jdbcType)
+                                            .withFailMessage("Wrong jdbcType in " + mappedResource + " on line " + lineCounter + " for resource " + mappedResource
+                                                    + ", should be " + expectedParameterType + ", but was " + jdbcType)
+                                            .isEqualTo(expectedParameterType);
+                                }
+                            }
+
+                        }
+
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * Helper Methods
+     */
+
     protected Class<?> getAndAssertEntityInterfaceClass(Document mappingFileContent, String mappedEntity) {
         String entityPackage = getEntityPackageFromMapperElement(mappingFileContent);
         String expectedClass = entityPackage + "." + mappedEntity + "Entity";
@@ -266,7 +385,7 @@ protected Class<?> getAndAssertEntityImplClass(Document mappingFileContent, Stri
     }
 
     /**
-     * Returns a map {entityName, xmlMappingFileContent}
+     * Returns a map {entityName, xmlMappingFileContent as Document}
      */
     private Map<String, Document> readMappingFile(EntityMappingPackageInformation packageInformation) {
         try {
@@ -305,6 +424,35 @@ private Document readXmlDocument(String resourceLocation) throws ParserConfigura
         return docBuilder.parse(this.getClass().getClassLoader().getResourceAsStream(resourceLocation));
     }
 
+    /**
+     * Returns a map {entityName, xmlMappingFileContent as Document}
+     */
+    private Map<String, String> readMappingFileAsString(EntityMappingPackageInformation packageInformation) {
+        try {
+            Document mappingsFile = readXmlDocument(packageInformation.getBasePackageFolder() + "/db/mapping/mappings.xml");
+            Map<String, String> resources = new HashMap<>();
+            NodeList nodeList = mappingsFile.getElementsByTagName("mapper");
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                Node node = nodeList.item(i);
+                String resource = node.getAttributes().getNamedItem("resource").getTextContent();
+                Matcher resourceMatcher = ENTITY_RESOURCE_PATTERN.matcher(resource);
+                if (resourceMatcher.matches()) {
+                    String entity = resourceMatcher.group(1);
+                    String entityMappingXmlContent = IOUtils.toString(this.getClass().getClassLoader().getResourceAsStream(resource), StandardCharsets.UTF_8);
+                    resources.put(entity, entityMappingXmlContent);
+                }
+            }
+
+            resources.remove("TableData"); // not an entity
+
+            assertFalse(resources.isEmpty());
+
+            return resources;
+        } catch (Exception e) {
+            throw new FlowableException("Error getting mapped resources", e);
+        }
+    }
+
     private String getEntityPackageFromMapperElement(Document mappingFileContent) {
         Node mapperNode = findChildNodes(mappingFileContent, "mapper").get(1); // 1 --> the first element is <!DOCTYPE mapper ..., so we need the second
         String namespace = mapperNode.getAttributes().getNamedItem("namespace").getTextContent();
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EntityParameterTypesOverview.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EntityParameterTypesOverview.java
new file mode 100644
index 00000000000..f086a7a5a91
--- /dev/null
+++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/db/EntityParameterTypesOverview.java
@@ -0,0 +1,2109 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.db;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public abstract class EntityParameterTypesOverview {
+
+    public static String PARAMETER_TYPE_VARCHAR = "VARCHAR";
+    public static String PARAMETER_TYPE_NVARCHAR = "NVARCHAR";
+    public static String PARAMETER_TYPE_INTEGER = "INTEGER";
+    public static String PARAMETER_TYPE_BOOLEAN = "BOOLEAN";
+    public static String PARAMETER_TYPE_TIMESTAMP = "TIMESTAMP";
+    public static String PARAMETER_TYPE_BIGINT = "BIGINT";
+    public static String PARAMETER_TYPE_DOUBLE = "DOUBLE";
+    public static String PARAMETER_TYPE_BLOBTYPE = "${blobType}";
+
+    public static Map<String, ParameterInfo> ALL_PARAMS = new HashMap<>();
+
+
+    static {
+        // For Liquibase-managed engines, the type will most often be VARCHAR
+        // For 'older' engines, the type will always be nvarchar.
+
+        // BPMN
+        addActivityInstanceParams();
+        addAttachmentParams();
+        addBatchParams();
+        addByteArrayParams();
+        addCommentParams();
+        addDeploymentParams();
+        addHistoricEntityLinkParams();
+        addEventLogEntryParams();
+        addExecutionParams();
+        addExternalWorkerJobParams();
+        addHistoricActivityInstanceParams();
+        addHistoricDetailParams();
+        addHistoricProcessInstanceParams();
+        addHistoricTaskInstanceParams();
+        addJobParams();
+        addModelParams();
+        addProcessDefinitionParams();
+        addProcessDefinitionInfoParams();
+        addPropertyParams();
+        addResourceParams();
+        addTaskParams();
+        addTimerJobParams();
+        addVariableInstanceParams();
+
+        // CMMN
+        addCaseDefinitionParams();
+        addCaseInstanceParams();
+        addCmmnDeploymentParams();
+        addCmmnResourceParams();
+        addHistoricCaseInstanceParams();
+        addHistoricMilestoneInstanceParams();
+        addHistoricPlanItemInstanceParams();
+        addMilestoneInstanceParams();
+        addPlanItemInstanceParams();
+        addSentryPartInstanceParams();
+        
+        // EVENT REGISTRY
+        addChannelDefinitionParams();
+        addEventDefinitionParams();
+        addEventDeploymentParams();
+        addEventResourceParams();
+
+        // DMN
+        addDecisionParams();
+        addDmnDeploymentParams();
+        addHistoricDecisionExecutionParams();
+        addDmnResourceParams();
+
+        // SERVICES
+        addBatchPartParams();
+        addDeadLetterJobParams();
+        addEntityLinkParams();
+        addEventSubscriptionParams();
+        addHistoricIdentityLinkParams();
+        addHistoryJobParams();
+        addHistoricTaskLogEntryParams();
+        addHistoricVariableInstanceParams();
+        addIdentityLinkParams();
+        addSuspendedJobParams();
+
+        // App
+        addAppDefinitionParams();
+        addAppDeploymentParams();
+        addAppResourceParams();
+
+        // IDM
+        addGroupParams();
+        addIdmByteArrayParams();
+        addPrivilegeParams();
+        addPrivilegeMappingParams();
+        addIdentityInfoParams();
+        addIdmPropertyParams();
+        addMembershipParams();
+        addTokenParams();
+        addUserParams();
+    }
+
+    protected static void addActivityInstanceParams() {
+        ParameterInfo info = addParameterInfo("activityInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_ID_", "activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CALL_PROC_INST_ID_", "calledProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_NAME_", "activityName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_TYPE_", "activityType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TRANSACTION_ORDER_", "transactionOrder", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DURATION_", "durationInMillis", PARAMETER_TYPE_BIGINT);
+        info.addColumn("DELETE_REASON_", "deleteReason", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("activityInstanceId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addBatchParams() {
+        ParameterInfo info = addParameterInfo("batch");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TYPE_", "batchType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SEARCH_KEY_", "batchSearchKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SEARCH_KEY2_", "batchSearchKey2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("COMPLETE_TIME_", "completeTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("STATUS_", "status", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BATCH_DOC_ID_", "batchDocRefId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("searchKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("searchKey2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter.searchKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter.searchKey2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("batchTypeItem", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("createTimeHigherThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createTimeLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completeTimeLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completeTimeHigherThan", PARAMETER_TYPE_TIMESTAMP);
+    }
+
+    protected static void addByteArrayParams() {
+        ParameterInfo info = addParameterInfo("byteArray");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addAttachmentParams() {
+        ParameterInfo info = addParameterInfo("attachment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("URL_", "url", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CONTENT_ID_", "contentId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TIME_", "time", PARAMETER_TYPE_TIMESTAMP);
+    }
+
+    protected static void addCommentParams() {
+        ParameterInfo info = addParameterInfo("comment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TIME_", "time", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACTION_", "action", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("MESSAGE_", "message", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("FULL_MSG_", "fullMessageBytes", PARAMETER_TYPE_BLOBTYPE);
+    }
+
+    protected static void addDeploymentParams() {
+        ParameterInfo info = addParameterInfo("deployment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DEPLOY_TIME_", "deploymentTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("DERIVED_FROM_", "derivedFrom", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DERIVED_FROM_ROOT_", "derivedFromRoot", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PARENT_DEPLOYMENT_ID_", "parentDeploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ENGINE_VERSION_", "engineVersion", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addHistoricEntityLinkParams() {
+        ParameterInfo info = addParameterInfo("historicEntityLink");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LINK_TYPE_", "linkType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PARENT_ELEMENT_ID_", "parentElementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REF_SCOPE_ID_", "referenceScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REF_SCOPE_TYPE_", "referenceScopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REF_SCOPE_DEFINITION_ID_", "referenceScopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ROOT_SCOPE_ID_", "rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ROOT_SCOPE_TYPE_", "rootScopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("HIERARCHY_TYPE_", "hierarchyType", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addEventLogEntryParams() {
+        ParameterInfo info = addParameterInfo("eventLogEntry");
+        info.addColumn("LOG_NR_", "logNr", PARAMETER_TYPE_BIGINT);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TIME_STAMP_", "timeStamp", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DATA_", "data", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_TIME_", "lockTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("IS_PROCESSED_", "isProcessed", PARAMETER_TYPE_INTEGER);
+
+        // Query
+        info.addQueryParameter("startLogNr", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("endLogNr", PARAMETER_TYPE_BIGINT);
+    }
+    
+    protected static void addExecutionParams() {
+        ParameterInfo info = addParameterInfo("execution");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BUSINESS_KEY_", "businessKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BUSINESS_STATUS_", "businessStatus", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_ID_", "activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("IS_ACTIVE_", "isActive", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("IS_CONCURRENT_", "isConcurrent", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("IS_SCOPE_", "isScope", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("IS_EVENT_SCOPE_", "isEventScope", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("IS_MI_ROOT_", "isMultiInstanceRoot", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("PARENT_ID_", "parentId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUPER_EXEC_", "superExecutionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ROOT_PROC_INST_ID_", "rootProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUSPENSION_STATE_", "suspensionState", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_ACT_ID_", "startActivityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("IS_COUNT_ENABLED_", "isCountEnabled", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("EVT_SUBSCR_COUNT_", "eventSubscriptionCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TASK_COUNT_", "taskCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("JOB_COUNT_", "jobCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TIMER_JOB_COUNT_", "timerJobCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("SUSP_JOB_COUNT_", "suspendedJobCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DEADLETTER_JOB_COUNT_", "deadLetterJobCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXTERNAL_WORKER_JOB_COUNT_", "externalWorkerJobCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_COUNT_", "variableCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("ID_LINK_COUNT_", "identityLinkCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CALLBACK_ID_", "callbackId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CALLBACK_TYPE_", "callbackType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROPAGATED_STAGE_INST_ID_", "propagatedStageInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_TIME_", "lockTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+
+        // Process instance
+        info.addColumn("ProcessDefinitionName", "processDefinitionName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ProcessDefinitionKey", "processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ProcessDefinitionVersion", "processDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addColumn("ProcessDefinitionCategory", "processDefinitionCategory", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ProcessDefinitionEngineVersion", "processDefinitionEngineVersion", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DeploymentId", "deploymentId", PARAMETER_TYPE_NVARCHAR);
+
+        // Variables
+        addVariableColumnsWhenUsedInQueries(info);
+
+        info.addQueryParameter("executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("expirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("parentExecutionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("superProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("subProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("activeActivityId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addQueryParameter("startedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedBy", PARAMETER_TYPE_NVARCHAR);
+
+        // Event
+        info.addQueryParameter("eventSubscriptionValue.eventType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("eventSubscriptionValue.eventName", PARAMETER_TYPE_NVARCHAR);
+
+        // Identity link
+        info.addQueryParameter("involvedUserIdentityLink.userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+
+        // EntityLink
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addExternalWorkerJobParams() {
+        ParameterInfo info = addParameterInfo("externalWorkerJob");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "jobType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_EXP_TIME_", "lockExpirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXCLUSIVE_", "exclusive", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROCESS_INSTANCE_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_NAME_", "elementName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CORRELATION_ID_", "correlationId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RETRIES_", "retries", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXCEPTION_STACK_ID_", "exceptionByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXCEPTION_MSG_", "exceptionMessage", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_TYPE_", "jobHandlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_CFG_", "jobHandlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CUSTOM_VALUES_ID_", "customValuesByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DUEDATE_", "duedate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("REPEAT_", "repeat", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("workerId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("jobId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("topic", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("authorizedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("jobExecutionScope", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("now", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("handlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("handlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("duedateHigherThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+    }
+
+    protected static void addHistoricActivityInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicActivityInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_ID_", "activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CALL_PROC_INST_ID_", "calledProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_NAME_", "activityName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_TYPE_", "activityType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TRANSACTION_ORDER_", "transactionOrder", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DURATION_", "durationInMillis", PARAMETER_TYPE_BIGINT);
+        info.addColumn("DELETE_REASON_", "deleteReason", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("activityInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("startedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("finishedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("finishedAfter", PARAMETER_TYPE_TIMESTAMP);
+    }
+
+    protected static void addHistoricDetailParams() {
+        ParameterInfo info = addParameterInfo("historicDetail", "historicFormProperty", "historicDetailVariableInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACT_INST_ID_", "activityInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TIME_", "time", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_TYPE_", "variableType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACTIVITY_ID_", "activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BYTEARRAY_ID_", "byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DOUBLE_", "doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("TEXT_", "textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TEXT2_", "textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LONG_", "longValue", PARAMETER_TYPE_BIGINT);
+
+        info.addQueryParameter("detailType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("variableName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("propertyId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("propertyValue", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addHistoricProcessInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicProcessInstance");
+        info.addColumn("ID_", "id",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision",  PARAMETER_TYPE_INTEGER);
+        info.addColumn("PROC_INST_ID_", "processInstanceId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BUSINESS_KEY_", "businessKey",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BUSINESS_STATUS_", "businessStatus",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_NAME_", "processDefinitionName",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_KEY_", "processDefinitionKey",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_VERSION_", "processDefinitionVersion",  PARAMETER_TYPE_INTEGER);
+        info.addColumn("PROC_DEF_CATEGORY_", "processDefinitionCategory",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_TIME_", "startTime",  PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("END_TIME_", "endTime",  PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("DURATION_", "durationInMillis",  PARAMETER_TYPE_BIGINT);
+        info.addColumn("START_USER_ID_", "startUserId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_ACT_ID_", "startActivityId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("END_ACT_ID_", "endActivityId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUPER_PROCESS_INSTANCE_ID_", "superProcessInstanceId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DELETE_REASON_", "deleteReason",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CALLBACK_ID_", "callbackId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CALLBACK_TYPE_", "callbackType",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REFERENCE_ID_", "referenceId",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REFERENCE_TYPE_", "referenceType",  PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROPAGATED_STAGE_INST_ID_", "propagatedStageInstanceId",  PARAMETER_TYPE_NVARCHAR);
+
+        addVariableColumnsWhenUsedInQueries(info);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("superProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("subProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("activeActivityId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("startedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("startedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("finishedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("finishedAfter", PARAMETER_TYPE_TIMESTAMP);
+
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroup", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("group", PARAMETER_TYPE_NVARCHAR);
+
+        // EntityLink
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+
+    }
+
+    protected static void addHistoricTaskInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicTaskInstance", "historicTask", "task");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TASK_DEF_ID_", "taskDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROPAGATED_STAGE_INST_ID_", "propagatedStageInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("STATE_", "state", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PARENT_TASK_ID_", "parentTaskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("OWNER_", "owner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("START_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("IN_PROGRESS_TIME_", "inProgressStartTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("IN_PROGRESS_STARTED_BY_", "inProgressStartedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CLAIM_TIME_", "claimTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("CLAIMED_BY_", "claimedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUSPENDED_TIME_", "suspendedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("SUSPENDED_BY_", "suspendedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("COMPLETED_BY_", "completedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DURATION_", "durationInMillis", PARAMETER_TYPE_BIGINT);
+        info.addColumn("DELETE_REASON_", "deleteReason", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_DEF_KEY_", "taskDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("FORM_KEY_", "formKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PRIORITY_", "priority", PARAMETER_TYPE_INTEGER);
+        info.addColumn("IN_PROGRESS_DUE_DATE_", "inProgressStartDueDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("DUE_DATE_", "dueDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LAST_UPDATED_TIME_", "lastUpdateTime", PARAMETER_TYPE_TIMESTAMP);
+
+        addVariableColumnsWhenUsedInQueries(info);
+        addIdentityLinkColumsWhenUsedInQueries(info);
+
+        info.addColumn("ILINK_CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("cmmnDeploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("historicTaskInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processCategory", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processInstanceBusinessKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processInstanceIdWithChildren", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseInstanceIdWithChildren", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskParentTaskId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskDescription", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskCategory", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskDeleteReason", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskAssignee", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("assigneeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskPriority", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("taskMinPriority", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("taskMaxPriority", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("createTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("inProgressStartTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("inProgressStartTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("claimTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("claimTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("suspendedTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("suspendedTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("inProgressStartDueBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("inProgressStartDueAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("dueBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("dueAfter", PARAMETER_TYPE_TIMESTAMP);
+
+        info.addQueryParameter("queryVar.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVar.scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVar.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVar.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVar.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVar.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVar.doubleValue", PARAMETER_TYPE_DOUBLE);
+
+        // EntityLink
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+
+        // Identitylink
+        info.addQueryParameter("candidateUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("group", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addJobParams() {
+        ParameterInfo info = addParameterInfo("job");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "jobType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_EXP_TIME_", "lockExpirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXCLUSIVE_", "exclusive", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROCESS_INSTANCE_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_NAME_", "elementName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CORRELATION_ID_", "correlationId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RETRIES_", "retries", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXCEPTION_STACK_ID_", "exceptionByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXCEPTION_MSG_", "exceptionMessage", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_TYPE_", "jobHandlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_CFG_", "jobHandlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CUSTOM_VALUES_ID_", "customValuesByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DUEDATE_", "duedate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("REPEAT_", "repeat", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("jobId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("jobExecutionScope", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("now", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("handlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("handlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("duedateHigherThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+    }
+
+    protected static void addModelParams() {
+        ParameterInfo info = addParameterInfo("model");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_UPDATE_TIME_", "lastUpdateTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("META_INFO_", "metaInfo", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EDITOR_SOURCE_VALUE_ID_", "editorSourceValueId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EDITOR_SOURCE_EXTRA_VALUE_ID_", "editorSourceExtraValueId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addProcessDefinitionParams() {
+        ParameterInfo info = addParameterInfo("processDefinition");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RESOURCE_NAME_", "resourceName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DGRM_RESOURCE_NAME_", "diagramResourceName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HAS_START_FORM_KEY_", "hasStartFormKey", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("HAS_GRAPHICAL_NOTATION_", "isGraphicalNotationDefined", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("SUSPENSION_STATE_", "suspensionState", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DERIVED_FROM_", "derivedFrom", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DERIVED_FROM_ROOT_", "derivedFromRoot", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DERIVED_VERSION_", "derivedVersion", PARAMETER_TYPE_INTEGER);
+        info.addColumn("ENGINE_VERSION_", "engineVersion", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("versionGt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("suspensionState.stateCode", PARAMETER_TYPE_INTEGER);
+
+        info.addQueryParameter("parentDeploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionVersion", PARAMETER_TYPE_INTEGER);
+
+        info.addQueryParameter("eventSubscriptionType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("eventSubscriptionName", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("authorizationUserId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+
+    }
+
+    protected static void addProcessDefinitionInfoParams() {
+        ParameterInfo info = addParameterInfo("processDefinitionInfo");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("INFO_JSON_ID_", "infoJsonId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addPropertyParams() {
+        ParameterInfo info = addParameterInfo("property");
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VALUE_", "value", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+    }
+
+    protected static void addResourceParams() {
+        ParameterInfo info = addParameterInfo("resource");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("GENERATED_", "generated", PARAMETER_TYPE_BOOLEAN);
+
+        info.addQueryParameter("resourceName", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addTaskParams() {
+        ParameterInfo info = addParameterInfo("task");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PARENT_TASK_ID_", "parentTaskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PRIORITY_", "priority", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP );
+        info.addColumn("IN_PROGRESS_TIME_", "inProgressStartTime", PARAMETER_TYPE_TIMESTAMP );
+        info.addColumn("IN_PROGRESS_STARTED_BY_", "inProgressStartedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CLAIM_TIME_", "claimTime", PARAMETER_TYPE_TIMESTAMP );
+        info.addColumn("CLAIMED_BY_", "claimedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUSPENDED_TIME_", "suspendedTime", PARAMETER_TYPE_TIMESTAMP );
+        info.addColumn("SUSPENDED_BY_", "suspendedBy", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("OWNER_", "owner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DELEGATION_", "delegationStateString", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR );
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR );
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_DEF_ID_", "taskDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROPAGATED_STAGE_INST_ID_", "propagatedStageInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_DEF_KEY_", "taskDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("STATE_", "state", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("IN_PROGRESS_DUE_DATE_", "inProgressStartDueDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("DUE_DATE_", "dueDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR );
+        info.addColumn("SUSPENSION_STATE_", "suspensionState", PARAMETER_TYPE_INTEGER );
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR );
+        info.addColumn("FORM_KEY_", "formKey", PARAMETER_TYPE_NVARCHAR );
+        info.addColumn("IS_COUNT_ENABLED_", "isCountEnabled", PARAMETER_TYPE_BOOLEAN );
+        info.addColumn("VAR_COUNT_", "variableCount", PARAMETER_TYPE_INTEGER );
+        info.addColumn("ID_LINK_COUNT_", "identityLinkCount", PARAMETER_TYPE_INTEGER );
+        info.addColumn("SUB_TASK_COUNT_", "subTaskCount", PARAMETER_TYPE_INTEGER );
+
+        // Task Query
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("orQueryObject.deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("assigneeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("candidateUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR); // CMMN = liquibase
+        info.addQueryParameter("caseInstanceIdWithChildren", PARAMETER_TYPE_VARCHAR);  // CMMN = liquibase
+        info.addQueryParameter("cmmnDeploymentId", PARAMETER_TYPE_VARCHAR);  // CMMN = liquibase
+        info.addQueryParameter("createTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("dueAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("dueBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("inProgressStartTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("inProgressStartTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("key", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("maxPriority", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("minPriority", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR); // From entity link
+        info.addQueryParameter("processCategory", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processInstanceBusinessKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processInstanceIdWithChildren", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("userIdForCandidateAndAssignee", PARAMETER_TYPE_NVARCHAR);
+
+        // Variables are returned together with tasks
+        addVariableColumnsWhenUsedInQueries(info);
+
+        // Identitylinks
+        addIdentityLinkColumsWhenUsedInQueries(info);
+
+    }
+
+    private static void addIdentityLinkColumsWhenUsedInQueries(ParameterInfo info) {
+        info.addColumn("ILINK_ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ILINK_TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ILINK_USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ILINK_GROUP_ID_", "groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ILINK_TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ILINK_PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ILINK_PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addVariableColumnsWhenUsedInQueries(ParameterInfo info) {
+        info.addColumn("VAR_ID_", "var.id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_NAME_", "var.name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TYPE_", "var.type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_REV_", "var.revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_PROC_INST_ID_", "var.processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_EXECUTION_ID_", "var.executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TASK_ID_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_META_INFO_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_BYTEARRAY_ID_", "var.byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_DOUBLE_", "var.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("VAR_TEXT_", "var.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TEXT2_", "var.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_LONG_", "var.longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("VAR_SCOPE_ID_", "var.scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SUB_SCOPE_ID_", "var.subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SCOPE_TYPE_", "var.scopeType", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addCaseDefinitionParams() {
+        ParameterInfo info = addParameterInfo("caseDefinition");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_NAME_", "resourceName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DGRM_RESOURCE_NAME_", "diagramResourceName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("HAS_START_FORM_KEY_", "hasStartFormKey", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("HAS_GRAPHICAL_NOTATION_", "isGraphicalNotationDefined", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter.caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter.caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("parameter.tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("versionGt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("authorizationUserId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("authorizationGroup", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addCaseInstanceParams() {
+        ParameterInfo info = addParameterInfo("caseInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "rev", PARAMETER_TYPE_INTEGER);
+        info.addColumn("PARENT_ID_", "parentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("BUSINESS_KEY_", "businessKey", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("STATE_", "state", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("LAST_REACTIVATION_TIME_", "lastReactivationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_REACTIVATION_USER_ID_", "lastReactivationUserId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CALLBACK_ID_", "callbackId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CALLBACK_TYPE_", "callbackType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IS_COMPLETEABLE_", "completeable", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("BUSINESS_STATUS_", "businessStatus", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("LOCK_TIME_", "lockTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CaseDefinitionKey", "caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CaseDefinitionName", "caseDefinitionName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CaseDefinitionVersion", "caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CaseDefinitionDeploymentId", "caseDefinitionDeploymentId", PARAMETER_TYPE_VARCHAR);
+        
+        // Variables are returned together with case instances
+        info.addColumn("VAR_ID_", "var.id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_NAME_", "var.name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TYPE_", "var.type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_REV_", "var.revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_PROC_INST_ID_", "var.processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_EXECUTION_ID_", "var.executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TASK_ID_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_META_INFO_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_BYTEARRAY_ID_", "var.byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_DOUBLE_", "var.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("VAR_TEXT_", "var.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TEXT2_", "var.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_LONG_", "var.longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("VAR_SCOPE_ID_", "var.scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SUB_SCOPE_ID_", "var.subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SCOPE_TYPE_", "var.scopeType", PARAMETER_TYPE_NVARCHAR);
+        
+        info.addQueryParameter("caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("planItemInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("expirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("caseDefinitionCategory", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("caseInstanceParentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("startedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedBy", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("lastReactivatedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastReactivatedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastReactivatedBy", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("activePlanItemDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroup", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addCmmnDeploymentParams() {
+        ParameterInfo info = addParameterInfo("cmmnDeployment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOY_TIME_", "deploymentTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("PARENT_DEPLOYMENT_ID_", "parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("nameLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryNotEquals", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("keyLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("tenantIdLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentDeploymentIdLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addCmmnResourceParams() {
+        ParameterInfo info = addParameterInfo("cmmnResource");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("GENERATED_", "generated", PARAMETER_TYPE_BOOLEAN);
+        
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addHistoricCaseInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicCaseInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "rev", PARAMETER_TYPE_INTEGER);
+        info.addColumn("PARENT_ID_", "parentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("BUSINESS_KEY_", "businessKey", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("STATE_", "state", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_REACTIVATION_TIME_", "lastReactivationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_REACTIVATION_USER_ID_", "lastReactivationUserId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CALLBACK_ID_", "callbackId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CALLBACK_TYPE_", "callbackType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("BUSINESS_STATUS_", "businessStatus", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CaseDefinitionKey", "caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CaseDefinitionName", "caseDefinitionName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CaseDefinitionVersion", "caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CaseDefinitionDeploymentId", "caseDefinitionDeploymentId", PARAMETER_TYPE_VARCHAR);
+        
+        // Variables are returned together with case instances
+        info.addColumn("VAR_ID_", "var.id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_NAME_", "var.name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TYPE_", "var.type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_REV_", "var.revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_PROC_INST_ID_", "var.processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_EXECUTION_ID_", "var.executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TASK_ID_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_META_INFO_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_BYTEARRAY_ID_", "var.byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_DOUBLE_", "var.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("VAR_TEXT_", "var.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TEXT2_", "var.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_LONG_", "var.longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("VAR_SCOPE_ID_", "var.scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SUB_SCOPE_ID_", "var.subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SCOPE_TYPE_", "var.scopeType", PARAMETER_TYPE_NVARCHAR);
+        
+        info.addQueryParameter("caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("planItemInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("expirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionCategory", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("caseInstanceParentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseInstanceName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("startedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("finishedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("finishedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedBy", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("lastReactivatedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastReactivatedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastReactivatedBy", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("activePlanItemDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedUserIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroup", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroupIdentityLink.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+    }
+    
+    protected static void addHistoricMilestoneInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicMilestoneInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TIME_STAMP_", "timeStamp", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("CASE_INST_ID_", "caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        info.addQueryParameter("milestoneInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("reachedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("reachedAfter", PARAMETER_TYPE_TIMESTAMP);
+    }
+    
+    protected static void addHistoricPlanItemInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicPlanItemInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DERIVED_CASE_DEF_ID_", "derivedCaseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_INST_ID_", "caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("STAGE_INST_ID_", "stageInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IS_STAGE_", "isStage", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ITEM_DEFINITION_ID_", "planItemDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ITEM_DEFINITION_TYPE_", "planItemDefinitionType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("STATE_", "state", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_AVAILABLE_TIME_", "lastAvailableTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_UNAVAILABLE_TIME_", "lastUnavailableTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_ENABLED_TIME_", "lastEnabledTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_DISABLED_TIME_", "lastDisabledTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_STARTED_TIME_", "lastStartedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_SUSPENDED_TIME_", "lastSuspendedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_UPDATED_TIME_", "lastUpdatedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IS_COMPLETEABLE_", "completable", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("ENTRY_CRITERION_ID_", "entryCriterionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("EXIT_CRITERION_ID_", "exitCriterionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("EXTRA_VALUE_", "extraValue", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("SHOW_IN_OVERVIEW_", "showInOverview", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        // Variables are returned together with case instances
+        info.addColumn("VAR_ID_", "var.id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_NAME_", "var.name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TYPE_", "var.type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_REV_", "var.revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_PROC_INST_ID_", "var.processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_EXECUTION_ID_", "var.executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TASK_ID_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_META_INFO_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_BYTEARRAY_ID_", "var.byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_DOUBLE_", "var.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("VAR_TEXT_", "var.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TEXT2_", "var.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_LONG_", "var.longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("VAR_SCOPE_ID_", "var.scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SUB_SCOPE_ID_", "var.subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SCOPE_TYPE_", "var.scopeType", PARAMETER_TYPE_NVARCHAR);
+        
+        info.addQueryParameter("caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("planItemInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("planItemInstanceName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("expirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("caseDefinitionCategory", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("caseInstanceParentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("createdBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createdAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastAvailableBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastAvailableAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastUnavailableBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastUnavailableAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastEnabledBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastEnabledAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastDisabledBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastDisabledAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastStartedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastStartedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastSuspendedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastSuspendedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("occurredBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("endedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedBy", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("onlyStages", PARAMETER_TYPE_BOOLEAN);
+        info.addQueryParameter("formKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroup", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addQueryParameter("parameter.caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter.planItemId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter.stageInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addMilestoneInstanceParams() {
+        ParameterInfo info = addParameterInfo("milestoneInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TIME_STAMP_", "timeStamp", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("CASE_INST_ID_", "caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        info.addQueryParameter("milestoneInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("reachedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("reachedAfter", PARAMETER_TYPE_TIMESTAMP);
+    }
+    
+    protected static void addPlanItemInstanceParams() {
+        ParameterInfo info = addParameterInfo("planItemInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DERIVED_CASE_DEF_ID_", "derivedCaseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_INST_ID_", "caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("STAGE_INST_ID_", "stageInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IS_STAGE_", "isStage", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ITEM_DEFINITION_ID_", "planItemDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ITEM_DEFINITION_TYPE_", "planItemDefinitionType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("STATE_", "state", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_AVAILABLE_TIME_", "lastAvailableTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_UNAVAILABLE_TIME_", "lastUnavailableTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_ENABLED_TIME_", "lastEnabledTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_DISABLED_TIME_", "lastDisabledTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_STARTED_TIME_", "lastStartedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_SUSPENDED_TIME_", "lastSuspendedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IS_COMPLETEABLE_", "completable", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("ENTRY_CRITERION_ID_", "entryCriterionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("EXIT_CRITERION_ID_", "exitCriterionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("EXTRA_VALUE_", "extraValue", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IS_COUNT_ENABLED_", "countEnabled", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("VAR_COUNT_", "variableCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("SENTRY_PART_INST_COUNT_", "sentryPartInstanceCount", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        // Variables are returned together with case instances
+        info.addColumn("VAR_ID_", "var.id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_NAME_", "var.name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TYPE_", "var.type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_REV_", "var.revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("VAR_PROC_INST_ID_", "var.processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_EXECUTION_ID_", "var.executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TASK_ID_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_META_INFO_", "var.taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_BYTEARRAY_ID_", "var.byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_DOUBLE_", "var.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("VAR_TEXT_", "var.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TEXT2_", "var.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_LONG_", "var.longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("VAR_SCOPE_ID_", "var.scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SUB_SCOPE_ID_", "var.subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_SCOPE_TYPE_", "var.scopeType", PARAMETER_TYPE_NVARCHAR);
+        
+        info.addQueryParameter("caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("planItemInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("expirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("caseDefinitionCategory", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("caseInstanceParentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("createdBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createdAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastAvailableBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastAvailableAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastUnavailableBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastUnavailableAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastEnabledBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastEnabledAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastDisabledBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastDisabledAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastStartedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastStartedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastSuspendedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("lastSuspendedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("completedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("occurredBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("endedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("startedBy", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("onlyStages", PARAMETER_TYPE_BOOLEAN);
+        info.addQueryParameter("formKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("involvedUser", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("involvedGroup", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addQueryParameter("parameter.caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter.planItemId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter.stageInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addSentryPartInstanceParams() {
+        ParameterInfo info = addParameterInfo("sentryPartInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CASE_DEF_ID_", "caseDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CASE_INST_ID_", "caseInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("PLAN_ITEM_INST_ID_", "planItemInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ON_PART_ID_", "onPartId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IF_PART_ID_", "ifPartId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TIME_STAMP_", "timeStamp", PARAMETER_TYPE_TIMESTAMP);
+        
+        info.addQueryParameter("milestoneInstanceId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("reachedBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("reachedAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addChannelDefinitionParams() {
+        ParameterInfo info = addParameterInfo("channelDefinition");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("IMPLEMENTATION_", "implementation", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("RESOURCE_NAME_", "resourceName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        info.addQueryParameter("channelDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryNotEquals", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("nameLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("nameLikeIgnoreCase", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("keyLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("keyLikeIgnoreCase", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("versionGt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("createTimeAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createTimeBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("resourceNameLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("tenantIdLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("eventVersion", PARAMETER_TYPE_INTEGER);
+    }
+    
+    protected static void addEventDefinitionParams() {
+        ParameterInfo info = addParameterInfo("eventDefinition");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_NAME_", "resourceName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        
+        info.addQueryParameter("eventDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryNotEquals", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("nameLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("nameLikeIgnoreCase", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("keyLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("keyLikeIgnoreCase", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("versionGt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("resourceNameLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("tenantIdLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("eventVersion", PARAMETER_TYPE_INTEGER);
+    }
+    
+    protected static void addEventDeploymentParams() {
+        ParameterInfo info = addParameterInfo("eventDeployment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOY_TIME_", "deploymentTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("PARENT_DEPLOYMENT_ID_", "parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("nameLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("categoryNotEquals", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("tenantIdLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentDeploymentIdLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("eventDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("eventDefinitionKeyLike", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("channelDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("channelDefinitionKeyLike", PARAMETER_TYPE_VARCHAR);
+    }
+    
+    protected static void addEventResourceParams() {
+        ParameterInfo info = addParameterInfo("eventResource");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        
+        info.addQueryParameter("resourceName", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_VARCHAR);
+    }
+
+    protected static void addTimerJobParams() {
+        ParameterInfo info = addParameterInfo("timerJob");
+        info.addColumn("ID_","id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "jobType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_EXP_TIME_", "lockExpirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXCLUSIVE_", "exclusive", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROCESS_INSTANCE_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_NAME_", "elementName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CORRELATION_ID_", "correlationId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RETRIES_", "retries", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXCEPTION_STACK_ID_", "exceptionByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXCEPTION_MSG_", "exceptionMessage", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_TYPE_", "jobHandlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_CFG_", "jobHandlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CUSTOM_VALUES_ID_", "customValuesByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DUEDATE_", "duedate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("REPEAT_", "repeat", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("handlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR); // careful: cmmn engine --> varchar
+        info.addQueryParameter("now", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("jobExecutionScope", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addVariableInstanceParams() {
+        ParameterInfo info = addParameterInfo("variableInstance", "variable");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BYTEARRAY_ID_", "byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DOUBLE_", "doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("TEXT_", "textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TEXT2_", "textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LONG_", "longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("META_INFO_", "metaInfo", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("typeName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("variableName", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+    }
+
+    protected static void addBatchPartParams() {
+        ParameterInfo info = addParameterInfo("batchPart");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("BATCH_ID_", "batchId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SEARCH_KEY_", "searchKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SEARCH_KEY2_", "searchKey2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("COMPLETE_TIME_", "completeTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("STATUS_", "status", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RESULT_DOC_ID_", "resultDocRefId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BATCH_TYPE_", "batchType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BATCH_SEARCH_KEY_", "batchSearchKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BATCH_SEARCH_KEY2_", "batchSearchKey2", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("tenantIdLike", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addDeadLetterJobParams() {
+        ParameterInfo info = addParameterInfo("deadLetterJob");
+        info.addColumn("ID_","id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "jobType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_EXP_TIME_", "lockExpirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXCLUSIVE_", "exclusive", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROCESS_INSTANCE_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_NAME_", "elementName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CORRELATION_ID_", "correlationId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RETRIES_", "retries", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXCEPTION_STACK_ID_", "exceptionByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXCEPTION_MSG_", "exceptionMessage", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_TYPE_", "jobHandlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_CFG_", "jobHandlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CUSTOM_VALUES_ID_", "customValuesByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DUEDATE_", "duedate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("REPEAT_", "repeat", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("handlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR); // careful: cmmn engine --> varchar
+        info.addQueryParameter("now", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("jobExecutionScope", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addEntityLinkParams() {
+        ParameterInfo info = addParameterInfo("entityLink");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LINK_TYPE_", "linkType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PARENT_ELEMENT_ID_", "parentElementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REF_SCOPE_ID_", "referenceScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REF_SCOPE_DEFINITION_ID_", "referenceScopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REF_SCOPE_TYPE_", "referenceScopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ROOT_SCOPE_ID_", "rootScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ROOT_SCOPE_TYPE_", "rootScopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HIERARCHY_TYPE_", "hierarchyType", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addEventSubscriptionParams() {
+        ParameterInfo info = addParameterInfo("eventSubscription");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EVENT_TYPE_", "eventType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EVENT_NAME_", "eventName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACTIVITY_ID_", "activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CONFIGURATION_", "configuration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATED_", "created", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_KEY_", "scopeDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_TIME_", "lockTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        
+        addEventSubscriptionAlias("messageEventSubscription", info);
+        addEventSubscriptionAlias("signalEventSubscription", info);
+        addEventSubscriptionAlias("compensateEventSubscription", info);
+        
+        info.addQueryParameter("createdBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("createdAfter", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("eventName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("eventType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("newTenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("oldTenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("newProcessDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("oldProcessDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("newScopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("oldScopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("currentTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addHistoricIdentityLinkParams() {
+        ParameterInfo info = addParameterInfo("historicIdentityLink");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("GROUP_ID_", "groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        
+        info.addQueryParameter("scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("identityLink.id", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addHistoryJobParams() {
+        ParameterInfo info = addParameterInfo("historyJob");
+        info.addColumn("ID_","id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_","revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_EXP_TIME_", "lockExpirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("RETRIES_", "retries", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXCEPTION_STACK_ID_", "exceptionByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXCEPTION_MSG_", "exceptionMessage", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ADV_HANDLER_CFG_ID_", "advancedJobHandlerConfigurationByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_TYPE_", "jobHandlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_CFG_", "jobHandlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CUSTOM_VALUES_ID_", "customValuesByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        
+        info.addQueryParameter("job.id", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("handlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("handlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("jobExecutionScope", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("now", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addHistoricTaskLogEntryParams() {
+        ParameterInfo info = addParameterInfo("historicTaskLogEntry");
+        info.addColumn("ID_", "logNumber", PARAMETER_TYPE_BIGINT);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TIME_STAMP_", "timeStamp", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DATA_", "data", PARAMETER_TYPE_NVARCHAR);
+        
+        info.addQueryParameter("fromDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("toDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("fromLogNumber", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("toLogNumber", PARAMETER_TYPE_BIGINT);
+    }
+    
+    protected static void addHistoricVariableInstanceParams() {
+        ParameterInfo info = addParameterInfo("historicVariableInstance");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "variableName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VAR_TYPE_", "variableType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("META_INFO_", "metaInfo", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BYTEARRAY_ID_", "byteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DOUBLE_", "doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addColumn("TEXT_", "textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TEXT2_", "textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LONG_", "longValue", PARAMETER_TYPE_BIGINT);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LAST_UPDATED_TIME_", "lastUpdatedTime", PARAMETER_TYPE_TIMESTAMP);
+        
+        info.addQueryParameter("name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("variable.id", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("variableNameLike", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.name", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.textValue2", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("queryVariableValue.longValue", PARAMETER_TYPE_BIGINT);
+        info.addQueryParameter("queryVariableValue.doubleValue", PARAMETER_TYPE_DOUBLE);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addIdentityLinkParams() {
+        ParameterInfo info = addParameterInfo("identityLink");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("GROUP_ID_", "groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TASK_ID_", "taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        
+        info.addQueryParameter("processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("taskId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("type", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("identityLink.id", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addSuspendedJobParams() {
+        ParameterInfo info = addParameterInfo("suspendedJob");
+        info.addColumn("ID_","id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "jobType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_EXP_TIME_", "lockExpirationTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("EXCLUSIVE_", "exclusive", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROCESS_INSTANCE_ID_", "processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_DEF_ID_", "processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_ID_", "elementId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ELEMENT_NAME_", "elementName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", "scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", "subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", "scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CORRELATION_ID_", "correlationId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("RETRIES_", "retries", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EXCEPTION_STACK_ID_", "exceptionByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXCEPTION_MSG_", "exceptionMessage", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_TYPE_", "jobHandlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("HANDLER_CFG_", "jobHandlerConfiguration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CUSTOM_VALUES_ID_", "customValuesByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATE_TIME_", "createTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DUEDATE_", "duedate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("REPEAT_", "repeat", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("handlerType", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("processDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR); // careful: cmmn engine --> varchar
+        info.addQueryParameter("now", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThan", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateHigherThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("duedateLowerThanOrEqual", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("jobExecutionScope", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("parameter", PARAMETER_TYPE_NVARCHAR);
+    }
+    
+    protected static void addEventSubscriptionAlias(String alias, ParameterInfo info) {
+        info.addColumn("ID_", alias + ".id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", alias + ".revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("EVENT_TYPE_", alias + ".eventType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EVENT_NAME_", alias + ".eventName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EXECUTION_ID_", alias + ".executionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PROC_INST_ID_", alias + ".processInstanceId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("ACTIVITY_ID_", alias + ".activityId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CONFIGURATION_", alias + ".configuration", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("CREATED_", alias + ".created", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("PROC_DEF_ID_", alias + ".processDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SUB_SCOPE_ID_", alias + ".subScopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_ID_", alias + ".scopeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_ID_", alias + ".scopeDefinitionId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_DEFINITION_KEY_", alias + ".scopeDefinitionKey", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("SCOPE_TYPE_", alias + ".scopeType", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LOCK_TIME_", alias + ".lockTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("LOCK_OWNER_", alias + ".lockOwner", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", alias + ".tenantId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addDecisionParams() {
+        ParameterInfo info = addParameterInfo("decision");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_NAME_", "resourceName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DECISION_TYPE_", "decisionType", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("decisionId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("decisionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("decisionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLte", PARAMETER_TYPE_INTEGER);
+    }
+
+    protected static void addDmnDeploymentParams() {
+        ParameterInfo info = addParameterInfo("dmnDeployment", "deployment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("PARENT_DEPLOYMENT_ID_", "parentDeploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOY_TIME_", "deploymentTime", PARAMETER_TYPE_TIMESTAMP);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("decisionKey", PARAMETER_TYPE_VARCHAR);
+    }
+
+    protected static void addHistoricDecisionExecutionParams() {
+        ParameterInfo info = addParameterInfo("historicDecisionExecution");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DECISION_DEFINITION_ID_", "decisionDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("INSTANCE_ID_", "instanceId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("EXECUTION_ID_", "executionId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("ACTIVITY_ID_", "activityId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("FAILED_", "failed", PARAMETER_TYPE_BOOLEAN);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("EXECUTION_JSON_", "executionJson", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("SCOPE_TYPE_", "scopeType", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEC_DEF_KEY_", "decisionKey", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEC_DEF_NAME_", "decisionName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEC_DEF_VERSION_", "decisionVersion", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("decisionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("processInstanceIdWithChildren", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseInstanceIdWithChildren", PARAMETER_TYPE_VARCHAR);
+    }
+
+    protected static void addDmnResourceParams() {
+        ParameterInfo info = addParameterInfo("dmnResource", "resource");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("resourceName", PARAMETER_TYPE_VARCHAR);
+    }
+
+    protected static void addAppDefinitionParams() {
+        ParameterInfo info = addParameterInfo("appDefinition");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("VERSION_", "version", PARAMETER_TYPE_INTEGER);
+        info.addColumn("DESCRIPTION_", "description", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_NAME_", "resourceName", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("appDefinitionId", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("appDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("appDefinitionVersion", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionGte", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLt", PARAMETER_TYPE_INTEGER);
+        info.addQueryParameter("versionLte", PARAMETER_TYPE_INTEGER);
+    }
+
+    protected static void addAppDeploymentParams() {
+        ParameterInfo info = addParameterInfo("appDeployment");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("CATEGORY_", "category", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("DEPLOY_TIME_", "deploymentTime", PARAMETER_TYPE_TIMESTAMP);
+
+        info.addQueryParameter("deploymentId", PARAMETER_TYPE_VARCHAR);
+    }
+
+    protected static void addAppResourceParams() {
+        ParameterInfo info = addParameterInfo("appResource", "resource");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_VARCHAR);
+        info.addColumn("RESOURCE_BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("DEPLOYMENT_ID_", "deploymentId", PARAMETER_TYPE_VARCHAR);
+
+        info.addQueryParameter("resourceName", PARAMETER_TYPE_VARCHAR);
+    }
+
+    protected static void addGroupParams() {
+        ParameterInfo info = addParameterInfo("group");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("userId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupType", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addIdmByteArrayParams() {
+        ParameterInfo info = addParameterInfo("idmByteArray", "byteArray");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("BYTES_", "bytes", PARAMETER_TYPE_BLOBTYPE);
+    }
+
+    protected static void addPrivilegeMappingParams() {
+        ParameterInfo info = addParameterInfo("privilege");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("userId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addPrivilegeParams() {
+        ParameterInfo info = addParameterInfo("privilegeMapping");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PRIV_ID_", "privilegeId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("GROUP_ID_", "groupId", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("userId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addIdentityInfoParams() {
+        ParameterInfo info = addParameterInfo("identityInfo");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TYPE_", "type", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("KEY_", "key", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VALUE_", "value", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PASSWORD_", "passwordBytes", PARAMETER_TYPE_BLOBTYPE);
+        info.addColumn("PARENT_ID_", "parentId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addIdmPropertyParams() {
+        ParameterInfo info = addParameterInfo("idmProperty", "property");
+        info.addColumn("NAME_", "name", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("VALUE_", "value", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+    }
+
+    protected static void addMembershipParams() {
+        ParameterInfo info = addParameterInfo("membership");
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("GROUP_ID_", "groupId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    protected static void addTokenParams() {
+        ParameterInfo info = addParameterInfo("token");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("TOKEN_VALUE_", "tokenValue", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TOKEN_DATE_", "tokenDate", PARAMETER_TYPE_TIMESTAMP);
+        info.addColumn("IP_ADDRESS_", "ipAddress", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_AGENT_", "userAgent", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("USER_ID_", "userId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TOKEN_DATA_", "tokenData", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("tokenDateBefore", PARAMETER_TYPE_TIMESTAMP);
+        info.addQueryParameter("tokenDateAfter", PARAMETER_TYPE_TIMESTAMP);
+    }
+
+    protected static void addUserParams() {
+        ParameterInfo info = addParameterInfo("user");
+        info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+        info.addColumn("FIRST_", "firstName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("LAST_", "lastName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("DISPLAY_NAME_", "displayName", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("EMAIL_", "email", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PWD_", "password", PARAMETER_TYPE_NVARCHAR);
+        info.addColumn("PICTURE_ID_", "pictureByteArrayRef", PARAMETER_TYPE_NVARCHAR);
+
+        info.addQueryParameter("idIgnoreCase", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("fullName", PARAMETER_TYPE_NVARCHAR);
+        info.addQueryParameter("groupId", PARAMETER_TYPE_NVARCHAR);
+    }
+
+    public static String getParameterType(String entity, String parameterName) {
+        return getParameterInfo(entity).getParameterType(parameterName);
+    }
+
+    public static String getColumnType(String entity, String columnName) {
+        return getParameterInfo(entity).getColumnType(columnName);
+    }
+
+    private static ParameterInfo getParameterInfo(String entity) {
+        String lowerCasedEntity = entity.toLowerCase(Locale.ROOT);
+        if (!ALL_PARAMS.containsKey(lowerCasedEntity)) {
+            throw new RuntimeException("No parameter types found for " + entity);
+        }
+        ParameterInfo parameterInfo = ALL_PARAMS.get(lowerCasedEntity);
+        return parameterInfo;
+    }
+
+    protected static ParameterInfo addParameterInfo(String alias) {
+        ParameterInfo parameterInfo = new ParameterInfo(alias);
+        ALL_PARAMS.put(alias.toLowerCase(Locale.ROOT), parameterInfo);
+        return parameterInfo;
+    }
+
+    protected static ParameterInfo addParameterInfo(String alias, String...additionalAliases) {
+        ParameterInfo parameterInfo = new ParameterInfo(alias, additionalAliases);
+        ALL_PARAMS.put(alias.toLowerCase(Locale.ROOT), parameterInfo);
+        return parameterInfo;
+    }
+    
+    protected static class ParameterInfo {
+
+        protected String alias;
+        protected String[] additionalAliases;
+        protected Map<String, String> columnToParameterMap = new HashMap<>();
+        protected Map<String, String> parameterToJdbcTypeMap = new HashMap<>();
+
+        public ParameterInfo(String alias) {
+            this.alias = alias;
+
+            // Common for all
+            addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
+            addQueryParameter("revisionNext", PARAMETER_TYPE_INTEGER);
+        }
+
+        public ParameterInfo(String alias, String ... additionalAliases) {
+            this(alias);
+            this.additionalAliases = additionalAliases;
+        }
+
+        public ParameterInfo addColumn(String columnName, String parameter, String jdbcType) {
+            columnToParameterMap.put(columnName, parameter);
+            addParameter(parameter, jdbcType);
+            return this;
+        }
+
+        public ParameterInfo addQueryParameter(String parameter, String jdbcType) {
+            addParameter(parameter, jdbcType);
+            return this;
+        }
+
+        protected void addParameter(String parameter, String jdbcType) {
+            internalAddParameter(parameter, jdbcType);
+
+            if (jdbcType.equals(PARAMETER_TYPE_NVARCHAR) || jdbcType.equals(PARAMETER_TYPE_VARCHAR)) {
+                internalAddParameter(parameter + "Like", jdbcType);
+                internalAddParameter(parameter + "LikeIgnoreCase", jdbcType);
+                internalAddParameter(parameter + "NotEquals", jdbcType);
+            }
+        }
+
+        protected void internalAddParameter(String parameter, String jdbcType) {
+            parameterToJdbcTypeMap.put(parameter, jdbcType);
+            parameterToJdbcTypeMap.put(alias + "." + parameter, jdbcType);
+            parameterToJdbcTypeMap.put("parameter." + parameter, jdbcType);
+            parameterToJdbcTypeMap.put("orQueryObject." + parameter, jdbcType);
+
+            if (additionalAliases != null) {
+                for (String additionalAlias : additionalAliases) {
+                    parameterToJdbcTypeMap.put(additionalAlias + "." + parameter, jdbcType);
+                }
+            }
+        }
+
+        public String getColumnType(String columnName) {
+            String parameterName = columnToParameterMap.get(columnName);
+            if (StringUtils.isEmpty(parameterName)) {
+                throw new RuntimeException("No parameter type set for column " + columnName);
+            }
+            return getParameterType(parameterName);
+        }
+
+        public String getParameterType(String parameterName) {
+            return parameterToJdbcTypeMap.get(parameterName);
+        }
+
+    }
+
+}
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskInstance.xml b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskInstance.xml
index 84d6c9e2b50..e018b440319 100644
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskInstance.xml
+++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskInstance.xml
@@ -59,40 +59,40 @@
         TENANT_ID_,
         LAST_UPDATED_TIME_
       ) values (
-        #{id ,jdbcType=VARCHAR},
-        1, #{taskDefinitionId, jdbcType=VARCHAR},
-        #{processDefinitionId, jdbcType=VARCHAR},
-        #{processInstanceId, jdbcType=VARCHAR},
-        #{executionId, jdbcType=VARCHAR},
-        #{scopeId, jdbcType=VARCHAR},
-        #{subScopeId, jdbcType=VARCHAR},
-        #{scopeType, jdbcType=VARCHAR},
-        #{scopeDefinitionId, jdbcType=VARCHAR},
-        #{propagatedStageInstanceId, jdbcType=VARCHAR},
-        #{state ,jdbcType=VARCHAR},
-        #{name ,jdbcType=VARCHAR},
-        #{parentTaskId ,jdbcType=VARCHAR},
-        #{description ,jdbcType=VARCHAR},
-        #{owner ,jdbcType=VARCHAR},
-        #{assignee ,jdbcType=VARCHAR},
+        #{id, jdbcType=NVARCHAR},
+        1, #{taskDefinitionId, jdbcType=NVARCHAR},
+        #{processDefinitionId, jdbcType=NVARCHAR},
+        #{processInstanceId, jdbcType=NVARCHAR},
+        #{executionId, jdbcType=NVARCHAR},
+        #{scopeId, jdbcType=NVARCHAR},
+        #{subScopeId, jdbcType=NVARCHAR},
+        #{scopeType, jdbcType=NVARCHAR},
+        #{scopeDefinitionId, jdbcType=NVARCHAR},
+        #{propagatedStageInstanceId, jdbcType=NVARCHAR},
+        #{state, jdbcType=NVARCHAR},
+        #{name, jdbcType=NVARCHAR},
+        #{parentTaskId, jdbcType=NVARCHAR},
+        #{description, jdbcType=NVARCHAR},
+        #{owner, jdbcType=NVARCHAR},
+        #{assignee, jdbcType=NVARCHAR},
         #{createTime, jdbcType=TIMESTAMP},
         #{inProgressStartTime, jdbcType=TIMESTAMP},
-        #{inProgressStartedBy, jdbcType=VARCHAR},
+        #{inProgressStartedBy, jdbcType=NVARCHAR},
         #{claimTime, jdbcType=TIMESTAMP},
-        #{claimedBy, jdbcType=VARCHAR},
+        #{claimedBy, jdbcType=NVARCHAR},
         #{suspendedTime, jdbcType=TIMESTAMP},
-        #{suspendedBy, jdbcType=VARCHAR},
+        #{suspendedBy, jdbcType=NVARCHAR},
         #{endTime, jdbcType=TIMESTAMP},
-        #{completedBy, jdbcType=VARCHAR},
-        #{durationInMillis ,jdbcType=BIGINT},
-        #{deleteReason ,jdbcType=VARCHAR},
-        #{taskDefinitionKey ,jdbcType=VARCHAR},
-        #{formKey ,jdbcType=VARCHAR},
+        #{completedBy, jdbcType=NVARCHAR},
+        #{durationInMillis, jdbcType=BIGINT},
+        #{deleteReason, jdbcType=NVARCHAR},
+        #{taskDefinitionKey, jdbcType=NVARCHAR},
+        #{formKey, jdbcType=NVARCHAR},
         #{priority, jdbcType=INTEGER},
         #{inProgressStartDueDate, jdbcType=TIMESTAMP},
         #{dueDate, jdbcType=TIMESTAMP},
-        #{category, jdbcType=VARCHAR},
-        #{tenantId, jdbcType=VARCHAR},
+        #{category, jdbcType=NVARCHAR},
+        #{tenantId, jdbcType=NVARCHAR},
         #{lastUpdateTime, jdbcType=TIMESTAMP}
       )
   </insert>
@@ -137,40 +137,40 @@
         LAST_UPDATED_TIME_
       ) values
         <foreach collection="list" item="historicTask" index="index" separator=",">
-          (#{historicTask.id ,jdbcType=VARCHAR},
-           1, #{historicTask.taskDefinitionId, jdbcType=VARCHAR},
-           #{historicTask.processDefinitionId, jdbcType=VARCHAR},
-           #{historicTask.processInstanceId, jdbcType=VARCHAR},
-           #{historicTask.executionId, jdbcType=VARCHAR},
-           #{historicTask.scopeId, jdbcType=VARCHAR},
-           #{historicTask.subScopeId, jdbcType=VARCHAR},
-           #{historicTask.scopeType, jdbcType=VARCHAR},
-           #{historicTask.scopeDefinitionId, jdbcType=VARCHAR},
-           #{historicTask.propagatedStageInstanceId, jdbcType=VARCHAR},
-           #{historicTask.state ,jdbcType=VARCHAR},
-           #{historicTask.name ,jdbcType=VARCHAR},
-           #{historicTask.parentTaskId ,jdbcType=VARCHAR},
-           #{historicTask.description ,jdbcType=VARCHAR},
-           #{historicTask.owner ,jdbcType=VARCHAR},
-           #{historicTask.assignee ,jdbcType=VARCHAR},
+          (#{historicTask.id, jdbcType=NVARCHAR},
+           1, #{historicTask.taskDefinitionId, jdbcType=NVARCHAR},
+           #{historicTask.processDefinitionId, jdbcType=NVARCHAR},
+           #{historicTask.processInstanceId, jdbcType=NVARCHAR},
+           #{historicTask.executionId, jdbcType=NVARCHAR},
+           #{historicTask.scopeId, jdbcType=NVARCHAR},
+           #{historicTask.subScopeId, jdbcType=NVARCHAR},
+           #{historicTask.scopeType, jdbcType=NVARCHAR},
+           #{historicTask.scopeDefinitionId, jdbcType=NVARCHAR},
+           #{historicTask.propagatedStageInstanceId, jdbcType=NVARCHAR},
+           #{historicTask.state, jdbcType=NVARCHAR},
+           #{historicTask.name, jdbcType=NVARCHAR},
+           #{historicTask.parentTaskId, jdbcType=NVARCHAR},
+           #{historicTask.description, jdbcType=NVARCHAR},
+           #{historicTask.owner, jdbcType=NVARCHAR},
+           #{historicTask.assignee, jdbcType=NVARCHAR},
            #{historicTask.createTime, jdbcType=TIMESTAMP},
            #{historicTask.inProgressStartTime, jdbcType=TIMESTAMP},
-           #{historicTask.inProgressStartedBy, jdbcType=VARCHAR},
+           #{historicTask.inProgressStartedBy, jdbcType=NVARCHAR},
            #{historicTask.claimTime, jdbcType=TIMESTAMP},
-           #{historicTask.claimedBy, jdbcType=VARCHAR},
+           #{historicTask.claimedBy, jdbcType=NVARCHAR},
            #{historicTask.suspendedTime, jdbcType=TIMESTAMP},
-           #{historicTask.suspendedBy, jdbcType=VARCHAR},
+           #{historicTask.suspendedBy, jdbcType=NVARCHAR},
            #{historicTask.endTime, jdbcType=TIMESTAMP},
-           #{historicTask.completedBy, jdbcType=VARCHAR},
-           #{historicTask.durationInMillis ,jdbcType=BIGINT},
-           #{historicTask.deleteReason ,jdbcType=VARCHAR},
-           #{historicTask.taskDefinitionKey ,jdbcType=VARCHAR},
-           #{historicTask.formKey ,jdbcType=VARCHAR},
+           #{historicTask.completedBy, jdbcType=NVARCHAR},
+           #{historicTask.durationInMillis, jdbcType=BIGINT},
+           #{historicTask.deleteReason, jdbcType=NVARCHAR},
+           #{historicTask.taskDefinitionKey, jdbcType=NVARCHAR},
+           #{historicTask.formKey, jdbcType=NVARCHAR},
            #{historicTask.priority, jdbcType=INTEGER},
            #{historicTask.inProgressStartDueDate, jdbcType=TIMESTAMP},
            #{historicTask.dueDate, jdbcType=TIMESTAMP},
-           #{historicTask.category, jdbcType=VARCHAR},
-           #{historicTask.tenantId, jdbcType=VARCHAR},
+           #{historicTask.category, jdbcType=NVARCHAR},
+           #{historicTask.tenantId, jdbcType=NVARCHAR},
            #{historicTask.lastUpdateTime, jdbcType=TIMESTAMP})
         </foreach>
   </insert>
@@ -216,40 +216,40 @@
             TENANT_ID_,
             LAST_UPDATED_TIME_
           ) VALUES
-            (#{historicTask.id ,jdbcType=VARCHAR},
-             1, #{historicTask.taskDefinitionId, jdbcType=VARCHAR},
-             #{historicTask.processDefinitionId, jdbcType=VARCHAR},
-             #{historicTask.processInstanceId, jdbcType=VARCHAR},
-             #{historicTask.executionId, jdbcType=VARCHAR},
-             #{historicTask.scopeId, jdbcType=VARCHAR},
-             #{historicTask.subScopeId, jdbcType=VARCHAR},
-             #{historicTask.scopeType, jdbcType=VARCHAR},
-             #{historicTask.scopeDefinitionId, jdbcType=VARCHAR},
-             #{historicTask.propagatedStageInstanceId, jdbcType=VARCHAR},
-             #{historicTask.state ,jdbcType=VARCHAR},
-             #{historicTask.name ,jdbcType=VARCHAR},
-             #{historicTask.parentTaskId ,jdbcType=VARCHAR},
-             #{historicTask.description ,jdbcType=VARCHAR},
-             #{historicTask.owner ,jdbcType=VARCHAR},
-             #{historicTask.assignee ,jdbcType=VARCHAR},
+            (#{historicTask.id, jdbcType=NVARCHAR},
+             1, #{historicTask.taskDefinitionId, jdbcType=NVARCHAR},
+             #{historicTask.processDefinitionId, jdbcType=NVARCHAR},
+             #{historicTask.processInstanceId, jdbcType=NVARCHAR},
+             #{historicTask.executionId, jdbcType=NVARCHAR},
+             #{historicTask.scopeId, jdbcType=NVARCHAR},
+             #{historicTask.subScopeId, jdbcType=NVARCHAR},
+             #{historicTask.scopeType, jdbcType=NVARCHAR},
+             #{historicTask.scopeDefinitionId, jdbcType=NVARCHAR},
+             #{historicTask.propagatedStageInstanceId, jdbcType=NVARCHAR},
+             #{historicTask.state, jdbcType=NVARCHAR},
+             #{historicTask.name, jdbcType=NVARCHAR},
+             #{historicTask.parentTaskId, jdbcType=NVARCHAR},
+             #{historicTask.description, jdbcType=NVARCHAR},
+             #{historicTask.owner, jdbcType=NVARCHAR},
+             #{historicTask.assignee, jdbcType=NVARCHAR},
              #{historicTask.createTime, jdbcType=TIMESTAMP},
              #{historicTask.inProgressStartTime, jdbcType=TIMESTAMP},
-             #{historicTask.inProgressStartedBy, jdbcType=VARCHAR},
+             #{historicTask.inProgressStartedBy, jdbcType=NVARCHAR},
              #{historicTask.claimTime, jdbcType=TIMESTAMP},
-             #{historicTask.claimedBy, jdbcType=VARCHAR},
+             #{historicTask.claimedBy, jdbcType=NVARCHAR},
              #{historicTask.suspendedTime, jdbcType=TIMESTAMP},
-             #{historicTask.suspendedBy, jdbcType=VARCHAR},
+             #{historicTask.suspendedBy, jdbcType=NVARCHAR},
              #{historicTask.endTime, jdbcType=TIMESTAMP},
-             #{historicTask.completedBy, jdbcType=VARCHAR},
-             #{historicTask.durationInMillis ,jdbcType=BIGINT},
-             #{historicTask.deleteReason ,jdbcType=VARCHAR},
-             #{historicTask.taskDefinitionKey ,jdbcType=VARCHAR},
-             #{historicTask.formKey ,jdbcType=VARCHAR},
+             #{historicTask.completedBy, jdbcType=NVARCHAR},
+             #{historicTask.durationInMillis, jdbcType=BIGINT},
+             #{historicTask.deleteReason, jdbcType=NVARCHAR},
+             #{historicTask.taskDefinitionKey, jdbcType=NVARCHAR},
+             #{historicTask.formKey, jdbcType=NVARCHAR},
              #{historicTask.priority, jdbcType=INTEGER},
              #{historicTask.inProgressStartDueDate, jdbcType=TIMESTAMP},
              #{historicTask.dueDate, jdbcType=TIMESTAMP},
-             #{historicTask.category, jdbcType=VARCHAR},
-             #{historicTask.tenantId, jdbcType=VARCHAR},
+             #{historicTask.category, jdbcType=NVARCHAR},
+             #{historicTask.tenantId, jdbcType=NVARCHAR},
              #{historicTask.lastUpdateTime, jdbcType=TIMESTAMP})
         </foreach>
     SELECT * FROM dual
@@ -262,82 +262,82 @@
       <set>
       	  REV_ = #{revisionNext, jdbcType=INTEGER},
 	      <if test="originalPersistentState.taskDefinitionId != taskDefinitionId">
-	      	TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=VARCHAR},
+	      	TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-	      	PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+	      	PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.executionId != executionId">
-	      	EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+	      	EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
 	      </if>
           <if test="originalPersistentState.scopeId != scopeId">
-            SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+            SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.subScopeId != subScopeId">
-            SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+            SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.scopeType != scopeType">
-            SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+            SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-            SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+            SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.propagatedStageInstanceId != propagatedStageInstanceId">
-            PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=VARCHAR},
+            PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.state != state">
-            STATE_ = #{state, jdbcType=VARCHAR},
+            STATE_ = #{state, jdbcType=NVARCHAR},
           </if>
 	      <if test="originalPersistentState.name != name">
-	      	NAME_ = #{name, jdbcType=VARCHAR},
+	      	NAME_ = #{name, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.parentTaskId != parentTaskId">
-	      	PARENT_TASK_ID_ = #{parentTaskId, jdbcType=VARCHAR},
+	      	PARENT_TASK_ID_ = #{parentTaskId, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.description != description">
-	      	DESCRIPTION_ = #{description, jdbcType=VARCHAR},
+	      	DESCRIPTION_ = #{description, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.owner != owner">
-	        OWNER_ = #{owner, jdbcType=VARCHAR},
+	        OWNER_ = #{owner, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.assignee != assignee">
-	      	ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
+	      	ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.inProgressStartTime != inProgressStartTime">
             IN_PROGRESS_TIME_ = #{inProgressStartTime, jdbcType=TIMESTAMP},
           </if>
           <if test="originalPersistentState.inProgressStartedBy != inProgressStartedBy">
-            IN_PROGRESS_STARTED_BY_ = #{inProgressStartedBy, jdbcType=VARCHAR},
+            IN_PROGRESS_STARTED_BY_ = #{inProgressStartedBy, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.claimTime != claimTime">
             CLAIM_TIME_ = #{claimTime, jdbcType=TIMESTAMP},
           </if>
           <if test="originalPersistentState.claimedBy != claimedBy">
-            CLAIMED_BY_ = #{claimedBy, jdbcType=VARCHAR},
+            CLAIMED_BY_ = #{claimedBy, jdbcType=NVARCHAR},
           </if>
           <if test="originalPersistentState.suspendedTime != suspendedTime">
             SUSPENDED_TIME_ = #{suspendedTime, jdbcType=TIMESTAMP},
           </if>
           <if test="originalPersistentState.suspendedBy != suspendedBy">
-            SUSPENDED_BY_ = #{suspendedBy, jdbcType=VARCHAR},
+            SUSPENDED_BY_ = #{suspendedBy, jdbcType=NVARCHAR},
           </if>
 	      <if test="originalPersistentState.endTime != endTime">
 	      	END_TIME_ = #{endTime, jdbcType=TIMESTAMP},
 	      </if>
 	      <if test="originalPersistentState.completedBy != completedBy">
-            COMPLETED_BY_ = #{completedBy, jdbcType=VARCHAR},
+            COMPLETED_BY_ = #{completedBy, jdbcType=NVARCHAR},
           </if>
 	      <if test="originalPersistentState.durationInMillis != durationInMillis">
-	      	DURATION_ = #{durationInMillis ,jdbcType=BIGINT},
+	      	DURATION_ = #{durationInMillis, jdbcType=BIGINT},
 	      </if>
 	      <if test="originalPersistentState.deleteReason != deleteReason">
-	      	DELETE_REASON_ = #{deleteReason ,jdbcType=VARCHAR},
+	      	DELETE_REASON_ = #{deleteReason, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.taskDefinitionKey != taskDefinitionKey">
-	      	TASK_DEF_KEY_ = #{taskDefinitionKey ,jdbcType=VARCHAR},
+	      	TASK_DEF_KEY_ = #{taskDefinitionKey, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.formKey != formKey">
-	      	FORM_KEY_ = #{formKey ,jdbcType=VARCHAR},
+	      	FORM_KEY_ = #{formKey, jdbcType=NVARCHAR},
 	      </if>
 	      <if test="originalPersistentState.priority != priority">
 	      	PRIORITY_ = #{priority, jdbcType=INTEGER},
@@ -349,26 +349,26 @@
 	      	DUE_DATE_ = #{dueDate, jdbcType=TIMESTAMP},
 	      </if>
 	      <if test="originalPersistentState.category != category">
-	      	CATEGORY_ = #{category, jdbcType=VARCHAR},
+	      	CATEGORY_ = #{category, jdbcType=NVARCHAR},
 	  	  </if>
 	  	  <if test="originalPersistentState.lastUpdateTime != lastUpdateTime">
 	      	LAST_UPDATED_TIME_ = #{lastUpdateTime, jdbcType=TIMESTAMP},
 	      </if>
   	  </set>
-    where ID_ = #{id}
+    where ID_ = #{id, jdbcType=NVARCHAR}
     and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <!-- HISTORIC TASK INSTANCE DELETE -->
 
   <delete id="deleteHistoricTaskInstance" parameterType="org.flowable.task.service.impl.persistence.entity.HistoricTaskInstanceEntityImpl">
-    delete from ${prefix}ACT_HI_TASKINST where ID_ = #{id}
+    delete from ${prefix}ACT_HI_TASKINST where ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="bulkDeleteHistoricTaskInstance" parameterType="java.util.Collection">
     delete from ${prefix}ACT_HI_TASKINST where
     <foreach item="task" collection="list" index="index" separator=" or ">
-        ID_ = #{task.id, jdbcType=VARCHAR}
+        ID_ = #{task.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
   
@@ -379,8 +379,8 @@
         or
         </if>
         ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="listItem" open="(" separator="," close=")">
+          #{id, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
@@ -427,106 +427,106 @@
 
   <!-- HISTORIC TASK INSTANCE RESULT MAP -->
   <resultMap id="historicTaskInstanceResultMap" type="org.flowable.task.service.impl.persistence.entity.HistoricTaskInstanceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR"/>
-    <result property="state" column="STATE_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR" />
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
-    <result property="owner" column="OWNER_" jdbcType="VARCHAR" />
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR" />
+    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR"/>
+    <result property="state" column="STATE_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="description" column="DESCRIPTION_" jdbcType="NVARCHAR" />
+    <result property="owner" column="OWNER_" jdbcType="NVARCHAR" />
+    <result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR" />
     <result property="createTime" column="START_TIME_" jdbcType="TIMESTAMP" />
     <result property="inProgressStartTime" column="IN_PROGRESS_TIME_" jdbcType="TIMESTAMP" />
-    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="VARCHAR"/>
+    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="NVARCHAR"/>
     <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
-    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="VARCHAR"/>
+    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="NVARCHAR"/>
     <result property="suspendedTime" column="SUSPENDED_TIME_" jdbcType="TIMESTAMP" />
-    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="VARCHAR"/>
+    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="NVARCHAR"/>
     <result property="endTime" column="END_TIME_" jdbcType="TIMESTAMP" />
-    <result property="completedBy" column="COMPLETED_BY_" jdbcType="VARCHAR"/>
+    <result property="completedBy" column="COMPLETED_BY_" jdbcType="NVARCHAR"/>
     <result property="durationInMillis" column="DURATION_" jdbcType="BIGINT" />
-    <result property="deleteReason" column="DELETE_REASON_" jdbcType="VARCHAR" />
-    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR" />
-    <result property="formKey" column="FORM_KEY_" jdbcType="VARCHAR" />
+    <result property="deleteReason" column="DELETE_REASON_" jdbcType="NVARCHAR" />
+    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="NVARCHAR" />
+    <result property="formKey" column="FORM_KEY_" jdbcType="NVARCHAR" />
     <result property="priority" column="PRIORITY_" jdbcType="INTEGER" />
     <result property="inProgressStartDueDate" column="IN_PROGRESS_DUE_DATE_" jdbcType="TIMESTAMP" />
     <result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP" />
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
     <result property="lastUpdateTime" column="LAST_UPDATED_TIME_" jdbcType="TIMESTAMP" />
   </resultMap>
 
   <resultMap id="historicTaskAndRelatedEntitiesResultMap" type="org.flowable.task.service.impl.persistence.entity.HistoricTaskInstanceEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR" />
+    <id property="id" column="ID_" jdbcType="NVARCHAR" />
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR"/>
-    <result property="state" column="STATE_" jdbcType="VARCHAR" />
-    <result property="name" column="NAME_" jdbcType="VARCHAR" />
-    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR" />
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
-    <result property="owner" column="OWNER_" jdbcType="VARCHAR" />
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR" />
+    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR"/>
+    <result property="state" column="STATE_" jdbcType="NVARCHAR" />
+    <result property="name" column="NAME_" jdbcType="NVARCHAR" />
+    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="NVARCHAR" />
+    <result property="description" column="DESCRIPTION_" jdbcType="NVARCHAR" />
+    <result property="owner" column="OWNER_" jdbcType="NVARCHAR" />
+    <result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR" />
     <result property="createTime" column="START_TIME_" jdbcType="TIMESTAMP" />
     <result property="inProgressStartTime" column="IN_PROGRESS_TIME_" jdbcType="TIMESTAMP" />
-    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="VARCHAR"/>
+    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="NVARCHAR"/>
     <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
-    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="VARCHAR"/>
+    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="NVARCHAR"/>
     <result property="suspendedTime" column="SUSPENDED_TIME_" jdbcType="TIMESTAMP" />
-    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="VARCHAR"/>
+    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="NVARCHAR"/>
     <result property="endTime" column="END_TIME_" jdbcType="TIMESTAMP" />
-    <result property="completedBy" column="COMPLETED_BY_" jdbcType="VARCHAR"/>
+    <result property="completedBy" column="COMPLETED_BY_" jdbcType="NVARCHAR"/>
     <result property="durationInMillis" column="DURATION_" jdbcType="BIGINT" />
-    <result property="deleteReason" column="DELETE_REASON_" jdbcType="VARCHAR" />
-    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR" />
-    <result property="formKey" column="FORM_KEY_" jdbcType="VARCHAR" />
+    <result property="deleteReason" column="DELETE_REASON_" jdbcType="NVARCHAR" />
+    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="NVARCHAR" />
+    <result property="formKey" column="FORM_KEY_" jdbcType="NVARCHAR" />
     <result property="priority" column="PRIORITY_" jdbcType="INTEGER" />
     <result property="inProgressStartDueDate" column="IN_PROGRESS_DUE_DATE_" jdbcType="TIMESTAMP" />
     <result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP" />
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
     <result property="lastUpdateTime" column="LAST_UPDATED_TIME_" jdbcType="TIMESTAMP" />
     <collection property="queryVariables" column="TASK_ID_" javaType="ArrayList" ofType="org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityImpl">
-      <id property="id" column="VAR_ID_"/>
-      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR" />
-      <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
+      <id property="id" column="VAR_ID_" jdbcType="NVARCHAR"/>
+      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR" />
+      <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
       <result property="revision" column="VAR_REV_" jdbcType="INTEGER" />
-      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR" />
+      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
       <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
       <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE" />
-      <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR" />
-      <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR" />
+      <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR" />
+      <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR" />
       <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT" />
-      <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="VARCHAR"/>
-      <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-      <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="VARCHAR"/>
+      <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="NVARCHAR"/>
+      <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+      <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
     </collection>
     <collection property="queryIdentityLinks" column="TASK_ID_" javaType="ArrayList" ofType="org.flowable.identitylink.service.impl.persistence.entity.HistoricIdentityLinkEntityImpl">
-      <id property="id" column="ILINK_ID_"/>
-      <result property="type" column="ILINK_TYPE_" jdbcType="VARCHAR" />
-      <result property="userId" column="ILINK_USER_ID_" jdbcType="VARCHAR" />
-      <result property="groupId" column="ILINK_GROUP_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="ILINK_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="processInstanceId" column="ILINK_PROC_INST_ID_" jdbcType="VARCHAR" />
+      <id property="id" column="ILINK_ID_" jdbcType="NVARCHAR"/>
+      <result property="type" column="ILINK_TYPE_" jdbcType="NVARCHAR" />
+      <result property="userId" column="ILINK_USER_ID_" jdbcType="NVARCHAR" />
+      <result property="groupId" column="ILINK_GROUP_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="ILINK_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="processInstanceId" column="ILINK_PROC_INST_ID_" jdbcType="NVARCHAR" />
       <result property="createTime" column="ILINK_CREATE_TIME_" jdbcType="TIMESTAMP" />
     </collection>
   </resultMap>
@@ -534,11 +534,11 @@
   <!-- HISTORIC TASK INSTANCE SELECT -->
 
   <select id="selectHistoricTaskInstance" resultMap="historicTaskInstanceResultMap">
-    select * from ${prefix}ACT_HI_TASKINST where ID_ = #{historicTaskInstanceId, jdbcType=VARCHAR}
+    select * from ${prefix}ACT_HI_TASKINST where ID_ = #{historicTaskInstanceId, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectHistoricTasksByParentTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicTaskInstanceResultMap">
-    select * from ${prefix}ACT_HI_TASKINST where PARENT_TASK_ID_ = #{parameter}
+    select * from ${prefix}ACT_HI_TASKINST where PARENT_TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricTaskIdsByParentTaskIds" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
@@ -548,8 +548,8 @@
         or
         </if>
         PARENT_TASK_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="parentTaskId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{parentTaskId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </select>
@@ -557,7 +557,7 @@
   <select id="selectHistoricTaskInstancesByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="historicTaskInstanceResultMap" >
     select *
     from ${prefix}ACT_HI_TASKINST
-    where PROC_INST_ID_ = #{parameter}
+    where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
   
   <select id="selectHistoricTaskInstanceIdsForProcessInstanceIds" parameterType="java.util.Collection" resultType="string">
@@ -567,8 +567,8 @@
         or
         </if>
         PROC_INST_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </select>
@@ -580,11 +580,11 @@
         or
         </if>
         SCOPE_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{scopeId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>)
-    and SCOPE_TYPE_ = #{parameter.scopeType}
+    and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectHistoricTaskInstancesByQueryCriteria" parameterType="org.flowable.task.service.impl.HistoricTaskInstanceQueryImpl" resultMap="historicTaskInstanceResultMap">
@@ -676,48 +676,48 @@
             <where>
               RES.PROC_DEF_ID_ = D.ID_
               <if test="processDefinitionKey != null">
-                and D.KEY_ = #{processDefinitionKey}
+                and D.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
               </if>
               <if test="processDefinitionKeyLike != null">
-                and D.KEY_ like #{processDefinitionKeyLike}${wildcardEscapeClause}
+                and D.KEY_ like #{processDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
               <if test="processDefinitionKeyLikeIgnoreCase != null">
-                and lower(D.KEY_) like #{processDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                and lower(D.KEY_) like #{processDefinitionKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
               <if test="processDefinitionKeys != null &amp;&amp; !processDefinitionKeys.empty">
                 and D.KEY_ in
-                <foreach item="item" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
-                  #{item}
+                <foreach item="processDefinitionKey" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
+                  #{processDefinitionKey, jdbcType=NVARCHAR}
                 </foreach>
               </if>
               <if test="processDefinitionName != null">
-                and D.NAME_ = #{processDefinitionName}
+                and D.NAME_ = #{processDefinitionName, jdbcType=NVARCHAR}
               </if>
               <if test="processDefinitionNameLike != null">
-                and D.NAME_ like #{processDefinitionNameLike}${wildcardEscapeClause}
+                and D.NAME_ like #{processDefinitionNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
               <if test="processCategoryInList != null &amp;&amp; !processCategoryInList.empty">
                 and D.CATEGORY_ IN
                 <foreach item="processCategory" index="index" collection="processCategoryInList"
                          open="(" separator="," close=")">
-                  #{processCategory}
+                  #{processCategory, jdbcType=NVARCHAR}
                 </foreach>
               </if>
               <if test="processCategoryNotInList != null &amp;&amp; !processCategoryNotInList.empty">
                 and D.CATEGORY_ NOT IN
                 <foreach item="processCategory" index="index" collection="processCategoryNotInList"
                          open="(" separator="," close=")">
-                  #{processCategory}
+                  #{processCategory, jdbcType=NVARCHAR}
                 </foreach>
               </if>
               <if test="deploymentId != null">
-                and D.DEPLOYMENT_ID_ = #{deploymentId}
+                and D.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
               </if>
               <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
                 and D.DEPLOYMENT_ID_ IN
-                <foreach item="deployment" index="index" collection="deploymentIds"
+                <foreach item="deploymentId" index="index" collection="deploymentIds"
                          open="(" separator="," close=")">
-                  #{deployment}
+                  #{deploymentId, jdbcType=NVARCHAR}
                 </foreach>
               </if>
             </where>
@@ -730,28 +730,28 @@
             <where>
                 RES.SCOPE_DEFINITION_ID_ = CD.ID_
               <if test="cmmnDeploymentId != null">
-                and CD.DEPLOYMENT_ID_ = #{cmmnDeploymentId}
+                and CD.DEPLOYMENT_ID_ = #{cmmnDeploymentId, jdbcType=NVARCHAR}
               </if>
               <if test="cmmnDeploymentIds != null &amp;&amp; !cmmnDeploymentIds.empty">
                 and CD.DEPLOYMENT_ID_ IN
-                <foreach item="deployment" index="index" collection="cmmnDeploymentIds"
+                <foreach item="deploymentId" index="index" collection="cmmnDeploymentIds"
                          open="(" separator="," close=")">
-                  #{deployment}
+                  #{deploymentId, jdbcType=NVARCHAR}
                 </foreach>
               </if>
               <if test="caseDefinitionKey != null">
-                and CD.KEY_ = #{caseDefinitionKey}
+                and CD.KEY_ = #{caseDefinitionKey, jdbcType=NVARCHAR}
               </if>
               <if test="caseDefinitionKeyLike != null">
-                and CD.KEY_ like #{caseDefinitionKeyLike}${wildcardEscapeClause}
+                and CD.KEY_ like #{caseDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
               <if test="caseDefinitionKeyLikeIgnoreCase != null">
-                and lower(CD.KEY_) like #{caseDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                and lower(CD.KEY_) like #{caseDefinitionKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
               <if test="caseDefinitionKeys != null &amp;&amp; !caseDefinitionKeys.empty">
                 and CD.KEY_ in
-                <foreach item="item" index="index" collection="caseDefinitionKeys" open="(" separator="," close=")">
-                  #{item}
+                <foreach item="caseDefinitionKey" index="index" collection="caseDefinitionKeys" open="(" separator="," close=")">
+                  #{caseDefinitionKey, jdbcType=NVARCHAR}
                 </foreach>
               </if>
             </where>
@@ -770,13 +770,13 @@
                 and HPI.END_TIME_ is null
               </if>
               <if test="processInstanceBusinessKey != null">
-                and HPI.BUSINESS_KEY_ = #{processInstanceBusinessKey}
+                and HPI.BUSINESS_KEY_ = #{processInstanceBusinessKey, jdbcType=NVARCHAR}
               </if>
               <if test="processInstanceBusinessKeyLike != null">
-                and HPI.BUSINESS_KEY_ like #{processInstanceBusinessKeyLike}${wildcardEscapeClause}
+                and HPI.BUSINESS_KEY_ like #{processInstanceBusinessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
               <if test="processInstanceBusinessKeyLikeIgnoreCase != null">
-                and lower(HPI.BUSINESS_KEY_) like #{processInstanceBusinessKeyLikeIgnoreCase}${wildcardEscapeClause}
+                and lower(HPI.BUSINESS_KEY_) like #{processInstanceBusinessKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
               </if>
             </where>
         )
@@ -785,14 +785,14 @@
         <choose>
             <when test="queryVar.operator.equals('EXISTS')">
               and EXISTS (
-                select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name}
+                select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name, jdbcType=NVARCHAR}
                 <if test="!queryVar.local">
                   <choose>
                     <when test="queryVar.scopeType == null or queryVar.scopeType == 'bpmn'">
                       and RES.PROC_INST_ID_ = PROC_INST_ID_
                     </when>
                     <otherwise>
-                      and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType}
+                      and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType, jdbcType=NVARCHAR}
                     </otherwise>
                   </choose>
                   AND TASK_ID_ is null
@@ -804,14 +804,14 @@
             </when>
             <when test="queryVar.operator.equals('NOT_EXISTS')">
               and NOT EXISTS (
-                select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name}
+                select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name, jdbcType=NVARCHAR}
                 <if test="!queryVar.local">
                   <choose>
                     <when test="queryVar.scopeType == null or queryVar.scopeType == 'bpmn'">
                       and RES.PROC_INST_ID_ = PROC_INST_ID_
                     </when>
                     <otherwise>
-                      and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType}
+                      and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType, jdbcType=NVARCHAR}
                     </otherwise>
                   </choose>
                   AND TASK_ID_ is null
@@ -832,7 +832,7 @@
                         and RES.PROC_INST_ID_ = V.PROC_INST_ID_
                       </when>
                       <otherwise>
-                        and RES.SCOPE_ID_ = V.SCOPE_ID_ AND V.SCOPE_TYPE_ = #{queryVar.scopeType}
+                        and RES.SCOPE_ID_ = V.SCOPE_ID_ AND V.SCOPE_TYPE_ = #{queryVar.scopeType, jdbcType=NVARCHAR}
                       </otherwise>
                     </choose>
                     AND V.TASK_ID_ is null
@@ -842,10 +842,10 @@
                   </if>
                   <if test="queryVar.name != null">
                     <!-- Match-all variable-names when name is null -->
-                    and V.NAME_= #{queryVar.name}
+                    and V.NAME_= #{queryVar.name, jdbcType=NVARCHAR}
                   </if>
                   <if test="queryVar.needsTypeCheck()">
-                    and V.VAR_TYPE_ = #{queryVar.type}
+                    and V.VAR_TYPE_ = #{queryVar.type, jdbcType=NVARCHAR}
                   </if>
                   <!-- Variable value -->
                   <if test="queryVar.textValue != null &amp;&amp; queryVar.longValue == null &amp;&amp; queryVar.doubleValue == null">
@@ -861,7 +861,7 @@
                       <when test="queryVar.operator.equals('LIKE') || queryVar.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                       <otherwise><include refid="executionVariableOperator" /></otherwise>
                     </choose>
-                    #{queryVar.textValue}
+                    #{queryVar.textValue, jdbcType=NVARCHAR}
                     <choose>
                       <when test="queryVar.operator.equals('LIKE') || queryVar.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                     </choose>
@@ -876,7 +876,7 @@
                       <when test="queryVar.operator.equals('LIKE')">LIKE</when>
                       <otherwise><include refid="executionVariableOperator" /></otherwise>
                     </choose>
-                    #{queryVar.textValue2}
+                    #{queryVar.textValue2, jdbcType=NVARCHAR}
                     <choose>
                       <when test="queryVar.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                     </choose>
@@ -884,7 +884,7 @@
                   <if test="queryVar.longValue != null">
                     and (V.LONG_
                     <include refid="executionVariableOperator" />
-                    #{queryVar.longValue}
+                    #{queryVar.longValue, jdbcType=BIGINT}
                     <if test="queryVar.operator.equals('NOT_EQUALS') || queryVar.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                       or V.LONG_ is null
                     </if>
@@ -893,7 +893,7 @@
                   <if test="queryVar.doubleValue != null">
                     and (V.DOUBLE_
                     <include refid="executionVariableOperator" />
-                    #{queryVar.doubleValue}
+                    #{queryVar.doubleValue, jdbcType=DOUBLE}
                     <if test="queryVar.operator.equals('NOT_EQUALS') || queryVar.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                       or V.DOUBLE_ is null
                     </if>
@@ -928,48 +928,48 @@
                 where RES.PROC_DEF_ID_ = D.ID_ and
                 <trim prefix="(" prefixOverrides="OR" suffix=")">
                   <if test="orQueryObject.processDefinitionKey != null">
-                    or D.KEY_ = #{orQueryObject.processDefinitionKey}
+                    or D.KEY_ = #{orQueryObject.processDefinitionKey, jdbcType=NVARCHAR}
                   </if>
                   <if test="orQueryObject.processDefinitionKeyLike != null">
-                    or D.KEY_ like #{orQueryObject.processDefinitionKeyLike}${wildcardEscapeClause}
+                    or D.KEY_ like #{orQueryObject.processDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.processDefinitionKeyLikeIgnoreCase != null">
-                    or lower(D.KEY_) like #{orQueryObject.processDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                    or lower(D.KEY_) like #{orQueryObject.processDefinitionKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.processDefinitionKeys != null &amp;&amp; !orQueryObject.processDefinitionKeys.empty">
                     or D.KEY_ in
-                    <foreach item="item" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
-                      #{item}
+                    <foreach item="processDefinitionKey" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
+                      #{processDefinitionKey, jdbcType=NVARCHAR}
                     </foreach>
                   </if>
                   <if test="orQueryObject.processDefinitionName != null">
-                    or D.NAME_ = #{orQueryObject.processDefinitionName}
+                    or D.NAME_ = #{orQueryObject.processDefinitionName, jdbcType=NVARCHAR}
                   </if>
                   <if test="orQueryObject.processDefinitionNameLike != null">
-                    or D.NAME_ like #{orQueryObject.processDefinitionNameLike}${wildcardEscapeClause}
+                    or D.NAME_ like #{orQueryObject.processDefinitionNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.processCategoryInList != null &amp;&amp; !orQueryObject.processCategoryInList.empty">
                     or D.CATEGORY_ IN
                     <foreach item="processCategory" index="index" collection="orQueryObject.processCategoryInList"
                              open="(" separator="," close=")">
-                      #{processCategory}
+                      #{processCategory, jdbcType=NVARCHAR}
                     </foreach>
                   </if>
                   <if test="orQueryObject.processCategoryNotInList != null &amp;&amp; !orQueryObject.processCategoryNotInList.empty">
                     or D.CATEGORY_ NOT IN
                     <foreach item="processCategory" index="index" collection="orQueryObject.processCategoryNotInList"
                              open="(" separator="," close=")">
-                      #{processCategory}
+                      #{processCategory, jdbcType=NVARCHAR}
                     </foreach>
                   </if>
                   <if test="orQueryObject.deploymentId != null">
-                    or D.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId}
+                    or D.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId, jdbcType=NVARCHAR}
                   </if>
                   <if test="orQueryObject.deploymentIds != null &amp;&amp; !orQueryObject.deploymentIds.empty">
                     or D.DEPLOYMENT_ID_ IN
-                    <foreach item="deployment" index="index" collection="orQueryObject.deploymentIds"
+                    <foreach item="deploymentId" index="index" collection="orQueryObject.deploymentIds"
                              open="(" separator="," close=")">
-                      #{deployment}
+                      #{deploymentId, jdbcType=NVARCHAR}
                     </foreach>
                   </if>
                 </trim>
@@ -982,28 +982,28 @@
                 where RES.SCOPE_DEFINITION_ID_ = CD.ID_ and
                 <trim prefix="(" prefixOverrides="OR" suffix=")">
                   <if test="orQueryObject.cmmnDeploymentId != null">
-                    or CD.DEPLOYMENT_ID_ = #{orQueryObject.cmmnDeploymentId}
+                    or CD.DEPLOYMENT_ID_ = #{orQueryObject.cmmnDeploymentId, jdbcType=NVARCHAR}
                   </if>
                   <if test="orQueryObject.cmmnDeploymentIds != null &amp;&amp; !orQueryObject.cmmnDeploymentIds.empty">
                     or CD.DEPLOYMENT_ID_ IN
-                    <foreach item="deployment" index="index" collection="orQueryObject.cmmnDeploymentIds"
+                    <foreach item="deploymentId" index="index" collection="orQueryObject.cmmnDeploymentIds"
                              open="(" separator="," close=")">
-                      #{deployment}
+                      #{deploymentId, jdbcType=NVARCHAR}
                     </foreach>
                   </if>
                   <if test="orQueryObject.caseDefinitionKey != null">
-                    or CD.KEY_ = #{orQueryObject.caseDefinitionKey}
+                    or CD.KEY_ = #{orQueryObject.caseDefinitionKey, jdbcType=NVARCHAR}
                   </if>
                   <if test="orQueryObject.caseDefinitionKeyLike != null">
-                    or CD.KEY_ like #{orQueryObject.caseDefinitionKeyLike}${wildcardEscapeClause}
+                    or CD.KEY_ like #{orQueryObject.caseDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.caseDefinitionKeyLikeIgnoreCase != null">
-                    or lower(CD.KEY_) like #{orQueryObject.caseDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                    or lower(CD.KEY_) like #{orQueryObject.caseDefinitionKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.caseDefinitionKeys != null &amp;&amp; !orQueryObject.caseDefinitionKeys.empty">
                     or CD.KEY_ in
-                    <foreach item="item" index="index" collection="orQueryObject.caseDefinitionKeys" open="(" separator="," close=")">
-                      #{item}
+                    <foreach item="caseDefinitionKey" index="index" collection="orQueryObject.caseDefinitionKeys" open="(" separator="," close=")">
+                      #{caseDefinitionKey, jdbcType=NVARCHAR}
                     </foreach>
                   </if>
                 </trim>
@@ -1016,13 +1016,13 @@
                 where RES.PROC_INST_ID_ = HPI.ID_ and
                 <trim prefix="(" prefixOverrides="OR" suffix=")">
                   <if test="orQueryObject.processInstanceBusinessKey != null">
-                    or HPI.BUSINESS_KEY_ = #{orQueryObject.processInstanceBusinessKey}
+                    or HPI.BUSINESS_KEY_ = #{orQueryObject.processInstanceBusinessKey, jdbcType=NVARCHAR}
                   </if>
                   <if test="orQueryObject.processInstanceBusinessKeyLike != null">
-                    or HPI.BUSINESS_KEY_ like #{orQueryObject.processInstanceBusinessKeyLike}${wildcardEscapeClause}
+                    or HPI.BUSINESS_KEY_ like #{orQueryObject.processInstanceBusinessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.processInstanceBusinessKeyLikeIgnoreCase != null">
-                    or lower(HPI.BUSINESS_KEY_) like #{orQueryObject.processInstanceBusinessKeyLikeIgnoreCase}${wildcardEscapeClause}
+                    or lower(HPI.BUSINESS_KEY_) like #{orQueryObject.processInstanceBusinessKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                   </if>
                   <if test="orQueryObject.processFinished">
                     or HPI.END_TIME_ is not null
@@ -1039,14 +1039,14 @@
               <choose>
                 <when test="queryVar.operator.equals('EXISTS')">
                     and EXISTS (
-                        select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name}
+                        select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name, jdbcType=NVARCHAR}
                     <if test="!queryVar.local">
                       <choose>
                         <when test="queryVar.scopeType == null or queryVar.scopeType == 'bpmn'">
                           and RES.PROC_INST_ID_ = PROC_INST_ID_
                         </when>
                         <otherwise>
-                          and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType}
+                          and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType, jdbcType=NVARCHAR}
                         </otherwise>
                       </choose>
                       AND TASK_ID_ is null
@@ -1058,14 +1058,14 @@
                 </when>
                 <when test="queryVar.operator.equals('NOT_EXISTS')">
                     and NOT EXISTS (
-                        select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name}
+                        select ID_ from ${prefix}ACT_HI_VARINST where NAME_ = #{queryVar.name, jdbcType=NVARCHAR}
                     <if test="!queryVar.local">
                         <choose>
                           <when test="queryVar.scopeType == null or queryVar.scopeType == 'bpmn'">
                             and RES.PROC_INST_ID_ = PROC_INST_ID_
                           </when>
                           <otherwise>
-                            and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType}
+                            and RES.SCOPE_ID_ = SCOPE_ID_ AND SCOPE_TYPE_ = #{queryVar.scopeType, jdbcType=NVARCHAR}
                           </otherwise>
                         </choose>
                         AND TASK_ID_ is null
@@ -1086,7 +1086,7 @@
                               and RES.PROC_INST_ID_ = V.PROC_INST_ID_
                             </when>
                             <otherwise>
-                              and RES.SCOPE_ID_ = V.SCOPE_ID_ AND V.SCOPE_TYPE_ = #{queryVar.scopeType}
+                              and RES.SCOPE_ID_ = V.SCOPE_ID_ AND V.SCOPE_TYPE_ = #{queryVar.scopeType, jdbcType=NVARCHAR}
                             </otherwise>
                           </choose>
                           AND V.TASK_ID_ is null
@@ -1096,10 +1096,10 @@
                       </if>
                       <if test="queryVar.name != null">
                         <!-- Match-all variable-names when name is null -->
-                        and V.NAME_= #{queryVar.name}
+                        and V.NAME_= #{queryVar.name, jdbcType=NVARCHAR}
                       </if>
                       <if test="queryVar.needsTypeCheck()">
-                        and V.VAR_TYPE_ = #{queryVar.type}
+                        and V.VAR_TYPE_ = #{queryVar.type, jdbcType=NVARCHAR}
                       </if>
                       <!-- Variable value -->
                       <if test="queryVar.textValue != null &amp;&amp; queryVar.longValue == null &amp;&amp; queryVar.doubleValue == null">
@@ -1115,7 +1115,7 @@
                           <when test="queryVar.operator.equals('LIKE') || queryVar.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                           <otherwise><include refid="executionVariableOperator" /></otherwise>
                         </choose>
-                        #{queryVar.textValue}
+                        #{queryVar.textValue, jdbcType=NVARCHAR}
                         <choose>
                           <when test="queryVar.operator.equals('LIKE') || queryVar.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                         </choose>
@@ -1130,7 +1130,7 @@
                           <when test="queryVar.operator.equals('LIKE')">LIKE</when>
                           <otherwise><include refid="executionVariableOperator" /></otherwise>
                         </choose>
-                        #{queryVar.textValue2}
+                        #{queryVar.textValue2, jdbcType=NVARCHAR}
                         <choose>
                           <when test="queryVar.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                         </choose>
@@ -1138,7 +1138,7 @@
                       <if test="queryVar.longValue != null">
                         and (V.LONG_
                         <include refid="executionVariableOperator" />
-                        #{queryVar.longValue}
+                        #{queryVar.longValue, jdbcType=BIGINT}
                         <if test="queryVar.operator.equals('NOT_EQUALS') || queryVar.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                           or V.LONG_ is null
                         </if>
@@ -1147,7 +1147,7 @@
                       <if test="queryVar.doubleValue != null">
                         and (V.DOUBLE_
                         <include refid="executionVariableOperator" />
-                        #{queryVar.doubleValue}
+                        #{queryVar.doubleValue, jdbcType=DOUBLE}
                         <if test="queryVar.operator.equals('NOT_EQUALS') || queryVar.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                           or V.DOUBLE_ is null
                         </if>
@@ -1177,141 +1177,141 @@
   
   <sql id="commonTaskInstanceQuerySql">
       <if test="taskId != null">
-        ${queryTablePrefix}ID_ = #{taskId}
+        ${queryTablePrefix}ID_ = #{taskId, jdbcType=NVARCHAR}
       </if>
       <if test="taskIds != null &amp;&amp; !taskIds.empty">
         and ${queryTablePrefix}ID_ IN
         <foreach item="taskId" index="index" collection="taskIds"
                  open="(" separator="," close=")">
-          #{taskId}
+          #{taskId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="taskDefinitionId != null">
-        and ${queryTablePrefix}TASK_DEF_ID_ = #{taskDefinitionId}
+        and ${queryTablePrefix}TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionId != null">
-        and ${queryTablePrefix}PROC_DEF_ID_ = #{processDefinitionId}
+        and ${queryTablePrefix}PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceId != null">
-        and ${queryTablePrefix}PROC_INST_ID_ = #{processInstanceId}
+        and ${queryTablePrefix}PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceIds != null &amp;&amp; !processInstanceIds.empty">
         and ${queryTablePrefix}PROC_INST_ID_ IN
-        <foreach item="processInstance" index="index" collection="processInstanceIds"
+        <foreach item="processInstanceId" index="index" collection="processInstanceIds"
                  open="(" separator="," close=")">
-          #{processInstance}
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="withoutProcessInstanceId">
         and ${queryTablePrefix}PROC_INST_ID_ IS NULL
       </if>
       <if test="taskDefinitionKey != null">
-        and ${queryTablePrefix}TASK_DEF_KEY_ = #{taskDefinitionKey}
+        and ${queryTablePrefix}TASK_DEF_KEY_ = #{taskDefinitionKey, jdbcType=NVARCHAR}
       </if>
       <if test="taskDefinitionKeyLike != null">
-        and ${queryTablePrefix}TASK_DEF_KEY_ like #{taskDefinitionKeyLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}TASK_DEF_KEY_ like #{taskDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskDefinitionKeys != null and !taskDefinitionKeys.empty">
         and ${queryTablePrefix}TASK_DEF_KEY_ in
-        <foreach item="item" index="index" collection="taskDefinitionKeys" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskDefinitionKey" index="index" collection="taskDefinitionKeys" open="(" separator="," close=")">
+          #{taskDefinitionKey, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="executionId != null">
-        and ${queryTablePrefix}EXECUTION_ID_ = #{executionId}
+        and ${queryTablePrefix}EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeId != null">
-        and ${queryTablePrefix}SCOPE_ID_ = #{scopeId}
+        and ${queryTablePrefix}SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
       </if>
       <if test="subScopeId != null">
-        and ${queryTablePrefix}SUB_SCOPE_ID_ = #{subScopeId}
+        and ${queryTablePrefix}SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeType != null">
-        and ${queryTablePrefix}SCOPE_TYPE_ = #{scopeType}
+        and ${queryTablePrefix}SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
       </if>
       <if test="scopeDefinitionId != null">
-        and ${queryTablePrefix}SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+        and ${queryTablePrefix}SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="withoutScopeId">
         and ${queryTablePrefix}SCOPE_ID_ IS NULL
       </if>
       <if test="propagatedStageInstanceId != null">
-        and ${queryTablePrefix}PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId}
+        and ${queryTablePrefix}PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceIdWithChildren != null">
         and exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-            ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
+            ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren, jdbcType=NVARCHAR} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
             ELINK.REF_SCOPE_ID_ = ${queryTablePrefix}ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
       </if>
       <if test="caseInstanceIdWithChildren != null">
         and exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-            ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
+            ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren, jdbcType=NVARCHAR} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
             ELINK.REF_SCOPE_ID_ = ${queryTablePrefix}ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
       </if>
       <if test="taskName != null">
-        and ${queryTablePrefix}NAME_ = #{taskName}
+        and ${queryTablePrefix}NAME_ = #{taskName, jdbcType=NVARCHAR}
       </if>
       <if test="taskNameLike != null">
-        and ${queryTablePrefix}NAME_ like #{taskNameLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}NAME_ like #{taskNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskNameLikeIgnoreCase != null">
-        and lower(${queryTablePrefix}NAME_) like lower(#{taskNameLikeIgnoreCase})${wildcardEscapeClause}
+        and lower(${queryTablePrefix}NAME_) like lower(#{taskNameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
       </if>
       <if test="taskNameList != null &amp;&amp; !taskNameList.empty">
         and ${queryTablePrefix}NAME_ IN
         <foreach item="taskName" index="index" collection="taskNameList"
                  open="(" separator="," close=")">
-          #{taskName}
+          #{taskName, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="taskNameListIgnoreCase != null &amp;&amp; !taskNameListIgnoreCase.empty">
         and lower(${queryTablePrefix}NAME_) IN
         <foreach item="taskName" index="index" collection="taskNameListIgnoreCase"
                  open="(" separator="," close=")">
-          #{taskName}
+          #{taskName, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="taskParentTaskId != null">
-        and ${queryTablePrefix}PARENT_TASK_ID_ = #{taskParentTaskId}
+        and ${queryTablePrefix}PARENT_TASK_ID_ = #{taskParentTaskId, jdbcType=NVARCHAR}
       </if>
       <if test="taskDescription != null">
-        and ${queryTablePrefix}DESCRIPTION_ = #{taskDescription}
+        and ${queryTablePrefix}DESCRIPTION_ = #{taskDescription, jdbcType=NVARCHAR}
       </if>
       <if test="taskDescriptionLike != null">
-        and ${queryTablePrefix}DESCRIPTION_ like #{taskDescriptionLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}DESCRIPTION_ like #{taskDescriptionLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskDescriptionLikeIgnoreCase != null">
-        and lower(${queryTablePrefix}DESCRIPTION_) like #{taskDescriptionLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(${queryTablePrefix}DESCRIPTION_) like #{taskDescriptionLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskDeleteReason != null">
-        and ${queryTablePrefix}DELETE_REASON_ = #{taskDeleteReason}
+        and ${queryTablePrefix}DELETE_REASON_ = #{taskDeleteReason, jdbcType=NVARCHAR}
       </if>
       <if test="taskDeleteReasonLike != null">
-        and ${queryTablePrefix}DELETE_REASON_ like #{taskDeleteReasonLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}DELETE_REASON_ like #{taskDeleteReasonLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskOwner != null">
-        and ${queryTablePrefix}OWNER_ = #{taskOwner}
+        and ${queryTablePrefix}OWNER_ = #{taskOwner, jdbcType=NVARCHAR}
       </if>
       <if test="taskOwnerLike != null">
-        and ${queryTablePrefix}OWNER_ like #{taskOwnerLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}OWNER_ like #{taskOwnerLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskOwnerLikeIgnoreCase != null">
-        and lower(${queryTablePrefix}OWNER_) like #{taskOwnerLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(${queryTablePrefix}OWNER_) like #{taskOwnerLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskAssignee != null">
-        and ${queryTablePrefix}ASSIGNEE_ = #{taskAssignee}
+        and ${queryTablePrefix}ASSIGNEE_ = #{taskAssignee, jdbcType=NVARCHAR}
       </if>
       <if test="taskAssigneeLike != null">
-        and ${queryTablePrefix}ASSIGNEE_ like #{taskAssigneeLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}ASSIGNEE_ like #{taskAssigneeLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskAssigneeLikeIgnoreCase != null">
-        and lower(${queryTablePrefix}ASSIGNEE_) like #{taskAssigneeLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(${queryTablePrefix}ASSIGNEE_) like #{taskAssigneeLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="taskAssigneeIds != null &amp;&amp; !taskAssigneeIds.empty">
         and ${queryTablePrefix}ASSIGNEE_ IN
         <foreach item="assigneeId" index="index" collection="taskAssigneeIds"
                  open="(" separator="," close=")">
-          #{assigneeId}
+          #{assigneeId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="withAssignee">
@@ -1321,13 +1321,13 @@
         and ${queryTablePrefix}ASSIGNEE_ IS NULL
       </if>
       <if test="taskPriority != null">
-        and ${queryTablePrefix}PRIORITY_ = #{taskPriority}
+        and ${queryTablePrefix}PRIORITY_ = #{taskPriority, jdbcType=INTEGER}
       </if>
       <if test="taskMinPriority != null">
-        and ${queryTablePrefix}PRIORITY_ &gt;= #{taskMinPriority}
+        and ${queryTablePrefix}PRIORITY_ &gt;= #{taskMinPriority, jdbcType=INTEGER}
       </if>
       <if test="taskMaxPriority != null">
-        and ${queryTablePrefix}PRIORITY_ &lt;= #{taskMaxPriority}
+        and ${queryTablePrefix}PRIORITY_ &lt;= #{taskMaxPriority, jdbcType=INTEGER}
       </if>
       <if test="unfinished">
         and ${queryTablePrefix}END_TIME_ is null
@@ -1336,101 +1336,101 @@
         and ${queryTablePrefix}END_TIME_ is not null
       </if>
       <if test="state != null">
-        and ${queryTablePrefix}STATE_ = #{state}
+        and ${queryTablePrefix}STATE_ = #{state, jdbcType=NVARCHAR}
       </if>
       <if test="createTime != null">
-        and ${queryTablePrefix}START_TIME_ = #{createTime}
+        and ${queryTablePrefix}START_TIME_ = #{createTime, jdbcType=TIMESTAMP}
       </if>
       <if test="createTimeBefore != null">
-        and ${queryTablePrefix}START_TIME_ &lt; #{createTimeBefore}
+        and ${queryTablePrefix}START_TIME_ &lt; #{createTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="createTimeAfter != null">
-        and ${queryTablePrefix}START_TIME_ &gt; #{createTimeAfter}
+        and ${queryTablePrefix}START_TIME_ &gt; #{createTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartTime != null">
-        and ${queryTablePrefix}IN_PROGRESS_TIME_ = #{inProgressStartTime}
+        and ${queryTablePrefix}IN_PROGRESS_TIME_ = #{inProgressStartTime, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartTimeBefore != null">
-        and ${queryTablePrefix}IN_PROGRESS_TIME_ &lt; #{inProgressStartTimeBefore}
+        and ${queryTablePrefix}IN_PROGRESS_TIME_ &lt; #{inProgressStartTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartTimeAfter != null">
-        and ${queryTablePrefix}IN_PROGRESS_TIME_ &gt; #{inProgressStartTimeAfter}
+        and ${queryTablePrefix}IN_PROGRESS_TIME_ &gt; #{inProgressStartTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartedBy != null">
-        and ${queryTablePrefix}IN_PROGRESS_STARTED_BY_ = #{inProgressStartedBy}
+        and ${queryTablePrefix}IN_PROGRESS_STARTED_BY_ = #{inProgressStartedBy, jdbcType=NVARCHAR}
       </if>
       <if test="claimTime != null">
-        and ${queryTablePrefix}CLAIM_TIME_ = #{claimTime}
+        and ${queryTablePrefix}CLAIM_TIME_ = #{claimTime, jdbcType=TIMESTAMP}
       </if>
       <if test="claimTimeBefore != null">
-        and ${queryTablePrefix}CLAIM_TIME_ &lt; #{claimTimeBefore}
+        and ${queryTablePrefix}CLAIM_TIME_ &lt; #{claimTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="claimTimeAfter != null">
-        and ${queryTablePrefix}CLAIM_TIME_ &gt; #{claimTimeAfter}
+        and ${queryTablePrefix}CLAIM_TIME_ &gt; #{claimTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="claimedBy != null">
-        and ${queryTablePrefix}CLAIMED_BY_ = #{claimedBy}
+        and ${queryTablePrefix}CLAIMED_BY_ = #{claimedBy, jdbcType=NVARCHAR}
       </if>
       <if test="suspendedTime != null">
-        and ${queryTablePrefix}SUSPENDED_TIME_ = #{suspendedTime}
+        and ${queryTablePrefix}SUSPENDED_TIME_ = #{suspendedTime, jdbcType=TIMESTAMP}
       </if>
       <if test="suspendedTimeBefore != null">
-        and ${queryTablePrefix}SUSPENDED_TIME_ &lt; #{suspendedTimeBefore}
+        and ${queryTablePrefix}SUSPENDED_TIME_ &lt; #{suspendedTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="suspendedTimeAfter != null">
-        and ${queryTablePrefix}SUSPENDED_TIME_ &gt; #{suspendedTimeAfter}
+        and ${queryTablePrefix}SUSPENDED_TIME_ &gt; #{suspendedTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="suspendedBy != null">
-        and ${queryTablePrefix}SUSPENDED_BY_ = #{suspendedBy}
+        and ${queryTablePrefix}SUSPENDED_BY_ = #{suspendedBy, jdbcType=NVARCHAR}
       </if>
       <if test="completedTime != null">
-        and ${queryTablePrefix}END_TIME_ = #{completedTime}
+        and ${queryTablePrefix}END_TIME_ = #{completedTime, jdbcType=TIMESTAMP}
       </if>
       <if test="completedTimeBefore != null">
-        and ${queryTablePrefix}END_TIME_ &lt; #{completedTimeBefore}
+        and ${queryTablePrefix}END_TIME_ &lt; #{completedTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="completedTimeAfter != null">
-        and ${queryTablePrefix}END_TIME_ &gt; #{completedTimeAfter}
+        and ${queryTablePrefix}END_TIME_ &gt; #{completedTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="completedBy != null">
-        and ${queryTablePrefix}COMPLETED_BY_ = #{completedBy}
+        and ${queryTablePrefix}COMPLETED_BY_ = #{completedBy, jdbcType=NVARCHAR}
       </if>
       <if test="inProgressStartDueDate != null">
-        and ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ = #{inProgressStartDueDate}
+        and ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ = #{inProgressStartDueDate, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartDueBefore != null">
-        and ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &lt; #{inProgressStartDueBefore}
+        and ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &lt; #{inProgressStartDueBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartDueAfter != null">
-        and ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &gt; #{inProgressStartDueAfter}
+        and ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &gt; #{inProgressStartDueAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="dueDate != null">
-        and ${queryTablePrefix}DUE_DATE_ = #{dueDate}
+        and ${queryTablePrefix}DUE_DATE_ = #{dueDate, jdbcType=TIMESTAMP}
       </if>
       <if test="dueBefore != null">
-        and ${queryTablePrefix}DUE_DATE_ &lt; #{dueBefore}
+        and ${queryTablePrefix}DUE_DATE_ &lt; #{dueBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="dueAfter != null">
-        and ${queryTablePrefix}DUE_DATE_ &gt; #{dueAfter}
+        and ${queryTablePrefix}DUE_DATE_ &gt; #{dueAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="withoutDueDate">
         and ${queryTablePrefix}DUE_DATE_ is null
       </if>
       <if test="category != null">
-        and ${queryTablePrefix}CATEGORY_ = #{category}
+        and ${queryTablePrefix}CATEGORY_ = #{category, jdbcType=NVARCHAR}
       </if>
       <if test="categoryInList != null &amp;&amp; !categoryInList.empty">
           and ${queryTablePrefix}CATEGORY_ IN
           <foreach item="taskCategory" index="index" collection="categoryInList"
                    open="(" separator="," close=")">
-              #{taskCategory}
+              #{taskCategory, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="categoryNotInList != null &amp;&amp; !categoryNotInList.empty">
           and ${queryTablePrefix}CATEGORY_ NOT IN
           <foreach item="taskCategory" index="index" collection="categoryNotInList"
                    open="(" separator="," close=")">
-              #{taskCategory}
+              #{taskCategory, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="withoutCategory">
@@ -1440,13 +1440,13 @@
         and ${queryTablePrefix}FORM_KEY_ IS NOT NULL
       </if>
       <if test="formKey != null">
-        and ${queryTablePrefix}FORM_KEY_ = #{formKey}
+        and ${queryTablePrefix}FORM_KEY_ = #{formKey, jdbcType=NVARCHAR}
       </if>
       <if test="tenantId != null">
-        and ${queryTablePrefix}TENANT_ID_ = #{tenantId}
+        and ${queryTablePrefix}TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and ${queryTablePrefix}TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and ${queryTablePrefix}TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (${queryTablePrefix}TENANT_ID_ = '' or ${queryTablePrefix}TENANT_ID_ is null)
@@ -1456,7 +1456,7 @@
       </if>
       <if test="parentScopeId != null">
           and EXISTS(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
-            LINK.SCOPE_ID_ = #{parentScopeId}
+            LINK.SCOPE_ID_ = #{parentScopeId, jdbcType=NVARCHAR}
             and LINK.REF_SCOPE_ID_ = RES.ID_
             and LINK.HIERARCHY_TYPE_ = 'parent'
           )
@@ -1465,7 +1465,7 @@
           and exists(
             select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
                 LINK.REF_SCOPE_ID_ = RES.ID_
-                and LINK.ROOT_SCOPE_ID_ = #{rootScopeId}
+                and LINK.ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR}
           )
       </if>
       <if test="candidateUser != null || candidateGroups != null">
@@ -1476,7 +1476,7 @@
             and
             (
               <if test="candidateUser != null">
-                LINK.USER_ID_ = #{candidateUser}
+                LINK.USER_ID_ = #{candidateUser, jdbcType=NVARCHAR}
               </if>
               <if test="candidateUser != null &amp;&amp; candidateGroups != null &amp;&amp; !candidateGroups.empty">
                 or
@@ -1490,7 +1490,7 @@
                 	LINK.GROUP_ID_ IN
                 	<foreach item="group" index="index" collection="candidateGroupListItem"
                          open="(" separator="," close=")">
-                  	  #{group}
+                  	  #{group, jdbcType=NVARCHAR}
                 	</foreach>
                 </foreach>
                 )
@@ -1500,9 +1500,9 @@
       </if>
       <if test="involvedUser != null">
         and (
-          EXISTS(select LINK.ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where LINK.USER_ID_ = #{involvedUser} and LINK.TASK_ID_ = ${queryTablePrefix}ID_)
-          or ${queryTablePrefix}ASSIGNEE_ = #{involvedUser}
-          or ${queryTablePrefix}OWNER_ = #{involvedUser}
+          EXISTS(select LINK.ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where LINK.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR} and LINK.TASK_ID_ = ${queryTablePrefix}ID_)
+          or ${queryTablePrefix}ASSIGNEE_ = #{involvedUser, jdbcType=NVARCHAR}
+          or ${queryTablePrefix}OWNER_ = #{involvedUser, jdbcType=NVARCHAR}
           )
       </if>
       <if test="involvedGroups != null">
@@ -1515,7 +1515,7 @@
                 LINK.GROUP_ID_ IN
                 <foreach item="group" index="index" collection="involvedGroupListItem"
                       open="(" separator="," close=")">
-                  #{group}
+                  #{group, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
             )
@@ -1525,135 +1525,135 @@
   
   <sql id="commonTaskInstanceOrQuerySql">
       <if test="orQueryObject.taskId != null">
-        ${queryTablePrefix}ID_ = #{orQueryObject.taskId}
+        ${queryTablePrefix}ID_ = #{orQueryObject.taskId, jdbcType=NVARCHAR}
       </if>
        <if test="orQueryObject.taskIds != null &amp;&amp; !orQueryObject.taskIds.empty">
          or ${queryTablePrefix}ID_ IN
          <foreach item="taskId" index="index" collection="orQueryObject.taskIds"
                   open="(" separator="," close=")">
-           #{taskId}
+           #{taskId, jdbcType=NVARCHAR}
          </foreach>
        </if>
       <if test="orQueryObject.taskDefinitionId != null">
-        or ${queryTablePrefix}TASK_DEF_ID_ = #{orQueryObject.taskDefinitionId}
+        or ${queryTablePrefix}TASK_DEF_ID_ = #{orQueryObject.taskDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.processDefinitionId != null">
-        or ${queryTablePrefix}PROC_DEF_ID_ = #{orQueryObject.processDefinitionId}
+        or ${queryTablePrefix}PROC_DEF_ID_ = #{orQueryObject.processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.processInstanceId != null">
-        or ${queryTablePrefix}PROC_INST_ID_ = #{orQueryObject.processInstanceId}
+        or ${queryTablePrefix}PROC_INST_ID_ = #{orQueryObject.processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.processInstanceIds != null &amp;&amp; !orQueryObject.processInstanceIds.empty">
         or ${queryTablePrefix}PROC_INST_ID_ IN
-        <foreach item="processInstance" index="index" collection="orQueryObject.processInstanceIds"
+        <foreach item="processInstanceId" index="index" collection="orQueryObject.processInstanceIds"
                  open="(" separator="," close=")">
-          #{processInstance}
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="orQueryObject.withoutProcessInstanceId">
         or ${queryTablePrefix}PROC_INST_ID_ IS NULL
       </if>
       <if test="orQueryObject.taskDefinitionKey != null">
-        or ${queryTablePrefix}TASK_DEF_KEY_ = #{orQueryObject.taskDefinitionKey}
+        or ${queryTablePrefix}TASK_DEF_KEY_ = #{orQueryObject.taskDefinitionKey, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskDefinitionKeyLike != null">
-        or ${queryTablePrefix}TASK_DEF_KEY_ like #{orQueryObject.taskDefinitionKeyLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}TASK_DEF_KEY_ like #{orQueryObject.taskDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.taskDefinitionKeys != null and !orQueryObject.taskDefinitionKeys.empty">
         or ${queryTablePrefix}TASK_DEF_KEY_ in
-        <foreach item="item" index="index" collection="orQueryObject.taskDefinitionKeys" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskDefinitionKey" index="index" collection="orQueryObject.taskDefinitionKeys" open="(" separator="," close=")">
+          #{taskDefinitionKey, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="orQueryObject.executionId != null">
-        or ${queryTablePrefix}EXECUTION_ID_ = #{orQueryObject.executionId}
+        or ${queryTablePrefix}EXECUTION_ID_ = #{orQueryObject.executionId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.scopeId != null">
-        or ${queryTablePrefix}SCOPE_ID_ = #{orQueryObject.scopeId}
+        or ${queryTablePrefix}SCOPE_ID_ = #{orQueryObject.scopeId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.subScopeId != null">
-        or ${queryTablePrefix}SUB_SCOPE_ID_ = #{orQueryObject.subScopeId}
+        or ${queryTablePrefix}SUB_SCOPE_ID_ = #{orQueryObject.subScopeId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.scopeType != null">
-        or ${queryTablePrefix}SCOPE_TYPE_ = #{orQueryObject.scopeType}
+        or ${queryTablePrefix}SCOPE_TYPE_ = #{orQueryObject.scopeType, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.scopeDefinitionId != null">
-        or ${queryTablePrefix}SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId}
+        or ${queryTablePrefix}SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.withoutScopeId">
         or ${queryTablePrefix}SCOPE_ID_ IS NULL
       </if>
       <if test="orQueryObject.propagatedStageInstanceId != null">
-        or ${queryTablePrefix}PROPAGATED_STAGE_INST_ID_ = #{orQueryObject.propagatedStageInstanceId}
+        or ${queryTablePrefix}PROPAGATED_STAGE_INST_ID_ = #{orQueryObject.propagatedStageInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.processInstanceIdWithChildren != null">
         or exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-            ELINK.SCOPE_ID_ = #{orQueryObject.processInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
+            ELINK.SCOPE_ID_ = #{orQueryObject.processInstanceIdWithChildren, jdbcType=NVARCHAR} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
             ELINK.REF_SCOPE_ID_ = ${queryTablePrefix}ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
       </if>
       <if test="orQueryObject.caseInstanceIdWithChildren != null">
         or exists(select ELINK.ID_ from ${prefix}ACT_HI_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-            ELINK.SCOPE_ID_ = #{orQueryObject.caseInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
+            ELINK.SCOPE_ID_ = #{orQueryObject.caseInstanceIdWithChildren, jdbcType=NVARCHAR} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
             ELINK.REF_SCOPE_ID_ = ${queryTablePrefix}ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
       </if>
       <if test="orQueryObject.taskName != null">
-        or ${queryTablePrefix}NAME_ = #{orQueryObject.taskName}
+        or ${queryTablePrefix}NAME_ = #{orQueryObject.taskName, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskNameLike != null">
-        or ${queryTablePrefix}NAME_ like #{orQueryObject.taskNameLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}NAME_ like #{orQueryObject.taskNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
        <if test="orQueryObject.taskNameLikeIgnoreCase != null">
-        or lower(${queryTablePrefix}NAME_) like #{orQueryObject.taskNameLikeIgnoreCase}${wildcardEscapeClause}
+        or lower(${queryTablePrefix}NAME_) like #{orQueryObject.taskNameLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.taskNameList != null &amp;&amp; !orQueryObject.taskNameList.empty">
         or ${queryTablePrefix}NAME_ IN
         <foreach item="taskName" index="index" collection="orQueryObject.taskNameList"
                  open="(" separator="," close=")">
-          #{taskName}
+          #{taskName, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="orQueryObject.taskNameListIgnoreCase != null &amp;&amp; !orQueryObject.taskNameListIgnoreCase.empty">
         or lower(${queryTablePrefix}NAME_) IN
         <foreach item="taskName" index="index" collection="orQueryObject.taskNameListIgnoreCase"
                  open="(" separator="," close=")">
-          #{taskName}
+          #{taskName, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="orQueryObject.taskParentTaskId != null">
-        or ${queryTablePrefix}PARENT_TASK_ID_ = #{orQueryObject.taskParentTaskId}
+        or ${queryTablePrefix}PARENT_TASK_ID_ = #{orQueryObject.taskParentTaskId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskDescription != null">
-        or ${queryTablePrefix}DESCRIPTION_ = #{orQueryObject.taskDescription}
+        or ${queryTablePrefix}DESCRIPTION_ = #{orQueryObject.taskDescription, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskDescriptionLike != null">
-        or ${queryTablePrefix}DESCRIPTION_ like #{orQueryObject.taskDescriptionLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}DESCRIPTION_ like #{orQueryObject.taskDescriptionLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
        <if test="orQueryObject.taskDescriptionLikeIgnoreCase != null">
-        or lower(${queryTablePrefix}DESCRIPTION_) like #{orQueryObject.taskDescriptionLikeIgnoreCase}${wildcardEscapeClause}
+        or lower(${queryTablePrefix}DESCRIPTION_) like #{orQueryObject.taskDescriptionLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.taskDeleteReason != null">
-        or ${queryTablePrefix}DELETE_REASON_ = #{orQueryObject.taskDeleteReason}
+        or ${queryTablePrefix}DELETE_REASON_ = #{orQueryObject.taskDeleteReason, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskDeleteReasonLike != null">
-        or ${queryTablePrefix}DELETE_REASON_ like #{orQueryObject.taskDeleteReasonLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}DELETE_REASON_ like #{orQueryObject.taskDeleteReasonLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.taskOwner != null">
-        or ${queryTablePrefix}OWNER_ = #{orQueryObject.taskOwner}
+        or ${queryTablePrefix}OWNER_ = #{orQueryObject.taskOwner, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskOwnerLike != null">
-        or ${queryTablePrefix}OWNER_ like #{orQueryObject.taskOwnerLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}OWNER_ like #{orQueryObject.taskOwnerLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.taskOwnerLikeIgnoreCase != null">
-        or lower(${queryTablePrefix}OWNER_) like #{orQueryObject.taskOwnerLikeIgnoreCase}${wildcardEscapeClause}
+        or lower(${queryTablePrefix}OWNER_) like #{orQueryObject.taskOwnerLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.taskAssignee != null">
-        or ${queryTablePrefix}ASSIGNEE_ = #{orQueryObject.taskAssignee}
+        or ${queryTablePrefix}ASSIGNEE_ = #{orQueryObject.taskAssignee, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.taskAssigneeLike != null">
-        or ${queryTablePrefix}ASSIGNEE_ like #{orQueryObject.taskAssigneeLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}ASSIGNEE_ like #{orQueryObject.taskAssigneeLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
        <if test="orQueryObject.taskAssigneeLikeIgnoreCase != null">
-        or ${queryTablePrefix}ASSIGNEE_ like #{orQueryObject.taskAssigneeLikeIgnoreCase}${wildcardEscapeClause}
+        or ${queryTablePrefix}ASSIGNEE_ like #{orQueryObject.taskAssigneeLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.withAssignee">
         or ${queryTablePrefix}ASSIGNEE_ IS NOT NULL
@@ -1665,17 +1665,17 @@
         or ${queryTablePrefix}ASSIGNEE_ IN
         <foreach item="assigneeId" index="index" collection="orQueryObject.taskAssigneeIds"
                  open="(" separator="," close=")">
-          #{assigneeId}
+          #{assigneeId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="orQueryObject.taskPriority != null">
-        or ${queryTablePrefix}PRIORITY_ = #{orQueryObject.taskPriority}
+        or ${queryTablePrefix}PRIORITY_ = #{orQueryObject.taskPriority, jdbcType=INTEGER}
       </if>
       <if test="orQueryObject.taskMinPriority != null">
-        or ${queryTablePrefix}PRIORITY_ &gt;= #{orQueryObject.taskMinPriority}
+        or ${queryTablePrefix}PRIORITY_ &gt;= #{orQueryObject.taskMinPriority, jdbcType=INTEGER}
       </if>
       <if test="orQueryObject.taskMaxPriority != null">
-        or ${queryTablePrefix}PRIORITY_ &lt;= #{orQueryObject.taskMaxPriority}
+        or ${queryTablePrefix}PRIORITY_ &lt;= #{orQueryObject.taskMaxPriority, jdbcType=INTEGER}
       </if>
       <if test="orQueryObject.unfinished">
         or ${queryTablePrefix}END_TIME_ is null
@@ -1684,104 +1684,104 @@
         or ${queryTablePrefix}END_TIME_ is not null
       </if>
       <if test="orQueryObject.state != null">
-        or ${queryTablePrefix}STATE_ = #{orQueryObject.state}
+        or ${queryTablePrefix}STATE_ = #{orQueryObject.state, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.createTime != null">
-        or ${queryTablePrefix}START_TIME_ = #{orQueryObject.createTime}
+        or ${queryTablePrefix}START_TIME_ = #{orQueryObject.createTime, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.createTimeBefore != null">
-        or ${queryTablePrefix}START_TIME_ &lt; #{orQueryObject.createTimeBefore}
+        or ${queryTablePrefix}START_TIME_ &lt; #{orQueryObject.createTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.createTimeAfter != null">
-        or ${queryTablePrefix}START_TIME_ &gt; #{orQueryObject.createTimeAfter}
+        or ${queryTablePrefix}START_TIME_ &gt; #{orQueryObject.createTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.inProgressStartTime != null">
-        or ${queryTablePrefix}IN_PROGRESS_TIME_ = #{orQueryObject.inProgressStartTime}
+        or ${queryTablePrefix}IN_PROGRESS_TIME_ = #{orQueryObject.inProgressStartTime, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.inProgressStartTimeBefore != null">
-        or ${queryTablePrefix}IN_PROGRESS_TIME_ &lt; #{orQueryObject.inProgressStartTimeBefore}
+        or ${queryTablePrefix}IN_PROGRESS_TIME_ &lt; #{orQueryObject.inProgressStartTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.inProgressStartTimeAfter != null">
-        or ${queryTablePrefix}IN_PROGRESS_TIME_ &gt; #{orQueryObject.inProgressStartTimeAfter}
+        or ${queryTablePrefix}IN_PROGRESS_TIME_ &gt; #{orQueryObject.inProgressStartTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.inProgressStartedBy != null">
-        or ${queryTablePrefix}IN_PROGRESS_STARTED_BY_ = #{orQueryObject.inProgressStartedBy}
+        or ${queryTablePrefix}IN_PROGRESS_STARTED_BY_ = #{orQueryObject.inProgressStartedBy, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.claimTime != null">
-        or ${queryTablePrefix}CLAIM_TIME_ = #{orQueryObject.claimTime}
+        or ${queryTablePrefix}CLAIM_TIME_ = #{orQueryObject.claimTime, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.claimTimeBefore != null">
-        or ${queryTablePrefix}CLAIM_TIME_ &lt; #{orQueryObject.claimTimeBefore}
+        or ${queryTablePrefix}CLAIM_TIME_ &lt; #{orQueryObject.claimTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.claimTimeAfter != null">
-        or ${queryTablePrefix}CLAIM_TIME_ &gt; #{orQueryObject.claimTimeAfter}
+        or ${queryTablePrefix}CLAIM_TIME_ &gt; #{orQueryObject.claimTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.claimedBy != null">
-        or ${queryTablePrefix}CLAIMED_BY_ = #{orQueryObject.claimedBy}
+        or ${queryTablePrefix}CLAIMED_BY_ = #{orQueryObject.claimedBy, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.suspendedTime != null">
-        or ${queryTablePrefix}SUSPENDED_TIME_ = #{orQueryObject.suspendedTime}
+        or ${queryTablePrefix}SUSPENDED_TIME_ = #{orQueryObject.suspendedTime, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.suspendedTimeBefore != null">
-        or ${queryTablePrefix}SUSPENDED_TIME_ &lt; #{orQueryObject.suspendedTimeBefore}
+        or ${queryTablePrefix}SUSPENDED_TIME_ &lt; #{orQueryObject.suspendedTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.suspendedTimeAfter != null">
-        or ${queryTablePrefix}SUSPENDED_TIME_ &gt; #{orQueryObject.suspendedTimeAfter}
+        or ${queryTablePrefix}SUSPENDED_TIME_ &gt; #{orQueryObject.suspendedTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.suspendedBy != null">
-        or ${queryTablePrefix}SUSPENDED_BY_ = #{orQueryObject.suspendedBy}
+        or ${queryTablePrefix}SUSPENDED_BY_ = #{orQueryObject.suspendedBy, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.completedTime != null">
-        or ${queryTablePrefix}END_TIME_ = #{orQueryObject.completedTime}
+        or ${queryTablePrefix}END_TIME_ = #{orQueryObject.completedTime, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.completedTimeBefore != null">
-        or ${queryTablePrefix}END_TIME_ &lt; #{orQueryObject.completedTimeBefore}
+        or ${queryTablePrefix}END_TIME_ &lt; #{orQueryObject.completedTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.completedTimeAfter != null">
-        or ${queryTablePrefix}END_TIME_ &gt; #{orQueryObject.completedTimeAfter}
+        or ${queryTablePrefix}END_TIME_ &gt; #{orQueryObject.completedTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.completedBy != null">
-        or ${queryTablePrefix}COMPLETED_BY_ = #{orQueryObject.completedBy}
+        or ${queryTablePrefix}COMPLETED_BY_ = #{orQueryObject.completedBy, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.inProgressStartDueDate != null">
-        or ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ = #{orQueryObject.inProgressStartDueDate}
+        or ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ = #{orQueryObject.inProgressStartDueDate, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.inProgressStartDueBefore != null">
-        or ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &lt; #{orQueryObject.inProgressStartDueBefore}
+        or ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &lt; #{orQueryObject.inProgressStartDueBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.inProgressStartDueAfter != null">
-        or ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &gt; #{orQueryObject.inProgressStartDueAfter}
+        or ${queryTablePrefix}IN_PROGRESS_DUE_DATE_ &gt; #{orQueryObject.inProgressStartDueAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.withoutDueDate">
         or ${queryTablePrefix}DUE_DATE_ is null
       </if>
       <if test="orQueryObject.dueDate != null">
-        or ${queryTablePrefix}DUE_DATE_ = #{orQueryObject.dueDate}
+        or ${queryTablePrefix}DUE_DATE_ = #{orQueryObject.dueDate, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.dueBefore != null">
-        or ${queryTablePrefix}DUE_DATE_ &lt; #{orQueryObject.dueBefore}
+        or ${queryTablePrefix}DUE_DATE_ &lt; #{orQueryObject.dueBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.dueAfter != null">
-        or ${queryTablePrefix}DUE_DATE_ &gt; #{orQueryObject.dueAfter}
+        or ${queryTablePrefix}DUE_DATE_ &gt; #{orQueryObject.dueAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="orQueryObject.withoutDueDate">
         or ${queryTablePrefix}DUE_DATE_ is null
       </if>
       <if test="orQueryObject.category != null">
-        or ${queryTablePrefix}CATEGORY_ = #{orQueryObject.category}
+        or ${queryTablePrefix}CATEGORY_ = #{orQueryObject.category, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.categoryInList != null &amp;&amp; !orQueryObject.categoryInList.empty">
           or ${queryTablePrefix}CATEGORY_ IN
           <foreach item="taskCategory" index="index" collection="orQueryObject.categoryInList"
                    open="(" separator="," close=")">
-              #{taskCategory}
+              #{taskCategory, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="orQueryObject.categoryNotInList != null &amp;&amp; !orQueryObject.categoryNotInList.empty">
           or ${queryTablePrefix}CATEGORY_ NOT IN
           <foreach item="taskCategory" index="index" collection="orQueryObject.categoryNotInList"
                    open="(" separator="," close=")">
-              #{taskCategory}
+              #{taskCategory, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="orQueryObject.withoutCategory">
@@ -1791,13 +1791,13 @@
         or ${queryTablePrefix}FORM_KEY_ IS NOT NULL
       </if>
       <if test="orQueryObject.formKey != null">
-        or ${queryTablePrefix}FORM_KEY_ = #{orQueryObject.formKey}
+        or ${queryTablePrefix}FORM_KEY_ = #{orQueryObject.formKey, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.tenantId != null">
-        or ${queryTablePrefix}TENANT_ID_ = #{orQueryObject.tenantId}
+        or ${queryTablePrefix}TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="orQueryObject.tenantIdLike != null">
-        or ${queryTablePrefix}TENANT_ID_ like #{orQueryObject.tenantIdLike}${wildcardEscapeClause}
+        or ${queryTablePrefix}TENANT_ID_ like #{orQueryObject.tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="orQueryObject.withoutTenantId">
         or (${queryTablePrefix}TENANT_ID_ = '' or ${queryTablePrefix}TENANT_ID_ is null)
@@ -1810,7 +1810,7 @@
             and
             (
               <if test="orQueryObject.candidateUser != null">
-                LINK.USER_ID_ = #{orQueryObject.candidateUser}
+                LINK.USER_ID_ = #{orQueryObject.candidateUser, jdbcType=NVARCHAR}
               </if>
               <if test="orQueryObject.candidateUser != null &amp;&amp; orQueryObject.candidateGroups != null &amp;&amp; !orQueryObject.candidateGroups.empty">
                 or
@@ -1824,7 +1824,7 @@
                     LINK.GROUP_ID_ IN
                     <foreach item="group" index="index" collection="candidateGroupListItem"
                          open="(" separator="," close=")">
-                      #{group}
+                      #{group, jdbcType=NVARCHAR}
                     </foreach>
                 </foreach>
                 )
@@ -1838,9 +1838,9 @@
       </if>
       <if test="orQueryObject.involvedUser != null">
         or (
-          EXISTS(select LINK.ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where LINK.USER_ID_ = #{orQueryObject.involvedUser} and LINK.TASK_ID_ = ${queryTablePrefix}ID_)
-          or ${queryTablePrefix}ASSIGNEE_ = #{orQueryObject.involvedUser}
-          or ${queryTablePrefix}OWNER_ = #{orQueryObject.involvedUser}
+          EXISTS(select LINK.ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where LINK.USER_ID_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR} and LINK.TASK_ID_ = ${queryTablePrefix}ID_)
+          or ${queryTablePrefix}ASSIGNEE_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR}
+          or ${queryTablePrefix}OWNER_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR}
           )
       </if>
       <if test="orQueryObject.involvedGroups != null">
@@ -1854,7 +1854,7 @@
                 LINK.GROUP_ID_ IN
                 <foreach item="group" index="index" collection="involvedGroupListItem"
                       open="(" separator="," close=")">
-                  #{group}
+                  #{group, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
             )
@@ -1862,7 +1862,7 @@
       </if>
       <if test="orQueryObject.parentScopeId != null">
           or EXISTS(select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
-          LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId}
+          LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId, jdbcType=NVARCHAR}
           and LINK.REF_SCOPE_ID_ = RES.ID_
           and LINK.HIERARCHY_TYPE_ = 'parent'
           )
@@ -1871,7 +1871,7 @@
           or exists(
           select 1 from ${prefix}ACT_HI_ENTITYLINK LINK where
           LINK.REF_SCOPE_ID_ = RES.ID_
-          and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId}
+          and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId, jdbcType=NVARCHAR}
           )
       </if>
   </sql>
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskLogEntry.xml b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskLogEntry.xml
index b9e2562cf7c..579d716e418 100644
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskLogEntry.xml
+++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/HistoricTaskLogEntry.xml
@@ -11,19 +11,19 @@
                                         SCOPE_ID_, SCOPE_DEFINITION_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_,
                                         TENANT_ID_, TIME_STAMP_, USER_ID_, DATA_)
     values (
-      #{type, jdbcType=VARCHAR}, 
-      #{taskId, jdbcType=VARCHAR},
-      #{executionId, jdbcType=VARCHAR},
-      #{processInstanceId, jdbcType=VARCHAR},
-      #{processDefinitionId, jdbcType=VARCHAR},
-      #{scopeId, jdbcType=VARCHAR},
-      #{scopeDefinitionId, jdbcType=VARCHAR},
-      #{subScopeId, jdbcType=VARCHAR},
-      #{scopeType, jdbcType=VARCHAR},
-      #{tenantId, jdbcType=VARCHAR},
+      #{type, jdbcType=NVARCHAR}, 
+      #{taskId, jdbcType=NVARCHAR},
+      #{executionId, jdbcType=NVARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{processDefinitionId, jdbcType=NVARCHAR},
+      #{scopeId, jdbcType=NVARCHAR},
+      #{scopeDefinitionId, jdbcType=NVARCHAR},
+      #{subScopeId, jdbcType=NVARCHAR},
+      #{scopeType, jdbcType=NVARCHAR},
+      #{tenantId, jdbcType=NVARCHAR},
       #{timeStamp, jdbcType=TIMESTAMP}, 
-      #{userId, jdbcType=VARCHAR},
-      #{data, jdbcType=VARCHAR}
+      #{userId, jdbcType=NVARCHAR},
+      #{data, jdbcType=NVARCHAR}
     )
   </insert>
   
@@ -32,20 +32,20 @@
                                         SCOPE_ID_, SCOPE_DEFINITION_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, TENANT_ID_,
                                         TIME_STAMP_, USER_ID_, DATA_)
     values 
-      <foreach collection="list" item="taskLog" index="index" separator=",">
-        (#{taskLog.type, jdbcType=VARCHAR},
-        #{taskLog.taskId, jdbcType=VARCHAR},
-        #{taskLog.executionId, jdbcType=VARCHAR},
-        #{taskLog.processInstanceId, jdbcType=VARCHAR},
-        #{taskLog.processDefinitionId, jdbcType=VARCHAR},
-        #{taskLog.scopeId, jdbcType=VARCHAR},
-        #{taskLog.scopeDefinitionId, jdbcType=VARCHAR},
-        #{taskLog.subScopeId, jdbcType=VARCHAR},
-        #{taskLog.scopeType, jdbcType=VARCHAR},
-        #{taskLog.tenantId, jdbcType=VARCHAR},
-        #{taskLog.timeStamp, jdbcType=TIMESTAMP},
-        #{taskLog.userId, jdbcType=VARCHAR},
-        #{taskLog.data, jdbcType=VARCHAR})
+      <foreach collection="list" item="historicTaskLogEntry" index="index" separator=",">
+        (#{historicTaskLogEntry.type, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.taskId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.executionId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.processInstanceId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.processDefinitionId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.scopeId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.scopeDefinitionId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.subScopeId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.scopeType, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.tenantId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.timeStamp, jdbcType=TIMESTAMP},
+        #{historicTaskLogEntry.userId, jdbcType=NVARCHAR},
+        #{historicTaskLogEntry.data, jdbcType=NVARCHAR})
       </foreach>
   </insert>
 
@@ -55,42 +55,42 @@
                                         TENANT_ID_, TIME_STAMP_, USER_ID_, DATA_)
     values (
       ${prefix}ACT_HI_TASK_EVT_LOG_SEQ.nextVal,
-      #{type, jdbcType=VARCHAR}, 
-      #{taskId, jdbcType=VARCHAR},
-      #{executionId, jdbcType=VARCHAR},
-      #{processInstanceId, jdbcType=VARCHAR},
-      #{processDefinitionId, jdbcType=VARCHAR},
-      #{scopeId, jdbcType=VARCHAR},
-      #{scopeDefinitionId, jdbcType=VARCHAR},
-      #{subScopeId, jdbcType=VARCHAR},
-      #{scopeType, jdbcType=VARCHAR},
-      #{tenantId, jdbcType=VARCHAR},
+      #{type, jdbcType=NVARCHAR}, 
+      #{taskId, jdbcType=NVARCHAR},
+      #{executionId, jdbcType=NVARCHAR},
+      #{processInstanceId, jdbcType=NVARCHAR},
+      #{processDefinitionId, jdbcType=NVARCHAR},
+      #{scopeId, jdbcType=NVARCHAR},
+      #{scopeDefinitionId, jdbcType=NVARCHAR},
+      #{subScopeId, jdbcType=NVARCHAR},
+      #{scopeType, jdbcType=NVARCHAR},
+      #{tenantId, jdbcType=NVARCHAR},
       #{timeStamp, jdbcType=TIMESTAMP},
-      #{userId, jdbcType=VARCHAR},
-      #{data, jdbcType=VARCHAR}
+      #{userId, jdbcType=NVARCHAR},
+      #{data, jdbcType=NVARCHAR}
     )  
   </insert>
 
   <insert id="bulkInsertHistoricTaskLogEntry" databaseId="oracle" parameterType="java.util.List">
     INSERT ALL 
-      <foreach collection="list" item="taskLog" index="index">
+      <foreach collection="list" item="historicTaskLogEntry" index="index">
         into ${prefix}ACT_HI_TSK_LOG(ID_, TYPE_, TASK_ID_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_,
                                      SCOPE_ID_, SCOPE_DEFINITION_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_,
                                      TENANT_ID_, TIME_STAMP_, USER_ID_, DATA_) VALUES
             (${prefix}ACT_HI_TASK_EVT_LOG_SEQ.nextVal,
-             #{taskLog.type, jdbcType=VARCHAR},
-             #{taskLog.taskId, jdbcType=VARCHAR},
-             #{taskLog.executionId, jdbcType=VARCHAR},
-             #{taskLog.processInstanceId, jdbcType=VARCHAR},
-             #{taskLog.processDefinitionId, jdbcType=VARCHAR},
-             #{taskLog.scopeId, jdbcType=VARCHAR},
-             #{taskLog.scopeDefinitionId, jdbcType=VARCHAR},
-             #{taskLog.subScopeId, jdbcType=VARCHAR},
-             #{taskLog.scopeType, jdbcType=VARCHAR},
-             #{taskLog.tenantId, jdbcType=VARCHAR},
-             #{taskLog.timeStamp, jdbcType=TIMESTAMP},
-             #{taskLog.userId, jdbcType=VARCHAR},
-             #{taskLog.data, jdbcType=VARCHAR})
+             #{historicTaskLogEntry.type, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.taskId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.executionId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.processInstanceId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.processDefinitionId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.scopeId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.scopeDefinitionId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.subScopeId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.scopeType, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.tenantId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.timeStamp, jdbcType=TIMESTAMP},
+             #{historicTaskLogEntry.userId, jdbcType=NVARCHAR},
+             #{historicTaskLogEntry.data, jdbcType=NVARCHAR})
       </foreach>
     SELECT * FROM dual
   </insert>
@@ -100,19 +100,19 @@
   <resultMap id="HistoricTaskLogEntryResultMap" type="org.flowable.task.service.impl.persistence.entity.HistoricTaskLogEntryEntityImpl">
     <id property="logNumber" column="ID_" jdbcType="BIGINT" />
     <result property="id" column="ID_" jdbcType="BIGINT" />
-    <result property="type" column="TYPE_" jdbcType="VARCHAR"/>
-    <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR"/>
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR"/>
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR"/>
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
+    <result property="type" column="TYPE_" jdbcType="NVARCHAR"/>
+    <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR"/>
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR"/>
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR"/>
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR"/>
     <result property="timeStamp" column="TIME_STAMP_" jdbcType="TIMESTAMP"/>
-    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
-    <result property="data" column="DATA_" jdbcType="VARCHAR"/>
+    <result property="userId" column="USER_ID_" jdbcType="NVARCHAR" />
+    <result property="data" column="DATA_" jdbcType="NVARCHAR"/>
   </resultMap>
   
   <!-- SELECTS -->
@@ -145,65 +145,65 @@
   <sql id="commonSelectHistoricTaskLogEntriesByQueryCriteriaSql">
     <where>
       <if test="taskId != null">
-        RES.TASK_ID_ = #{taskId}
+        RES.TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
       </if>
       <if test="type != null">
-        and RES.TYPE_ = #{type}
+        and RES.TYPE_ = #{type, jdbcType=NVARCHAR}
       </if>
       <if test="userId != null">
-        and RES.USER_ID_ = #{userId}
+        and RES.USER_ID_ = #{userId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceId != null">
-        and RES.PROC_INST_ID_ = #{processInstanceId}
+        and RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionId != null">
-        and RES.PROC_DEF_ID_ = #{processDefinitionId}
+        and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeId != null">
-        and RES.SCOPE_ID_ = #{scopeId}
+        and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeDefinitionId != null">
-        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="subScopeId != null">
-        and RES.SUB_SCOPE_ID_ = #{subScopeId}
+        and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeType != null">
-        and RES.SCOPE_TYPE_ = #{scopeType}
+        and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
       </if>
       <if test="fromDate != null">
-        and RES.TIME_STAMP_ &gt;= #{fromDate}
+        and RES.TIME_STAMP_ &gt;= #{fromDate, jdbcType=TIMESTAMP}
       </if>
       <if test="toDate != null">
-        and RES.TIME_STAMP_ &lt;= #{toDate}
+        and RES.TIME_STAMP_ &lt;= #{toDate, jdbcType=TIMESTAMP}
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="fromLogNumber != -1">
-        and RES.ID_ &gt;= #{fromLogNumber}
+        and RES.ID_ &gt;= #{fromLogNumber, jdbcType=BIGINT}
       </if>
       <if test="toLogNumber != -1">
-        and RES.ID_ &lt;= #{toLogNumber}
+        and RES.ID_ &lt;= #{toLogNumber, jdbcType=BIGINT}
       </if>
     </where>
   </sql>
 
   <!-- DELETE -->
   <delete id="deleteHistoricTaskLogEntryByLogNumber" parameterType="long">
-    delete from ${prefix}ACT_HI_TSK_LOG where ID_ = #{logNr}
+    delete from ${prefix}ACT_HI_TSK_LOG where ID_ = #{logNumber, jdbcType=BIGINT}
   </delete>
 
   <delete id="deleteHistoricTaskLogEntriesByProcessDefinitionId" parameterType="string">
-    delete from ${prefix}ACT_HI_TSK_LOG where PROC_DEF_ID_ = #{processDefinitionId}
+    delete from ${prefix}ACT_HI_TSK_LOG where PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteHistoricTaskLogEntriesByScopeDefinitionId" parameterType="map">
-    delete from ${prefix}ACT_HI_TSK_LOG where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR} AND SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
+    delete from ${prefix}ACT_HI_TSK_LOG where SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR} AND SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="deleteHistoricTaskLogEntriesByTaskId" parameterType="string">
-    delete from ${prefix}ACT_HI_TSK_LOG where TASK_ID_ = #{taskId}
+    delete from ${prefix}ACT_HI_TSK_LOG where TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
   </delete>
   
   <delete id="bulkDeleteHistoricTaskLogEntriesForTaskIds" parameterType="string">
@@ -213,8 +213,8 @@
         or
         </if>
         TASK_ID_ in 
-        <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-          #{item}
+        <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+          #{taskId, jdbcType=NVARCHAR}
         </foreach>
     </foreach>
   </delete>
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/Task.xml b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/Task.xml
index a0c21ff2529..9f89089d06d 100644
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/Task.xml
+++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/mapping/entity/Task.xml
@@ -27,38 +27,38 @@
                       PROPAGATED_STAGE_INST_ID_, TASK_DEF_KEY_, STATE_, CREATE_TIME_, IN_PROGRESS_TIME_, IN_PROGRESS_STARTED_BY_, CLAIM_TIME_, CLAIMED_BY_, 
                       SUSPENDED_TIME_, SUSPENDED_BY_, IN_PROGRESS_DUE_DATE_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_,
                       IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_, SUB_TASK_COUNT_)
-    values (#{id, jdbcType=VARCHAR},
-            1, #{name, jdbcType=VARCHAR},
-            #{parentTaskId, jdbcType=VARCHAR},
-            #{description, jdbcType=VARCHAR},
+    values (#{id, jdbcType=NVARCHAR},
+            1, #{name, jdbcType=NVARCHAR},
+            #{parentTaskId, jdbcType=NVARCHAR},
+            #{description, jdbcType=NVARCHAR},
             #{priority, jdbcType=INTEGER},
-            #{owner, jdbcType=VARCHAR},
-            #{assignee, jdbcType=VARCHAR},
-            #{delegationStateString, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{taskDefinitionId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{propagatedStageInstanceId, jdbcType=VARCHAR},
-            #{taskDefinitionKey, jdbcType=VARCHAR},
-            #{state, jdbcType=VARCHAR},
+            #{owner, jdbcType=NVARCHAR},
+            #{assignee, jdbcType=NVARCHAR},
+            #{delegationStateString, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{processDefinitionId, jdbcType=NVARCHAR},
+            #{taskDefinitionId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
+            #{scopeDefinitionId, jdbcType=NVARCHAR},
+            #{propagatedStageInstanceId, jdbcType=NVARCHAR},
+            #{taskDefinitionKey, jdbcType=NVARCHAR},
+            #{state, jdbcType=NVARCHAR},
             #{createTime, jdbcType=TIMESTAMP},
             #{inProgressStartTime, jdbcType=TIMESTAMP},
-            #{inProgressStartedBy, jdbcType=VARCHAR},
+            #{inProgressStartedBy, jdbcType=NVARCHAR},
             #{claimTime, jdbcType=TIMESTAMP},
-            #{claimedBy, jdbcType=VARCHAR},
+            #{claimedBy, jdbcType=NVARCHAR},
             #{suspendedTime, jdbcType=TIMESTAMP},
-            #{suspendedBy, jdbcType=VARCHAR},
+            #{suspendedBy, jdbcType=NVARCHAR},
             #{inProgressStartDueDate, jdbcType=TIMESTAMP},
             #{dueDate, jdbcType=TIMESTAMP},
-            #{category, jdbcType=VARCHAR},
+            #{category, jdbcType=NVARCHAR},
             #{suspensionState, jdbcType=INTEGER},
-            #{tenantId, jdbcType=VARCHAR},
-            #{formKey, jdbcType=VARCHAR},
+            #{tenantId, jdbcType=NVARCHAR},
+            #{formKey, jdbcType=NVARCHAR},
             #{isCountEnabled, jdbcType=BOOLEAN},
             #{variableCount, jdbcType=INTEGER},
             #{identityLinkCount, jdbcType=INTEGER},
@@ -74,38 +74,38 @@
         IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_, SUB_TASK_COUNT_)
     VALUES
       <foreach collection="list" item="task" index="index" separator=",">
-        (#{task.id, jdbcType=VARCHAR},
-         1, #{task.name, jdbcType=VARCHAR},
-         #{task.parentTaskId, jdbcType=VARCHAR},
-         #{task.description, jdbcType=VARCHAR},
+        (#{task.id, jdbcType=NVARCHAR},
+         1, #{task.name, jdbcType=NVARCHAR},
+         #{task.parentTaskId, jdbcType=NVARCHAR},
+         #{task.description, jdbcType=NVARCHAR},
          #{task.priority, jdbcType=INTEGER},
-         #{task.owner, jdbcType=VARCHAR},
-         #{task.assignee, jdbcType=VARCHAR},
-         #{task.delegationStateString, jdbcType=VARCHAR},
-         #{task.executionId, jdbcType=VARCHAR},
-         #{task.processInstanceId, jdbcType=VARCHAR},
-         #{task.processDefinitionId, jdbcType=VARCHAR},
-         #{task.taskDefinitionId, jdbcType=VARCHAR},
-         #{task.scopeId, jdbcType=VARCHAR},
-         #{task.subScopeId, jdbcType=VARCHAR},
-         #{task.scopeType, jdbcType=VARCHAR},
-         #{task.scopeDefinitionId, jdbcType=VARCHAR},
-         #{task.propagatedStageInstanceId, jdbcType=VARCHAR},
-         #{task.taskDefinitionKey, jdbcType=VARCHAR},
-         #{task.state, jdbcType=VARCHAR},
+         #{task.owner, jdbcType=NVARCHAR},
+         #{task.assignee, jdbcType=NVARCHAR},
+         #{task.delegationStateString, jdbcType=NVARCHAR},
+         #{task.executionId, jdbcType=NVARCHAR},
+         #{task.processInstanceId, jdbcType=NVARCHAR},
+         #{task.processDefinitionId, jdbcType=NVARCHAR},
+         #{task.taskDefinitionId, jdbcType=NVARCHAR},
+         #{task.scopeId, jdbcType=NVARCHAR},
+         #{task.subScopeId, jdbcType=NVARCHAR},
+         #{task.scopeType, jdbcType=NVARCHAR},
+         #{task.scopeDefinitionId, jdbcType=NVARCHAR},
+         #{task.propagatedStageInstanceId, jdbcType=NVARCHAR},
+         #{task.taskDefinitionKey, jdbcType=NVARCHAR},
+         #{task.state, jdbcType=NVARCHAR},
          #{task.createTime, jdbcType=TIMESTAMP},
          #{task.inProgressStartTime, jdbcType=TIMESTAMP},
-         #{task.inProgressStartedBy, jdbcType=VARCHAR},
+         #{task.inProgressStartedBy, jdbcType=NVARCHAR},
          #{task.claimTime, jdbcType=TIMESTAMP},
-         #{task.claimedBy, jdbcType=VARCHAR},
+         #{task.claimedBy, jdbcType=NVARCHAR},
          #{task.suspendedTime, jdbcType=TIMESTAMP},
-         #{task.suspendedBy, jdbcType=VARCHAR},
+         #{task.suspendedBy, jdbcType=NVARCHAR},
          #{task.inProgressStartDueDate, jdbcType=TIMESTAMP},
          #{task.dueDate, jdbcType=TIMESTAMP},
-         #{task.category, jdbcType=VARCHAR},
+         #{task.category, jdbcType=NVARCHAR},
          #{task.suspensionState, jdbcType=INTEGER},
-         #{task.tenantId, jdbcType=VARCHAR},
-         #{task.formKey, jdbcType=VARCHAR},
+         #{task.tenantId, jdbcType=NVARCHAR},
+         #{task.formKey, jdbcType=NVARCHAR},
          #{task.isCountEnabled, jdbcType=BOOLEAN},
          #{task.variableCount, jdbcType=INTEGER},
          #{task.identityLinkCount, jdbcType=INTEGER},
@@ -122,38 +122,38 @@
               STATE_, CREATE_TIME_, IN_PROGRESS_TIME_, IN_PROGRESS_STARTED_BY_, CLAIM_TIME_, CLAIMED_BY_, SUSPENDED_TIME_, SUSPENDED_BY_, 
               IN_PROGRESS_DUE_DATE_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_,
               IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_, SUB_TASK_COUNT_) VALUES
-        (#{task.id, jdbcType=VARCHAR},
-         1, #{task.name, jdbcType=VARCHAR},
-         #{task.parentTaskId, jdbcType=VARCHAR},
-         #{task.description, jdbcType=VARCHAR},
+        (#{task.id, jdbcType=NVARCHAR},
+         1, #{task.name, jdbcType=NVARCHAR},
+         #{task.parentTaskId, jdbcType=NVARCHAR},
+         #{task.description, jdbcType=NVARCHAR},
          #{task.priority, jdbcType=INTEGER},
-         #{task.owner, jdbcType=VARCHAR},
-         #{task.assignee, jdbcType=VARCHAR},
-         #{task.delegationStateString, jdbcType=VARCHAR},
-         #{task.executionId, jdbcType=VARCHAR},
-         #{task.processInstanceId, jdbcType=VARCHAR},
-         #{task.processDefinitionId, jdbcType=VARCHAR},
-         #{task.taskDefinitionId, jdbcType=VARCHAR},
-         #{task.scopeId, jdbcType=VARCHAR},
-         #{task.subScopeId, jdbcType=VARCHAR},
-         #{task.scopeType, jdbcType=VARCHAR},
-         #{task.scopeDefinitionId, jdbcType=VARCHAR},
-         #{task.propagatedStageInstanceId, jdbcType=VARCHAR},
-         #{task.taskDefinitionKey, jdbcType=VARCHAR},
-         #{task.state, jdbcType=VARCHAR},
+         #{task.owner, jdbcType=NVARCHAR},
+         #{task.assignee, jdbcType=NVARCHAR},
+         #{task.delegationStateString, jdbcType=NVARCHAR},
+         #{task.executionId, jdbcType=NVARCHAR},
+         #{task.processInstanceId, jdbcType=NVARCHAR},
+         #{task.processDefinitionId, jdbcType=NVARCHAR},
+         #{task.taskDefinitionId, jdbcType=NVARCHAR},
+         #{task.scopeId, jdbcType=NVARCHAR},
+         #{task.subScopeId, jdbcType=NVARCHAR},
+         #{task.scopeType, jdbcType=NVARCHAR},
+         #{task.scopeDefinitionId, jdbcType=NVARCHAR},
+         #{task.propagatedStageInstanceId, jdbcType=NVARCHAR},
+         #{task.taskDefinitionKey, jdbcType=NVARCHAR},
+         #{task.state, jdbcType=NVARCHAR},
          #{task.createTime, jdbcType=TIMESTAMP},
          #{task.inProgressStartTime, jdbcType=TIMESTAMP},
-         #{task.inProgressStartedBy, jdbcType=VARCHAR},
+         #{task.inProgressStartedBy, jdbcType=NVARCHAR},
          #{task.claimTime, jdbcType=TIMESTAMP},
-         #{task.claimedBy, jdbcType=VARCHAR},
+         #{task.claimedBy, jdbcType=NVARCHAR},
          #{task.suspendedTime, jdbcType=TIMESTAMP},
-         #{task.suspendedBy, jdbcType=VARCHAR},
+         #{task.suspendedBy, jdbcType=NVARCHAR},
          #{task.inProgressStartDueDate, jdbcType=TIMESTAMP},
          #{task.dueDate, jdbcType=TIMESTAMP},
-         #{task.category, jdbcType=VARCHAR},
+         #{task.category, jdbcType=NVARCHAR},
          #{task.suspensionState, jdbcType=INTEGER},
-         #{task.tenantId, jdbcType=VARCHAR},
-         #{task.formKey, jdbcType=VARCHAR},
+         #{task.tenantId, jdbcType=NVARCHAR},
+         #{task.formKey, jdbcType=NVARCHAR},
          #{task.isCountEnabled, jdbcType=BOOLEAN},
          #{task.variableCount, jdbcType=INTEGER},
          #{task.identityLinkCount, jdbcType=INTEGER},
@@ -170,10 +170,10 @@
     <set>
       REV_ = #{revisionNext, jdbcType=INTEGER},
       <if test="originalPersistentState.name != name">
-          NAME_ = #{name, jdbcType=VARCHAR},
+          NAME_ = #{name, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.parentTaskId != parentTaskId">
-          PARENT_TASK_ID_ = #{parentTaskId, jdbcType=VARCHAR},
+          PARENT_TASK_ID_ = #{parentTaskId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.priority != priority">
           PRIORITY_ = #{priority, jdbcType=INTEGER},
@@ -185,61 +185,61 @@
           IN_PROGRESS_TIME_ = #{inProgressStartTime, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.inProgressStartedBy != inProgressStartedBy">
-          IN_PROGRESS_STARTED_BY_ = #{inProgressStartedBy, jdbcType=VARCHAR},
+          IN_PROGRESS_STARTED_BY_ = #{inProgressStartedBy, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.claimTime != claimTime">
           CLAIM_TIME_ = #{claimTime, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.claimedBy != claimedBy">
-          CLAIMED_BY_ = #{claimedBy, jdbcType=VARCHAR},
+          CLAIMED_BY_ = #{claimedBy, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.suspendedTime != suspendedTime">
           SUSPENDED_TIME_ = #{suspendedTime, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.suspendedBy != suspendedBy">
-          SUSPENDED_BY_ = #{suspendedBy, jdbcType=VARCHAR},
+          SUSPENDED_BY_ = #{suspendedBy, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.owner != owner">
-          OWNER_ = #{owner, jdbcType=VARCHAR},
+          OWNER_ = #{owner, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.assignee != assignee">
-          ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
+          ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.delegationStateString != delegationStateString">
-          DELEGATION_ = #{delegationStateString, jdbcType=VARCHAR},
+          DELEGATION_ = #{delegationStateString, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.executionId != executionId">
-          EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+          EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-          PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
+          PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.taskDefinitionId != taskDefinitionId">
-          TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=VARCHAR},
+          TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.taskDefinitionKey != taskDefinitionKey">
-          TASK_DEF_KEY_ = #{taskDefinitionKey, jdbcType=VARCHAR},
+          TASK_DEF_KEY_ = #{taskDefinitionKey, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.state != state">
-          STATE_ = #{state, jdbcType=VARCHAR},
+          STATE_ = #{state, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeId != scopeId">
-          SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+          SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.subScopeId != subScopeId">
-          SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+          SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeType != scopeType">
-          SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+          SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-          SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR},
+          SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.propagatedStageInstanceId != propagatedStageInstanceId">
-          PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=VARCHAR},
+          PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.description != description">
-          DESCRIPTION_ = #{description, jdbcType=VARCHAR},
+          DESCRIPTION_ = #{description, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.inProgressStartDueDate != inProgressStartDueDate">
           IN_PROGRESS_DUE_DATE_ = #{inProgressStartDueDate, jdbcType=TIMESTAMP},
@@ -248,13 +248,13 @@
           DUE_DATE_ = #{dueDate, jdbcType=TIMESTAMP},
       </if>
       <if test="originalPersistentState.category != category">
-          CATEGORY_ = #{category, jdbcType=VARCHAR},
+          CATEGORY_ = #{category, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.suspensionState != suspensionState">
           SUSPENSION_STATE_ = #{suspensionState, jdbcType=INTEGER},
       </if>
       <if test="originalPersistentState.formKey != formKey">
-          FORM_KEY_ = #{formKey, jdbcType=VARCHAR},
+          FORM_KEY_ = #{formKey, jdbcType=NVARCHAR},
       </if>
       <if test="originalPersistentState.isCountEnabled != isCountEnabled">
           IS_COUNT_ENABLED_ = #{isCountEnabled, jdbcType=BOOLEAN},
@@ -269,19 +269,19 @@
           SUB_TASK_COUNT_ = #{subTaskCount, jdbcType=INTEGER},
       </if>
     </set>
-    where ID_= #{id, jdbcType=VARCHAR}
+    where ID_= #{id, jdbcType=NVARCHAR}
       and REV_ = #{revision, jdbcType=INTEGER}
   </update>
 
   <update id="updateTaskTenantIdForDeployment" parameterType="java.util.Map">
     update ${prefix}ACT_RU_TASK set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+      TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
     where
       ID_ in (
         SELECT T.ID_ from ${prefix}ACT_RU_TASK T
         inner join ${prefix}ACT_RE_PROCDEF P on T.PROC_DEF_ID_  = P.ID_
         inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+        where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
       )
   </update>
 
@@ -289,7 +289,7 @@
        Tested this on MySQL 5.6: does NOT use a temporary table (so good, performance0 -->
   <update id="updateTaskTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
     update ${prefix}ACT_RU_TASK set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
+      TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
     where
       ID_ in (
 
@@ -299,7 +299,7 @@
                 FROM  ${prefix}ACT_RU_TASK T
                 inner join ${prefix}ACT_RE_PROCDEF P on T.PROC_DEF_ID_  = P.ID_
                 inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_
-                where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
+                where D.ID_ = #{deploymentId, jdbcType=NVARCHAR}
 
         ) AS tempTask
 
@@ -314,56 +314,56 @@
 
   <!-- TASK DELETE -->
   <delete id="deleteTask" parameterType="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    delete from ${prefix}ACT_RU_TASK where ID_ = #{id} and REV_ = #{revision}
+    delete from ${prefix}ACT_RU_TASK where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
   </delete>
 
   <delete id="deleteTasksByExecutionId" parameterType="string">
-    delete from ${prefix}ACT_RU_TASK where EXECUTION_ID_ = #{id}
+    delete from ${prefix}ACT_RU_TASK where EXECUTION_ID_ = #{id, jdbcType=NVARCHAR}
   </delete>
 
   <delete id="bulkDeleteTask" parameterType="java.util.Collection">
     delete from ${prefix}ACT_RU_TASK where
     <foreach item="task" collection="list" index="index" separator=" or ">
-        ID_ = #{task.id, jdbcType=VARCHAR}
+        ID_ = #{task.id, jdbcType=NVARCHAR}
     </foreach>
   </delete>
 
   <!-- TASK RESULTMAP -->
 
   <resultMap id="taskResultMap" type="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR"/>
+    <id property="id" column="ID_" jdbcType="NVARCHAR"/>
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
-    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR"/>
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="NVARCHAR"/>
+    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="NVARCHAR"/>
+    <result property="description" column="DESCRIPTION_" jdbcType="NVARCHAR"/>
     <result property="priority" column="PRIORITY_" jdbcType="INTEGER"/>
     <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
     <result property="inProgressStartTime" column="IN_PROGRESS_TIME_" jdbcType="TIMESTAMP" />
-    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="VARCHAR"/>
+    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="NVARCHAR"/>
     <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
-    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="VARCHAR"/>
+    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="NVARCHAR"/>
     <result property="suspendedTime" column="SUSPENDED_TIME_" jdbcType="TIMESTAMP" />
-    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="VARCHAR"/>
-    <result property="owner" column="OWNER_" jdbcType="VARCHAR"/>
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR"/>
-    <result property="delegationStateString" column="DELEGATION_" jdbcType="VARCHAR"/>
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR"/>
-    <result property="state" column="STATE_" jdbcType="VARCHAR"/>
+    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="NVARCHAR"/>
+    <result property="owner" column="OWNER_" jdbcType="NVARCHAR"/>
+    <result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR"/>
+    <result property="delegationStateString" column="DELEGATION_" jdbcType="NVARCHAR"/>
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR"/>
+    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR"/>
+    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="NVARCHAR"/>
+    <result property="state" column="STATE_" jdbcType="NVARCHAR"/>
     <result property="inProgressStartDueDate" column="IN_PROGRESS_DUE_DATE_" jdbcType="TIMESTAMP"/>
     <result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP"/>
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="formKey" column="FORM_KEY_" jdbcType="VARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="formKey" column="FORM_KEY_" jdbcType="NVARCHAR" />
     <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
     <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
     <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
@@ -371,105 +371,105 @@
   </resultMap>
 
   <resultMap id="taskAndRelatedEntitiesResultMap" type="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR"/>
+    <id property="id" column="ID_" jdbcType="NVARCHAR"/>
     <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
-    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR"/>
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="NVARCHAR"/>
+    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="NVARCHAR"/>
+    <result property="description" column="DESCRIPTION_" jdbcType="NVARCHAR"/>
     <result property="priority" column="PRIORITY_" jdbcType="INTEGER"/>
     <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
     <result property="inProgressStartTime" column="IN_PROGRESS_TIME_" jdbcType="TIMESTAMP" />
-    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="VARCHAR"/>
+    <result property="inProgressStartedBy" column="IN_PROGRESS_STARTED_BY_" jdbcType="NVARCHAR"/>
     <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
-    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="VARCHAR"/>
+    <result property="claimedBy" column="CLAIMED_BY_" jdbcType="NVARCHAR"/>
     <result property="suspendedTime" column="SUSPENDED_TIME_" jdbcType="TIMESTAMP" />
-    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="VARCHAR"/>
-    <result property="owner" column="OWNER_" jdbcType="VARCHAR"/>
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR"/>
-    <result property="delegationStateString" column="DELEGATION_" jdbcType="VARCHAR"/>
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR"/>
-    <result property="state" column="STATE_" jdbcType="VARCHAR"/>
+    <result property="suspendedBy" column="SUSPENDED_BY_" jdbcType="NVARCHAR"/>
+    <result property="owner" column="OWNER_" jdbcType="NVARCHAR"/>
+    <result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR"/>
+    <result property="delegationStateString" column="DELEGATION_" jdbcType="NVARCHAR"/>
+    <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="NVARCHAR"/>
+    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR"/>
+    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="NVARCHAR"/>
+    <result property="propagatedStageInstanceId" column="PROPAGATED_STAGE_INST_ID_" jdbcType="NVARCHAR"/>
+    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="NVARCHAR"/>
+    <result property="state" column="STATE_" jdbcType="NVARCHAR"/>
     <result property="inProgressStartDueDate" column="IN_PROGRESS_DUE_DATE_" jdbcType="TIMESTAMP"/>
     <result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP"/>
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
+    <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
     <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="formKey" column="FORM_KEY_" jdbcType="VARCHAR" />
+    <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
+    <result property="formKey" column="FORM_KEY_" jdbcType="NVARCHAR" />
     <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
     <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
     <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
     <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
     <result property="subTaskCount" column="SUB_TASK_COUNT_" jdbcType="INTEGER" />
     <collection property="queryVariables" column="TASK_ID_" javaType="ArrayList" ofType="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-      <id property="id" column="VAR_ID_"/>
-      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR" />
-      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
+      <id property="id" column="VAR_ID_" jdbcType="NVARCHAR"/>
+      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="NVARCHAR" />
+      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
       <result property="revision" column="VAR_REV_" jdbcType="INTEGER" />
-      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="VARCHAR" />
+      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="NVARCHAR" />
+      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="VAR_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="metaInfo" column="VAR_META_INFO_" jdbcType="NVARCHAR" />
       <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
       <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE" />
-      <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR" />
-      <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR" />
+      <result property="textValue" column="VAR_TEXT_" jdbcType="NVARCHAR" />
+      <result property="textValue2" column="VAR_TEXT2_" jdbcType="NVARCHAR" />
       <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT" />
-      <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="VARCHAR"/>
-      <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-      <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="VARCHAR"/>
+      <result property="scopeId" column="VAR_SCOPE_ID_" jdbcType="NVARCHAR"/>
+      <result property="subScopeId" column="VAR_SUB_SCOPE_ID_" jdbcType="NVARCHAR"/>
+      <result property="scopeType" column="VAR_SCOPE_TYPE_" jdbcType="NVARCHAR"/>
     </collection>
     <collection property="queryIdentityLinks" column="TASK_ID_" javaType="ArrayList" ofType="org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl">
-      <id property="id" column="ILINK_ID_"/>
-      <result property="type" column="ILINK_TYPE_" jdbcType="VARCHAR" />
-      <result property="userId" column="ILINK_USER_ID_" jdbcType="VARCHAR" />
-      <result property="groupId" column="ILINK_GROUP_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="ILINK_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="processInstanceId" column="ILINK_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="processDefId" column="ILINK_PROC_DEF_ID_" jdbcType="VARCHAR" />
+      <id property="id" column="ILINK_ID_" jdbcType="NVARCHAR"/>
+      <result property="type" column="ILINK_TYPE_" jdbcType="NVARCHAR" />
+      <result property="userId" column="ILINK_USER_ID_" jdbcType="NVARCHAR" />
+      <result property="groupId" column="ILINK_GROUP_ID_" jdbcType="NVARCHAR" />
+      <result property="taskId" column="ILINK_TASK_ID_" jdbcType="NVARCHAR" />
+      <result property="processInstanceId" column="ILINK_PROC_INST_ID_" jdbcType="NVARCHAR" />
+      <result property="processDefId" column="ILINK_PROC_DEF_ID_" jdbcType="NVARCHAR" />
     </collection>
   </resultMap>
 
   <!-- TASK SELECT -->
 
   <select id="selectTask" parameterType="string" resultMap="taskResultMap">
-   select * from ${prefix}ACT_RU_TASK where ID_ = #{id, jdbcType=VARCHAR}
+   select * from ${prefix}ACT_RU_TASK where ID_ = #{id, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectTasksByParentTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
-    select * from ${prefix}ACT_RU_TASK where PARENT_TASK_ID_ = #{parameter}
+    select * from ${prefix}ACT_RU_TASK where PARENT_TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectTasksByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
     select distinct T.*
     from ${prefix}ACT_RU_TASK T
-    where T.EXECUTION_ID_ = #{parameter}
+    where T.EXECUTION_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectTasksByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
     select T.*
     from ${prefix}ACT_RU_TASK T
-    where T.PROC_INST_ID_ = #{parameter}
+    where T.PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectTasksBySubScopeIdAndScopeType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
     select T.*
     from ${prefix}ACT_RU_TASK T
-    where T.SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=VARCHAR} and T.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+    where T.SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR} and T.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectTasksByScopeIdAndScopeType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
     select T.*
     from ${prefix}ACT_RU_TASK T
-    where T.SCOPE_ID_ = #{parameter.scopeId, jdbcType=VARCHAR} and T.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+    where T.SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and T.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectTaskByQueryCriteria" parameterType="org.flowable.task.service.impl.TaskQueryImpl" resultMap="taskResultMap">
@@ -535,79 +535,79 @@
   <sql id="commonSelectTaskByQueryCriteriaSql">
     <where>
       <if test="taskId != null">
-        RES.ID_ = #{taskId}
+        RES.ID_ = #{taskId, jdbcType=NVARCHAR}
       </if>
       <if test="taskIds != null and !taskIds.empty">
           AND RES.ID_ IN
           <foreach item="taskId" index="index" collection="taskIds" open="(" separator="," close=")">
-              #{taskId}
+              #{taskId, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=NVARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase})${wildcardEscapeClause}
+        and lower(RES.NAME_) like lower(#{nameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
       </if>
       <if test="nameList != null &amp;&amp; !nameList.empty">
         and RES.NAME_ IN
         <foreach item="name" index="index" collection="nameList"
                  open="(" separator="," close=")">
-          #{name}
+          #{name, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="nameListIgnoreCase != null &amp;&amp; !nameListIgnoreCase.empty">
         and lower(RES.NAME_) IN
         <foreach item="name" index="index" collection="nameListIgnoreCase"
                  open="(" separator="," close=")">
-          #{name}
+          #{name, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="description != null">
-        and RES.DESCRIPTION_ = #{description}
+        and RES.DESCRIPTION_ = #{description, jdbcType=NVARCHAR}
       </if>
       <if test="descriptionLike != null">
-        and RES.DESCRIPTION_ like #{descriptionLike}${wildcardEscapeClause}
+        and RES.DESCRIPTION_ like #{descriptionLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="descriptionLikeIgnoreCase != null">
-        and lower(RES.DESCRIPTION_) like #{descriptionLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.DESCRIPTION_) like #{descriptionLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="priority != null">
-        and RES.PRIORITY_ = #{priority}
+        and RES.PRIORITY_ = #{priority, jdbcType=INTEGER}
       </if>
       <if test="minPriority != null">
-        and RES.PRIORITY_ &gt;= #{minPriority}
+        and RES.PRIORITY_ &gt;= #{minPriority, jdbcType=INTEGER}
       </if>
       <if test="maxPriority != null">
-        and RES.PRIORITY_ &lt;= #{maxPriority}
+        and RES.PRIORITY_ &lt;= #{maxPriority, jdbcType=INTEGER}
       </if>
       <if test="assignee != null">
-        and RES.ASSIGNEE_ = #{assignee}
+        and RES.ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR}
       </if>
       <if test="assigneeLike != null">
-        and RES.ASSIGNEE_ like #{assigneeLike}${wildcardEscapeClause}
+        and RES.ASSIGNEE_ like #{assigneeLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="assigneeLikeIgnoreCase != null">
-        and lower(RES.ASSIGNEE_) like #{assigneeLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.ASSIGNEE_) like #{assigneeLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="assigneeIds != null &amp;&amp; !assigneeIds.empty">
         and RES.ASSIGNEE_ IN
         <foreach item="assigneeId" index="index" collection="assigneeIds"
                  open="(" separator="," close=")">
-          #{assigneeId}
+          #{assigneeId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="owner != null">
-        and RES.OWNER_ = #{owner}
+        and RES.OWNER_ = #{owner, jdbcType=NVARCHAR}
       </if>
       <if test="ownerLike != null">
-        and RES.OWNER_ like #{ownerLike}${wildcardEscapeClause}
+        and RES.OWNER_ like #{ownerLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
        <if test="ownerLikeIgnoreCase != null">
-        and lower(RES.OWNER_) like #{ownerLikeIgnoreCase}${wildcardEscapeClause}
+        and lower(RES.OWNER_) like #{ownerLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="unassigned">
         and RES.ASSIGNEE_ IS NULL
@@ -619,16 +619,16 @@
         and RES.DELEGATION_ IS NULL
       </if>
       <if test="delegationState != null">
-        and RES.DELEGATION_ = #{delegationStateString}
+        and RES.DELEGATION_ = #{delegationStateString, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceId != null">
-        and RES.PROC_INST_ID_ = #{processInstanceId}
+        and RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceIds != null &amp;&amp; !processInstanceIds.empty">
         and RES.PROC_INST_ID_ IN
-        <foreach item="processInstance" index="index" collection="processInstanceIds"
+        <foreach item="processInstanceId" index="index" collection="processInstanceIds"
                  open="(" separator="," close=")">
-          #{processInstance}
+          #{processInstanceId, jdbcType=NVARCHAR}
         </foreach>
       </if>
       <if test="withoutProcessInstanceId">
@@ -641,83 +641,83 @@
             <where>
                 RES.PROC_INST_ID_ = E.ID_
                 <if test="processInstanceBusinessKey != null">
-                    and E.BUSINESS_KEY_ = #{processInstanceBusinessKey}
+                    and E.BUSINESS_KEY_ = #{processInstanceBusinessKey, jdbcType=NVARCHAR}
                 </if>
                 <if test="processInstanceBusinessKeyLike != null">
-                    and E.BUSINESS_KEY_ like #{processInstanceBusinessKeyLike}${wildcardEscapeClause}
+                    and E.BUSINESS_KEY_ like #{processInstanceBusinessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                 </if>
                 <if test="processInstanceBusinessKeyLikeIgnoreCase != null">
-                    and lower(E.BUSINESS_KEY_) like #{processInstanceBusinessKeyLikeIgnoreCase}${wildcardEscapeClause}
+                    and lower(E.BUSINESS_KEY_) like #{processInstanceBusinessKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                 </if>
             </where>
           )
       </if>
       <if test="executionId != null">
-        and RES.EXECUTION_ID_ = #{executionId}
+        and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeId != null">
-        and RES.SCOPE_ID_ = #{scopeId}
+        and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
       </if>
       <if test="subScopeId != null">
-        and RES.SUB_SCOPE_ID_ = #{subScopeId}
+        and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
       </if>
       <if test="scopeType != null">
-        and RES.SCOPE_TYPE_ = #{scopeType}
+        and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
       </if>
       <if test="scopeDefinitionId != null">
-        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
+        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="withoutScopeId">
         and RES.SCOPE_ID_ is NULL
       </if>
       <if test="propagatedStageInstanceId != null">
-        and RES.PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId}
+        and RES.PROPAGATED_STAGE_INST_ID_ = #{propagatedStageInstanceId, jdbcType=NVARCHAR}
       </if>
       <if test="processInstanceIdWithChildren != null">
         and exists(select ELINK.ID_ from ${prefix}ACT_RU_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-            ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
+            ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren, jdbcType=NVARCHAR} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
             ELINK.REF_SCOPE_ID_ = RES.ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
       </if>
       <if test="caseInstanceIdWithChildren != null">
         and exists(select ELINK.ID_ from ${prefix}ACT_RU_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-            ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
+            ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren, jdbcType=VARCHAR} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
             ELINK.REF_SCOPE_ID_ = RES.ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
       </if>
       <if test="createTime != null">
-        and RES.CREATE_TIME_ = #{createTime}
+        and RES.CREATE_TIME_ = #{createTime, jdbcType=TIMESTAMP}
       </if>
       <if test="createTimeBefore != null">
-        and RES.CREATE_TIME_ &lt; #{createTimeBefore}
+        and RES.CREATE_TIME_ &lt; #{createTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="createTimeAfter != null">
-        and RES.CREATE_TIME_ &gt; #{createTimeAfter}
+        and RES.CREATE_TIME_ &gt; #{createTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartTime != null">
-        and RES.IN_PROGRESS_TIME_ = #{inProgressStartTime}
+        and RES.IN_PROGRESS_TIME_ = #{inProgressStartTime, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartTimeBefore != null">
-        and RES.IN_PROGRESS_TIME_ &lt; #{inProgressStartTimeBefore}
+        and RES.IN_PROGRESS_TIME_ &lt; #{inProgressStartTimeBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="inProgressStartTimeAfter != null">
-        and RES.IN_PROGRESS_TIME_ &gt; #{inProgressStartTimeAfter}
+        and RES.IN_PROGRESS_TIME_ &gt; #{inProgressStartTimeAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="key != null">
-        and RES.TASK_DEF_KEY_ = #{key}
+        and RES.TASK_DEF_KEY_ = #{key, jdbcType=NVARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.TASK_DEF_KEY_ like #{keyLike}
+        and RES.TASK_DEF_KEY_ like #{keyLike, jdbcType=NVARCHAR}
       </if>
       <if test="keys != null and !keys.empty">
           and RES.TASK_DEF_KEY_ in
-          <foreach item="item" index="index" collection="keys" open="(" separator="," close=")">
-              #{item}
+          <foreach item="taskDefinitionKey" index="index" collection="keys" open="(" separator="," close=")">
+              #{taskDefinitionKey, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="processDefinitionId != null">
-        and RES.PROC_DEF_ID_ = #{processDefinitionId}
+        and RES.PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="taskDefinitionId != null">
-        and RES.TASK_DEF_ID_ = #{taskDefinitionId}
+        and RES.TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=NVARCHAR}
       </if>
       <if test="processDefinitionKey != null || processDefinitionKeyLike != null ||  processDefinitionKeyLikeIgnoreCase != null || processDefinitionName != null || processDefinitionNameLike != null || (processCategoryInList != null &amp;&amp; !processCategoryInList.empty) || (processCategoryNotInList != null &amp;&amp; !processCategoryNotInList.empty) || (processDefinitionKeys != null &amp;&amp; !processDefinitionKeys.empty) || deploymentId != null || (deploymentIds != null &amp;&amp; !deploymentIds.empty)">
         and exists (
@@ -726,48 +726,48 @@
             <where>
                 RES.PROC_DEF_ID_ = D.ID_
                 <if test="processDefinitionKey != null">
-                    and D.KEY_ = #{processDefinitionKey}
+                    and D.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR}
                 </if>
                 <if test="processDefinitionKeyLike != null">
-                    and D.KEY_ like #{processDefinitionKeyLike}${wildcardEscapeClause}
+                    and D.KEY_ like #{processDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                 </if>
                 <if test="processDefinitionKeyLikeIgnoreCase != null">
-                    and lower(D.KEY_) like #{processDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                    and lower(D.KEY_) like #{processDefinitionKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                 </if>
                 <if test="processDefinitionKeys != null &amp;&amp; !processDefinitionKeys.empty">
                     and D.KEY_ in
-                    <foreach item="item" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
-                        #{item}
+                    <foreach item="processDefinitionKey" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
+                        #{processDefinitionKey, jdbcType=NVARCHAR}
                     </foreach>
                 </if>
                 <if test="processDefinitionName != null">
-                    and D.NAME_ = #{processDefinitionName}
+                    and D.NAME_ = #{processDefinitionName, jdbcType=NVARCHAR}
                 </if>
                 <if test="processDefinitionNameLike != null">
-                    and D.NAME_ like #{processDefinitionNameLike}${wildcardEscapeClause}
+                    and D.NAME_ like #{processDefinitionNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                 </if>
                 <if test="processCategoryInList != null &amp;&amp; !processCategoryInList.empty">
                     and D.CATEGORY_ IN
                     <foreach item="processCategory" index="index" collection="processCategoryInList"
                              open="(" separator="," close=")">
-                        #{processCategory}
+                        #{processCategory, jdbcType=NVARCHAR}
                     </foreach>
                 </if>
                 <if test="processCategoryNotInList != null &amp;&amp; !processCategoryNotInList.empty">
                     and D.CATEGORY_ NOT IN
                     <foreach item="processCategory" index="index" collection="processCategoryNotInList"
                              open="(" separator="," close=")">
-                        #{processCategory}
+                        #{processCategory, jdbcType=NVARCHAR}
                     </foreach>
                 </if>
                 <if test="deploymentId != null">
-                    and D.DEPLOYMENT_ID_ = #{deploymentId}
+                    and D.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=NVARCHAR}
                 </if>
                 <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
                     and D.DEPLOYMENT_ID_ IN
-                    <foreach item="deployment" index="index" collection="deploymentIds"
+                    <foreach item="deploymentId" index="index" collection="deploymentIds"
                              open="(" separator="," close=")">
-                        #{deployment}
+                        #{deploymentId, jdbcType=NVARCHAR}
                     </foreach>
                 </if>
             </where>
@@ -780,41 +780,41 @@
             <where>
                 RES.SCOPE_DEFINITION_ID_ = CD.ID_
                 <if test="caseDefinitionKey != null">
-                    and CD.KEY_ = #{caseDefinitionKey}
+                    and CD.KEY_ = #{caseDefinitionKey, jdbcType=VARCHAR}
                 </if>
                 <if test="caseDefinitionKeyLike != null">
-                    and CD.KEY_ like #{caseDefinitionKeyLike}${wildcardEscapeClause}
+                    and CD.KEY_ like #{caseDefinitionKeyLike, jdbcType=VARCHAR}${wildcardEscapeClause}
                 </if>
                 <if test="caseDefinitionKeyLikeIgnoreCase != null">
-                    and lower(CD.KEY_) like #{caseDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                    and lower(CD.KEY_) like #{caseDefinitionKeyLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause}
                 </if>
                 <if test="caseDefinitionKeys != null &amp;&amp; !caseDefinitionKeys.empty">
                     and CD.KEY_ in
-                    <foreach item="item" index="index" collection="caseDefinitionKeys" open="(" separator="," close=")">
-                        #{item}
+                    <foreach item="caseDefinitionKey" index="index" collection="caseDefinitionKeys" open="(" separator="," close=")">
+                        #{caseDefinitionKey, jdbcType=VARCHAR}
                     </foreach>
                 </if>
                 <if test="cmmnDeploymentId != null">
-                    and CD.DEPLOYMENT_ID_ = #{cmmnDeploymentId}
+                    and CD.DEPLOYMENT_ID_ = #{cmmnDeploymentId, jdbcType=VARCHAR}
                 </if>
                 <if test="cmmnDeploymentIds != null &amp;&amp; !cmmnDeploymentIds.empty">
                     and CD.DEPLOYMENT_ID_ IN
-                    <foreach item="deployment" index="index" collection="cmmnDeploymentIds"
+                    <foreach item="cmmnDeploymentId" index="index" collection="cmmnDeploymentIds"
                              open="(" separator="," close=")">
-                        #{deployment}
+                        #{cmmnDeploymentId, jdbcType=VARCHAR}
                     </foreach>
                 </if>
             </where>
           )
       </if>
       <if test="dueDate != null">
-        and RES.DUE_DATE_ = #{dueDate}
+        and RES.DUE_DATE_ = #{dueDate, jdbcType=TIMESTAMP}
       </if>
       <if test="dueBefore != null">
-        and RES.DUE_DATE_ &lt; #{dueBefore}
+        and RES.DUE_DATE_ &lt; #{dueBefore, jdbcType=TIMESTAMP}
       </if>
       <if test="dueAfter != null">
-        and RES.DUE_DATE_ &gt; #{dueAfter}
+        and RES.DUE_DATE_ &gt; #{dueAfter, jdbcType=TIMESTAMP}
       </if>
       <if test="withoutDueDate">
         and RES.DUE_DATE_ is null
@@ -823,20 +823,20 @@
         and RES.DUE_DATE_ is not null
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
       </if>
       <if test="categoryInList != null &amp;&amp; !categoryInList.empty">
           and RES.CATEGORY_ IN
-          <foreach item="taskCategory" index="index" collection="categoryInList"
+          <foreach item="category" index="index" collection="categoryInList"
                    open="(" separator="," close=")">
-              #{taskCategory}
+              #{category, jdbcType=NVARCHAR}
           </foreach>
       </if>
       <if test="categoryNotInList != null &amp;&amp; !categoryNotInList.empty">
           and RES.CATEGORY_ NOT IN
-          <foreach item="taskCategory" index="index" collection="categoryNotInList"
+          <foreach item="category" index="index" collection="categoryNotInList"
                      open="(" separator="," close=")">
-              #{taskCategory}
+              #{category, jdbcType=NVARCHAR}
             </foreach>
       </if>
       <if test="withoutCategory">
@@ -846,7 +846,7 @@
         and RES.FORM_KEY_ IS NOT NULL
       </if>
         <if test="formKey != null">
-            and RES.FORM_KEY_ = #{formKey}
+            and RES.FORM_KEY_ = #{formKey, jdbcType=NVARCHAR}
         </if>
       <if test="excludeSubtasks">
         and RES.PARENT_TASK_ID_ IS NULL
@@ -859,7 +859,7 @@
             and
             (
               <if test="candidateUser != null">
-                LINK.USER_ID_ = #{candidateUser}
+                LINK.USER_ID_ = #{candidateUser, jdbcType=NVARCHAR}
               </if>
               <if test="candidateUser != null &amp;&amp; candidateGroups != null &amp;&amp; !candidateGroups.empty">
                 or
@@ -871,9 +871,9 @@
                     or
                     </if>
                     LINK.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="candidateGroupListItem"
+                    <foreach item="groupId" index="index" collection="candidateGroupListItem"
                          open="(" separator="," close=")">
-                      #{group}
+                      #{groupId, jdbcType=NVARCHAR}
                     </foreach>
                 </foreach>
                 )
@@ -883,9 +883,9 @@
       </if>
       <if test="involvedUser != null">
         and (
-          exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.USER_ID_ = #{involvedUser} and LINK.TASK_ID_ = RES.ID_)
-          or RES.ASSIGNEE_ = #{involvedUser}
-          or RES.OWNER_ = #{involvedUser}
+          exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.USER_ID_ = #{involvedUser, jdbcType=NVARCHAR} and LINK.TASK_ID_ = RES.ID_)
+          or RES.ASSIGNEE_ = #{involvedUser, jdbcType=NVARCHAR}
+          or RES.OWNER_ = #{involvedUser, jdbcType=NVARCHAR}
           )
       </if>
       <if test="involvedGroups != null">
@@ -897,9 +897,9 @@
     			or
     			</if>
                 LINK.GROUP_ID_ IN
-                <foreach item="group" index="index" collection="involvedGroupListItem"
+                <foreach item="groupId" index="index" collection="involvedGroupListItem"
                       open="(" separator="," close=")">
-                  #{group}
+                  #{groupId, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
             )
@@ -909,14 +909,14 @@
         <choose>
             <when test="var.operator.equals('EXISTS')">
               and EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
+                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name, jdbcType=NVARCHAR}
                 <if test="!var.local">
                     <choose>
                         <when test="var.scopeType == null or var.scopeType == 'bpmn'">
                             and RES.PROC_INST_ID_ = PROC_INST_ID_
                         </when>
                         <otherwise>
-                            and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType}
+                            and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType, jdbcType=NVARCHAR}
                         </otherwise>
                     </choose>
                     and TASK_ID_ is null
@@ -928,14 +928,14 @@
             </when>
             <when test="var.operator.equals('NOT_EXISTS')">
               and NOT EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
+                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name, jdbcType=NVARCHAR}
                 <if test="!var.local">
                     <choose>
                         <when test="var.scopeType == null or var.scopeType == 'bpmn'">
                             and RES.PROC_INST_ID_ = PROC_INST_ID_
                         </when>
                         <otherwise>
-                            and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType}
+                            and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType, jdbcType=NVARCHAR}
                         </otherwise>
                     </choose>
                     and TASK_ID_ is null
@@ -956,7 +956,7 @@
                                     and RES.PROC_INST_ID_ = V.PROC_INST_ID_
                                 </when>
                                 <otherwise>
-                                    and RES.SCOPE_ID_ = V.SCOPE_ID_ and V.SCOPE_TYPE_ = #{var.scopeType}
+                                    and RES.SCOPE_ID_ = V.SCOPE_ID_ and V.SCOPE_TYPE_ = #{var.scopeType, jdbcType=NVARCHAR}
                                 </otherwise>
                             </choose>
                             and V.TASK_ID_ is null
@@ -966,13 +966,13 @@
                         </if>
                         <if test="var.name != null">
                             <!-- Match-all variable-names when name is null -->
-                            and V.NAME_= #{var.name}
+                            and V.NAME_= #{var.name, jdbcType=NVARCHAR}
                         </if>
                         <if test="var.name == null">
                             and V.NAME_ is not null
                         </if>
                         <if test="var.needsTypeCheck()">
-                            and V.TYPE_ = #{var.type}
+                            and V.TYPE_ = #{var.type, jdbcType=NVARCHAR}
                         </if>
 
                         <!-- Variable value -->
@@ -989,7 +989,7 @@
                                 <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                 <otherwise><include refid="executionVariableOperator" /></otherwise>
                             </choose>
-                            #{var.textValue}
+                            #{var.textValue, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -1004,7 +1004,7 @@
                                 <when test="var.operator.equals('LIKE')">LIKE</when>
                                 <otherwise><include refid="executionVariableOperator" /></otherwise>
                             </choose>
-                            #{var.textValue2}
+                            #{var.textValue2, jdbcType=NVARCHAR}
                             <choose>
                                 <when test="var.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                             </choose>
@@ -1012,7 +1012,7 @@
                         <if test="var.longValue != null">
                             and (V.LONG_
                             <include refid="executionVariableOperator" />
-                            #{var.longValue}
+                            #{var.longValue, jdbcType=BIGINT}
                             <if test="var.operator.equals('NOT_EQUALS') || var.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.LONG_ is null
                             </if>
@@ -1021,7 +1021,7 @@
                         <if test="var.doubleValue != null">
                             and (V.DOUBLE_
                             <include refid="executionVariableOperator" />
-                            #{var.doubleValue}
+                            #{var.doubleValue, jdbcType=DOUBLE}
                             <if test="var.operator.equals('NOT_EQUALS') || var.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                 or V.DOUBLE_ is null
                             </if>
@@ -1052,17 +1052,17 @@
         </if>
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=NVARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="parentScopeId != null">
         and EXISTS(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
-            LINK.SCOPE_ID_ = #{parentScopeId}
+            LINK.SCOPE_ID_ = #{parentScopeId, jdbcType=NVARCHAR}
             and LINK.REF_SCOPE_ID_ = RES.ID_
             and LINK.HIERARCHY_TYPE_ = 'parent'
         )
@@ -1071,7 +1071,7 @@
         and exists(
             select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
                 LINK.REF_SCOPE_ID_ = RES.ID_
-                and LINK.ROOT_SCOPE_ID_ = #{rootScopeId}
+                and LINK.ROOT_SCOPE_ID_ = #{rootScopeId, jdbcType=NVARCHAR}
         )
       </if>
       <choose>
@@ -1079,25 +1079,25 @@
           <!-- if dbIdentityUsed set true in process engine configuration -->
           <if test="userIdForCandidateAndAssignee != null">
             <if test="candidateGroups == null">
-              and (RES.ASSIGNEE_ = #{userIdForCandidateAndAssignee}
+              and (RES.ASSIGNEE_ = #{userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
                 or (
                 <if test="!ignoreAssigneeValue">
                     RES.ASSIGNEE_ is null and
                 </if>
                 exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                and (LINK.USER_ID_ = #{userIdForCandidateAndAssignee}
-                or LINK.GROUP_ID_ IN (select g.GROUP_ID_ from ${prefix}ACT_ID_MEMBERSHIP g where g.USER_ID_ = #{userIdForCandidateAndAssignee} )))))
+                and (LINK.USER_ID_ = #{userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
+                or LINK.GROUP_ID_ IN (select g.GROUP_ID_ from ${prefix}ACT_ID_MEMBERSHIP g where g.USER_ID_ = #{userIdForCandidateAndAssignee, jdbcType=NVARCHAR} )))))
             </if>
           </if>
           <!-- if dbIdentityUsed set false in process engine configuration of using custom session factory of GroupIdentityManager -->
           <if test="candidateGroups != null">
-            and (RES.ASSIGNEE_ = #{userIdForCandidateAndAssignee}
+            and (RES.ASSIGNEE_ = #{userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
               or (
               <if test="!ignoreAssigneeValue">
                 RES.ASSIGNEE_ is null and
               </if>
                 exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = #{userIdForCandidateAndAssignee}
+                and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = #{userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
                 <if test="candidateGroups != null &amp;&amp; !candidateGroups.empty">
                     or (
                     <foreach item="candidateGroupListItem" index="groupIndex" collection="safeCandidateGroups">
@@ -1105,9 +1105,9 @@
                         or
                         </if>
                         LINK.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="candidateGroupListItem"
+                        <foreach item="groupId" index="index" collection="candidateGroupListItem"
                              open="(" separator="," close=")">
-                          #{group}
+                          #{groupId, jdbcType=NVARCHAR}
                         </foreach>
                     </foreach>
                     )
@@ -1120,80 +1120,80 @@
         and
         <trim prefix="(" prefixOverrides="OR" suffix=")">
             <if test="orQueryObject.taskId != null">
-              RES.ID_ = #{orQueryObject.taskId}
+              RES.ID_ = #{orQueryObject.taskId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.taskIds != null &amp;&amp; !orQueryObject.taskIds.empty">
                 or RES.ID_ IN
                 <foreach item="taskId" index="index" collection="orQueryObject.taskIds"
                          open="(" separator="," close=")">
-                    #{taskId}
+                    #{taskId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="orQueryObject.name != null">
-              or RES.NAME_ = #{orQueryObject.name}
+              or RES.NAME_ = #{orQueryObject.name, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.nameLike != null">
-              or RES.NAME_ like #{orQueryObject.nameLike}${wildcardEscapeClause}
+              or RES.NAME_ like #{orQueryObject.nameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.nameLikeIgnoreCase != null">
-              or lower(RES.NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase})${wildcardEscapeClause}
+              or lower(RES.NAME_) like lower(#{orQueryObject.nameLikeIgnoreCase, jdbcType=NVARCHAR})${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.nameList != null &amp;&amp; !orQueryObject.nameList.empty">
               or RES.NAME_ IN
               <foreach item="name" index="index" collection="orQueryObject.nameList"
                       open="(" separator="," close=")">
-                #{name}
+                #{name, jdbcType=NVARCHAR}
               </foreach>
             </if>
             <if test="orQueryObject.nameListIgnoreCase != null &amp;&amp; !orQueryObject.nameListIgnoreCase.empty">
               or lower(RES.NAME_) IN
               <foreach item="name" index="index" collection="orQueryObject.nameListIgnoreCase"
                        open="(" separator="," close=")">
-                #{name}
+                #{name, jdbcType=NVARCHAR}
               </foreach>
             </if>
             <if test="orQueryObject.description != null">
-              or RES.DESCRIPTION_ = #{orQueryObject.description}
+              or RES.DESCRIPTION_ = #{orQueryObject.description, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.descriptionLike != null">
-              or RES.DESCRIPTION_ like #{orQueryObject.descriptionLike}${wildcardEscapeClause}
+              or RES.DESCRIPTION_ like #{orQueryObject.descriptionLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
              <if test="orQueryObject.descriptionLikeIgnoreCase != null">
-              or lower(RES.DESCRIPTION_) like #{orQueryObject.descriptionLikeIgnoreCase}${wildcardEscapeClause}
+              or lower(RES.DESCRIPTION_) like #{orQueryObject.descriptionLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.priority != null">
-              or RES.PRIORITY_ = #{orQueryObject.priority}
+              or RES.PRIORITY_ = #{orQueryObject.priority, jdbcType=INTEGER}
             </if>
             <if test="orQueryObject.minPriority != null">
-              or RES.PRIORITY_ &gt;= #{orQueryObject.minPriority}
+              or RES.PRIORITY_ &gt;= #{orQueryObject.minPriority, jdbcType=INTEGER}
             </if>
             <if test="orQueryObject.maxPriority != null">
-              or RES.PRIORITY_ &lt;= #{orQueryObject.maxPriority}
+              or RES.PRIORITY_ &lt;= #{orQueryObject.maxPriority, jdbcType=INTEGER}
             </if>
             <if test="orQueryObject.assignee != null">
-              or RES.ASSIGNEE_ = #{orQueryObject.assignee}
+              or RES.ASSIGNEE_ = #{orQueryObject.assignee, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.assigneeLike != null">
-              or RES.ASSIGNEE_ like #{orQueryObject.assigneeLike}${wildcardEscapeClause}
+              or RES.ASSIGNEE_ like #{orQueryObject.assigneeLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.assigneeLikeIgnoreCase != null">
-              or lower(RES.ASSIGNEE_) like #{orQueryObject.assigneeLikeIgnoreCase}${wildcardEscapeClause}
+              or lower(RES.ASSIGNEE_) like #{orQueryObject.assigneeLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.assigneeIds != null &amp;&amp; !orQueryObject.assigneeIds.empty">
 		      or RES.ASSIGNEE_ IN
 		      <foreach item="assigneeId" index="index" collection="orQueryObject.assigneeIds"
 		               open="(" separator="," close=")">
-		        #{assigneeId}
+		        #{assigneeId, jdbcType=NVARCHAR}
 		      </foreach>
 		    </if>
             <if test="orQueryObject.owner != null">
-              or RES.OWNER_ = #{orQueryObject.owner}
+              or RES.OWNER_ = #{orQueryObject.owner, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.ownerLike != null">
-              or RES.OWNER_ like #{orQueryObject.ownerLike}${wildcardEscapeClause}
+              or RES.OWNER_ like #{orQueryObject.ownerLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.ownerLikeIgnoreCase != null">
-              or RES.OWNER_ like #{orQueryObject.ownerLikeIgnoreCase}${wildcardEscapeClause}
+              or RES.OWNER_ like #{orQueryObject.ownerLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.unassigned">
               or RES.ASSIGNEE_ IS NULL
@@ -1205,16 +1205,16 @@
               or RES.DELEGATION_ IS NULL
             </if>
             <if test="orQueryObject.delegationState != null">
-              or RES.DELEGATION_ = #{orQueryObject.delegationStateString}
+              or RES.DELEGATION_ = #{orQueryObject.delegationStateString, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.processInstanceId != null">
-              or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId}
+              or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.processInstanceIds != null &amp;&amp; !orQueryObject.processInstanceIds.empty">
               or RES.PROC_INST_ID_ IN
-              <foreach item="processInstance" index="index" collection="orQueryObject.processInstanceIds"
+              <foreach item="processInstanceId" index="index" collection="orQueryObject.processInstanceIds"
                        open="(" separator="," close=")">
-                #{processInstance}
+                #{processInstanceId, jdbcType=NVARCHAR}
               </foreach>
             </if>
             <if test="orQueryObject.withoutProcessInstanceId">
@@ -1227,74 +1227,74 @@
                     where RES.PROC_INST_ID_ = E.ID_ and
                     <trim prefix="(" prefixOverrides="OR" suffix=")">
                         <if test="orQueryObject.processInstanceBusinessKey != null">
-                            or E.BUSINESS_KEY_ = #{orQueryObject.processInstanceBusinessKey}
+                            or E.BUSINESS_KEY_ = #{orQueryObject.processInstanceBusinessKey, jdbcType=NVARCHAR}
                         </if>
                         <if test="orQueryObject.processInstanceBusinessKeyLike != null">
-                            or E.BUSINESS_KEY_ like #{orQueryObject.processInstanceBusinessKeyLike}${wildcardEscapeClause}
+                            or E.BUSINESS_KEY_ like #{orQueryObject.processInstanceBusinessKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                         </if>
                         <if test="orQueryObject.processInstanceBusinessKeyLikeIgnoreCase != null">
-                            or lower(E.BUSINESS_KEY_) like #{orQueryObject.processInstanceBusinessKeyLikeIgnoreCase}${wildcardEscapeClause}
+                            or lower(E.BUSINESS_KEY_) like #{orQueryObject.processInstanceBusinessKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                         </if>
                     </trim>
                 )
             </if>
             <if test="orQueryObject.executionId != null">
-              or RES.EXECUTION_ID_ = #{orQueryObject.executionId}
+              or RES.EXECUTION_ID_ = #{orQueryObject.executionId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.scopeId != null">
-              or RES.SCOPE_ID_ = #{orQueryObject.scopeId}
+              or RES.SCOPE_ID_ = #{orQueryObject.scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.subScopeId != null">
-              or RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId}
+              or RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.scopeType != null">
-              or RES.SCOPE_TYPE_ = #{orQueryObject.scopeType}
+              or RES.SCOPE_TYPE_ = #{orQueryObject.scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.scopeDefinitionId != null">
-              or RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId}
+              or RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.withoutScopeId">
               or RES.SCOPE_ID_ IS NULL
             </if>
             <if test="orQueryObject.propagatedStageInstanceId != null">
-              or RES.PROPAGATED_STAGE_INST_ID_ = #{orQueryObject.propagatedStageInstanceId}
+              or RES.PROPAGATED_STAGE_INST_ID_ = #{orQueryObject.propagatedStageInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.processInstanceIdWithChildren != null">
               or exists(select ELINK.ID_ from ${prefix}ACT_RU_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-                ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
+                ELINK.SCOPE_ID_ = #{processInstanceIdWithChildren, jdbcType=NVARCHAR} AND ELINK.SCOPE_TYPE_ = 'bpmn' and
                 ELINK.REF_SCOPE_ID_ = RES.ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
             </if>
             <if test="orQueryObject.caseInstanceIdWithChildren != null">
               or exists(select ELINK.ID_ from ${prefix}ACT_RU_ENTITYLINK ELINK where ELINK.LINK_TYPE_ = 'child' and
-                ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
+                ELINK.SCOPE_ID_ = #{caseInstanceIdWithChildren, jdbcType=VARCHAR} AND ELINK.SCOPE_TYPE_ = 'cmmn' and
                 ELINK.REF_SCOPE_ID_ = RES.ID_ and ELINK.REF_SCOPE_TYPE_ = 'task')
             </if>
             <if test="orQueryObject.createTime != null">
-              or RES.CREATE_TIME_ = #{orQueryObject.createTime}
+              or RES.CREATE_TIME_ = #{orQueryObject.createTime, jdbcType=TIMESTAMP}
             </if>
             <if test="orQueryObject.createTimeBefore != null">
-              or RES.CREATE_TIME_ &lt; #{orQueryObject.createTimeBefore}
+              or RES.CREATE_TIME_ &lt; #{orQueryObject.createTimeBefore, jdbcType=TIMESTAMP}
             </if>
             <if test="orQueryObject.createTimeAfter != null">
-              or RES.CREATE_TIME_ &gt; #{orQueryObject.createTimeAfter}
+              or RES.CREATE_TIME_ &gt; #{orQueryObject.createTimeAfter, jdbcType=TIMESTAMP}
             </if>
             <if test="orQueryObject.key != null">
-              or RES.TASK_DEF_KEY_ = #{orQueryObject.key}
+              or RES.TASK_DEF_KEY_ = #{orQueryObject.key, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.keyLike != null">
-              or RES.TASK_DEF_KEY_ like #{orQueryObject.keyLike}${wildcardEscapeClause}
+              or RES.TASK_DEF_KEY_ like #{orQueryObject.keyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.keys != null and !orQueryObject.keys.empty">
                 or RES.TASK_DEF_KEY_ in
-                <foreach item="item" index="index" collection="orQueryObject.keys" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="key" index="index" collection="orQueryObject.keys" open="(" separator="," close=")">
+                    #{key, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="orQueryObject.processDefinitionId != null">
-              or RES.PROC_DEF_ID_ = #{orQueryObject.processDefinitionId}
+              or RES.PROC_DEF_ID_ = #{orQueryObject.processDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.taskDefinitionId != null">
-              or RES.TASK_DEF_ID_ = #{orQueryObject.taskDefinitionId}
+              or RES.TASK_DEF_ID_ = #{orQueryObject.taskDefinitionId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.processDefinitionKey != null || orQueryObject.processDefinitionKeyLike != null || orQueryObject.processDefinitionKeyLikeIgnoreCase != null || orQueryObject.processDefinitionName != null || orQueryObject.processDefinitionNameLike != null || (orQueryObject.processCategoryInList != null &amp;&amp; !orQueryObject.processCategoryInList.empty) || (orQueryObject.processCategoryNotInList != null &amp;&amp; !orQueryObject.processCategoryNotInList.empty) || (orQueryObject.processDefinitionKeys != null &amp;&amp; !orQueryObject.processDefinitionKeys.empty) || orQueryObject.deploymentId != null || (orQueryObject.deploymentIds != null &amp;&amp; !orQueryObject.deploymentIds.empty)">
                 or exists (
@@ -1303,48 +1303,48 @@
                     where RES.PROC_DEF_ID_ = D.ID_ and
                     <trim prefix="(" prefixOverrides="OR" suffix=")">
                         <if test="orQueryObject.processDefinitionKey != null">
-                            or D.KEY_ = #{orQueryObject.processDefinitionKey}
+                            or D.KEY_ = #{orQueryObject.processDefinitionKey, jdbcType=NVARCHAR}
                         </if>
                         <if test="orQueryObject.processDefinitionKeyLike != null">
-                            or D.KEY_ like #{orQueryObject.processDefinitionKeyLike}${wildcardEscapeClause}
+                            or D.KEY_ like #{orQueryObject.processDefinitionKeyLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                         </if>
                         <if test="orQueryObject.processDefinitionKeyLikeIgnoreCase != null">
-                            or lower(D.KEY_) like #{orQueryObject.processDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                            or lower(D.KEY_) like #{orQueryObject.processDefinitionKeyLikeIgnoreCase, jdbcType=NVARCHAR}${wildcardEscapeClause}
                         </if>
                         <if test="orQueryObject.processDefinitionKeys != null &amp;&amp; !orQueryObject.processDefinitionKeys.empty">
                             or D.KEY_ in
-                            <foreach item="item" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
-                                #{item}
+                            <foreach item="processDefinitionKey" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
+                                #{processDefinitionKey, jdbcType=NVARCHAR}
                             </foreach>
                         </if>
                         <if test="orQueryObject.processDefinitionName != null">
-                            or D.NAME_ = #{orQueryObject.processDefinitionName}
+                            or D.NAME_ = #{orQueryObject.processDefinitionName, jdbcType=NVARCHAR}
                         </if>
                         <if test="orQueryObject.processDefinitionNameLike != null">
-                            or D.NAME_ like #{orQueryObject.processDefinitionNameLike}${wildcardEscapeClause}
+                            or D.NAME_ like #{orQueryObject.processDefinitionNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
                         </if>
                         <if test="orQueryObject.processCategoryInList != null &amp;&amp; !orQueryObject.processCategoryInList.empty">
                             or D.CATEGORY_ IN
                             <foreach item="processCategory" index="index" collection="orQueryObject.processCategoryInList"
                                      open="(" separator="," close=")">
-                                #{processCategory}
+                                #{processCategory, jdbcType=NVARCHAR}
                             </foreach>
                         </if>
                         <if test="orQueryObject.processCategoryNotInList != null &amp;&amp; !orQueryObject.processCategoryNotInList.empty">
                             or D.CATEGORY_ NOT IN
                             <foreach item="processCategory" index="index" collection="orQueryObject.processCategoryNotInList"
                                      open="(" separator="," close=")">
-                                #{processCategory}
+                                #{processCategory, jdbcType=NVARCHAR}
                             </foreach>
                         </if>
                         <if test="orQueryObject.deploymentId != null">
-                            or D.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId}
+                            or D.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId, jdbcType=NVARCHAR}
                         </if>
                         <if test="orQueryObject.deploymentIds != null &amp;&amp; !orQueryObject.deploymentIds.empty">
                             or D.DEPLOYMENT_ID_ IN
-                            <foreach item="deployment" index="index" collection="orQueryObject.deploymentIds"
+                            <foreach item="deploymentId" index="index" collection="orQueryObject.deploymentIds"
                                      open="(" separator="," close=")">
-                                #{deployment}
+                                #{deploymentId, jdbcType=NVARCHAR}
                             </foreach>
                         </if>
                     </trim>
@@ -1357,60 +1357,60 @@
                     where RES.SCOPE_DEFINITION_ID_ = CD.ID_ and
                     <trim prefix="(" prefixOverrides="OR" suffix=")">
                         <if test="orQueryObject.caseDefinitionKey != null">
-                            or CD.KEY_ = #{orQueryObject.caseDefinitionKey}
+                            or CD.KEY_ = #{orQueryObject.caseDefinitionKey, jdbcType=VARCHAR}
                         </if>
                         <if test="orQueryObject.caseDefinitionKeyLike != null">
-                            or CD.KEY_ like #{orQueryObject.caseDefinitionKeyLike}${wildcardEscapeClause}
+                            or CD.KEY_ like #{orQueryObject.caseDefinitionKeyLike, jdbcType=VARCHAR}${wildcardEscapeClause}
                         </if>
                         <if test="orQueryObject.caseDefinitionKeyLikeIgnoreCase != null">
-                            or lower(CD.KEY_) like #{orQueryObject.caseDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
+                            or lower(CD.KEY_) like #{orQueryObject.caseDefinitionKeyLikeIgnoreCase, jdbcType=VARCHAR}${wildcardEscapeClause}
                         </if>
                         <if test="orQueryObject.caseDefinitionKeys != null &amp;&amp; !orQueryObject.caseDefinitionKeys.empty">
                             or CD.KEY_ in
-                            <foreach item="item" index="index" collection="orQueryObject.caseDefinitionKeys" open="(" separator="," close=")">
-                                #{item}
+                            <foreach item="caseDefinitionKey" index="index" collection="orQueryObject.caseDefinitionKeys" open="(" separator="," close=")">
+                                #{caseDefinitionKey, jdbcType=VARCHAR}
                             </foreach>
                         </if>
                         <if test="orQueryObject.cmmnDeploymentId != null">
-                            or CD.DEPLOYMENT_ID_ = #{orQueryObject.cmmnDeploymentId}
+                            or CD.DEPLOYMENT_ID_ = #{orQueryObject.cmmnDeploymentId, jdbcType=VARCHAR}
                         </if>
                         <if test="orQueryObject.cmmnDeploymentIds != null &amp;&amp; !orQueryObject.cmmnDeploymentIds.empty">
                             or CD.DEPLOYMENT_ID_ IN
-                            <foreach item="deployment" index="index" collection="orQueryObject.cmmnDeploymentIds"
+                            <foreach item="cmmnDeploymentId" index="index" collection="orQueryObject.cmmnDeploymentIds"
                                      open="(" separator="," close=")">
-                                #{deployment}
+                                #{cmmnDeploymentId, jdbcType=VARCHAR}
                             </foreach>
                         </if>
                     </trim>
                 )
             </if>
             <if test="orQueryObject.dueDate != null">
-              or RES.DUE_DATE_ = #{orQueryObject.dueDate}
+              or RES.DUE_DATE_ = #{orQueryObject.dueDate, jdbcType=TIMESTAMP}
             </if>
             <if test="orQueryObject.dueBefore != null">
-              or (RES.DUE_DATE_ &lt; #{orQueryObject.dueBefore} and RES.DUE_DATE_ is not null)
+              or (RES.DUE_DATE_ &lt; #{orQueryObject.dueBefore, jdbcType=TIMESTAMP} and RES.DUE_DATE_ is not null)
             </if>
             <if test="orQueryObject.dueAfter != null">
-              or (RES.DUE_DATE_ &gt; #{orQueryObject.dueAfter} and RES.DUE_DATE_ is not null)
+              or (RES.DUE_DATE_ &gt; #{orQueryObject.dueAfter, jdbcType=TIMESTAMP} and RES.DUE_DATE_ is not null)
             </if>
             <if test="orQueryObject.withoutDueDate">
               or RES.DUE_DATE_ is null
             </if>
             <if test="orQueryObject.category != null">
-              or RES.CATEGORY_ = #{orQueryObject.category}
+              or RES.CATEGORY_ = #{orQueryObject.category, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.categoryInList != null &amp;&amp; !orQueryObject.categoryInList.empty">
                 or RES.CATEGORY_ IN
-                <foreach item="taskCategory" index="index" collection="orQueryObject.categoryInList"
+                <foreach item="category" index="index" collection="orQueryObject.categoryInList"
                          open="(" separator="," close=")">
-                    #{taskCategory}
+                    #{category, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="orQueryObject.categoryNotInList != null &amp;&amp; !orQueryObject.categoryNotInList.empty">
                 or RES.CATEGORY_ NOT IN
-                <foreach item="taskCategory" index="index" collection="orQueryObject.categoryNotInList"
+                <foreach item="category" index="index" collection="orQueryObject.categoryNotInList"
                          open="(" separator="," close=")">
-                    #{taskCategory}
+                    #{category, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="orQueryObject.withoutCategory">
@@ -1420,7 +1420,7 @@
               or RES.FORM_KEY_ IS NOT NULL
             </if>
             <if test="orQueryObject.formKey != null">
-                or RES.FORM_KEY_ = #{orQueryObject.formKey}
+                or RES.FORM_KEY_ = #{orQueryObject.formKey, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.excludeSubtasks">
               or RES.PARENT_TASK_ID_ IS NULL
@@ -1435,7 +1435,7 @@
                     and
                     (
                     <if test="orQueryObject.candidateUser != null">
-                      LINK.USER_ID_ = #{orQueryObject.candidateUser}
+                      LINK.USER_ID_ = #{orQueryObject.candidateUser, jdbcType=NVARCHAR}
                     </if>
                     <if test="orQueryObject.candidateUser != null &amp;&amp; orQueryObject.candidateGroups != null &amp;&amp; !orQueryObject.candidateGroups.empty">
                       or
@@ -1447,9 +1447,9 @@
                             or
                             </if>
                             LINK.GROUP_ID_ IN
-                            <foreach item="group" index="index" collection="candidateGroupListItem"
+                            <foreach item="groupId" index="index" collection="candidateGroupListItem"
                                  open="(" separator="," close=")">
-                              #{group}
+                              #{groupId, jdbcType=NVARCHAR}
                             </foreach>
                         </foreach>
                         )
@@ -1460,9 +1460,9 @@
             </if>
             <if test="orQueryObject.involvedUser != null">
               or (
-                exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.USER_ID_ = #{orQueryObject.involvedUser} and LINK.TASK_ID_ = RES.ID_)
-                or RES.ASSIGNEE_ = #{orQueryObject.involvedUser}
-                or RES.OWNER_ = #{orQueryObject.involvedUser}
+                exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.USER_ID_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR} and LINK.TASK_ID_ = RES.ID_)
+                or RES.ASSIGNEE_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR}
+                or RES.OWNER_ = #{orQueryObject.involvedUser, jdbcType=NVARCHAR}
                 )
             </if>
             <if test="orQueryObject.involvedGroups != null">
@@ -1474,9 +1474,9 @@
                         or
                         </if>
                         LINK.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="involvedGroupListItem"
+                        <foreach item="groupId" index="index" collection="involvedGroupListItem"
                               open="(" separator="," close=")">
-                          #{group}
+                          #{groupId, jdbcType=NVARCHAR}
                         </foreach>
                     </foreach>
                     )
@@ -1485,7 +1485,7 @@
             </if>
             <if test="orQueryObject.parentScopeId != null">
                 or EXISTS(select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
-                    LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId}
+                    LINK.SCOPE_ID_ = #{orQueryObject.parentScopeId, jdbcType=NVARCHAR}
                     and LINK.REF_SCOPE_ID_ = RES.ID_
                     and LINK.HIERARCHY_TYPE_ = 'parent'
                 )
@@ -1494,7 +1494,7 @@
                 or exists(
                     select 1 from ${prefix}ACT_RU_ENTITYLINK LINK where
                         LINK.REF_SCOPE_ID_ = RES.ID_
-                        and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId}
+                        and LINK.ROOT_SCOPE_ID_ = #{orQueryObject.rootScopeId, jdbcType=NVARCHAR}
                 )
             </if>
             <foreach item="var" collection="orQueryObject.queryVariableValues" index="index">
@@ -1503,14 +1503,14 @@
                 <choose>
                     <when test="var.operator.equals('EXISTS')">
                         and EXISTS (
-                            select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
+                            select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name, jdbcType=NVARCHAR}
                         <if test="!var.local">
                             <choose>
                                 <when test="var.scopeType == null or var.scopeType == 'bpmn'">
                                     and RES.PROC_INST_ID_ = PROC_INST_ID_
                                 </when>
                                 <otherwise>
-                                    and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType}
+                                    and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType, jdbcType=NVARCHAR}
                                 </otherwise>
                             </choose>
                             and TASK_ID_ is null
@@ -1522,14 +1522,14 @@
                     </when>
                     <when test="var.operator.equals('NOT_EXISTS')">
                         and NOT EXISTS (
-                            select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
+                            select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name, jdbcType=NVARCHAR}
                         <if test="!var.local">
                             <choose>
                                 <when test="var.scopeType == null or var.scopeType == 'bpmn'">
                                     and RES.PROC_INST_ID_ = PROC_INST_ID_
                                 </when>
                                 <otherwise>
-                                    and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType}
+                                    and RES.SCOPE_ID_ = SCOPE_ID_ and SCOPE_TYPE_ = #{var.scopeType, jdbcType=NVARCHAR}
                                 </otherwise>
                             </choose>
                             and TASK_ID_ is null
@@ -1550,7 +1550,7 @@
                                             and RES.PROC_INST_ID_ = V.PROC_INST_ID_
                                         </when>
                                         <otherwise>
-                                            and RES.SCOPE_ID_ = V.SCOPE_ID_ and V.SCOPE_TYPE_ = #{var.scopeType}
+                                            and RES.SCOPE_ID_ = V.SCOPE_ID_ and V.SCOPE_TYPE_ = #{var.scopeType, jdbcType=NVARCHAR}
                                         </otherwise>
                                     </choose>
                                     and V.TASK_ID_ is null
@@ -1560,13 +1560,13 @@
                                 </if>
                                 <if test="var.name != null">
                                     <!-- Match-all variable-names when name is null -->
-                                    and V.NAME_= #{var.name}
+                                    and V.NAME_= #{var.name, jdbcType=NVARCHAR}
                                 </if>
                                 <if test="var.name == null">
                                     and V.NAME_ is not null
                                 </if>
                                 <if test="var.needsTypeCheck()">
-                                    and V.TYPE_ = #{var.type}
+                                    and V.TYPE_ = #{var.type, jdbcType=NVARCHAR}
                                 </if>
                                 <!-- Variable value -->
                                 <if test="var.textValue != null &amp;&amp; var.longValue == null &amp;&amp; var.doubleValue == null">
@@ -1582,7 +1582,7 @@
                                         <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
                                         <otherwise><include refid="executionVariableOperator" /></otherwise>
                                     </choose>
-                                    #{var.textValue}
+                                    #{var.textValue, jdbcType=NVARCHAR}
                                     <choose>
                                         <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                                     </choose>
@@ -1597,7 +1597,7 @@
                                         <when test="var.operator.equals('LIKE')">LIKE</when>
                                         <otherwise><include refid="executionVariableOperator" /></otherwise>
                                     </choose>
-                                    #{var.textValue2}
+                                    #{var.textValue2, jdbcType=NVARCHAR}
                                     <choose>
                                         <when test="var.operator.equals('LIKE')">${wildcardEscapeClause}</when>
                                     </choose>
@@ -1605,7 +1605,7 @@
                                 <if test="var.longValue != null">
                                     and (V.LONG_
                                     <include refid="executionVariableOperator" />
-                                    #{var.longValue}
+                                    #{var.longValue, jdbcType=BIGINT}
                                     <if test="var.operator.equals('NOT_EQUALS') || var.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                         or V.LONG_ is null
                                     </if>
@@ -1614,7 +1614,7 @@
                                 <if test="var.doubleValue != null">
                                     and (V}.DOUBLE_
                                     <include refid="executionVariableOperator" />
-                                    #{var.doubleValue}
+                                    #{var.doubleValue, jdbcType=DOUBLE}
                                     <if test="var.operator.equals('NOT_EQUALS') || var.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                                         or V.DOUBLE_ is null
                                     </if>
@@ -1646,10 +1646,10 @@
               </if>
             </if>
             <if test="orQueryObject.tenantId != null">
-              or RES.TENANT_ID_ = #{orQueryObject.tenantId}
+              or RES.TENANT_ID_ = #{orQueryObject.tenantId, jdbcType=NVARCHAR}
             </if>
             <if test="orQueryObject.tenantIdLike != null">
-              or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike}${wildcardEscapeClause}
+              or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
             <if test="orQueryObject.withoutTenantId">
               or (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
@@ -1659,25 +1659,25 @@
                 <!-- if dbIdentityUsed set true in process engine configuration -->
                 <if test="orQueryObject.userIdForCandidateAndAssignee != null">
                   <if test="orQueryObject.candidateGroups == null">
-                    or (RES.ASSIGNEE_ = #{orQueryObject.userIdForCandidateAndAssignee}
+                    or (RES.ASSIGNEE_ = #{orQueryObject.userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
                         or (
                         <if test="!orQueryObject.ignoreAssigneeValue">
                             RES.ASSIGNEE_ is null and
                         </if>
                         exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                        and (LINK.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee}
-                        or LINK.GROUP_ID_ IN (select g.GROUP_ID_ from ${prefix}ACT_ID_MEMBERSHIP g where g.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee} )))))
+                        and (LINK.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
+                        or LINK.GROUP_ID_ IN (select g.GROUP_ID_ from ${prefix}ACT_ID_MEMBERSHIP g where g.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee, jdbcType=NVARCHAR} )))))
                   </if>
                 </if>
                 <!-- if dbIdentityUsed set false in process engine configuration of using custom session factory of GroupIdentityManager -->
                 <if test="orQueryObject.candidateGroups != null">
-                  or (RES.ASSIGNEE_ = #{orQueryObject.userIdForCandidateAndAssignee}
+                  or (RES.ASSIGNEE_ = #{orQueryObject.userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
                   or (
                     <if test="!orQueryObject.ignoreAssigneeValue">
                         RES.ASSIGNEE_ is null and
                     </if>
                     exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                    and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee}
+                    and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee, jdbcType=NVARCHAR}
                     <if test="orQueryObject.candidateGroups != null &amp;&amp; !orQueryObject.candidateGroups.empty">
                         or (
                         <foreach item="candidateGroupListItem" index="groupIndex" collection="orQueryObject.safeCandidateGroups">
@@ -1685,9 +1685,9 @@
                             or
                             </if>
                             LINK.GROUP_ID_ IN
-                            <foreach item="group" index="index" collection="candidateGroupListItem"
+                            <foreach item="groupId" index="index" collection="candidateGroupListItem"
                                  open="(" separator="," close=")">
-                              #{group}
+                              #{groupId, jdbcType=NVARCHAR}
                             </foreach>
                         </foreach>
                         )
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml
index 68f8683c1ae..b03c9b67ef9 100644
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml
+++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml
@@ -24,22 +24,22 @@
         insert into ${prefix}ACT_HI_VARINST (ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_,
             BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_, META_INFO_, CREATE_TIME_, LAST_UPDATED_TIME_)
         values (
-            #{id, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{taskId, jdbcType=VARCHAR},
-            #{variableName, jdbcType=VARCHAR},
-            #{revision, jdbcType=VARCHAR},
-            #{variableType, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
+            #{id, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{taskId, jdbcType=NVARCHAR},
+            #{variableName, jdbcType=NVARCHAR},
+            #{revision, jdbcType=INTEGER},
+            #{variableType, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
             #{byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
             #{doubleValue, jdbcType=DOUBLE},
             #{longValue, jdbcType=BIGINT},
-            #{textValue, jdbcType=VARCHAR},
-            #{textValue2, jdbcType=VARCHAR},
-            #{metaInfo, jdbcType=VARCHAR},
+            #{textValue, jdbcType=NVARCHAR},
+            #{textValue2, jdbcType=NVARCHAR},
+            #{metaInfo, jdbcType=NVARCHAR},
             #{createTime, jdbcType=TIMESTAMP},
             #{lastUpdatedTime, jdbcType=TIMESTAMP}
         )
@@ -49,54 +49,54 @@
         insert into ${prefix}ACT_HI_VARINST (ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, 
             BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_, META_INFO_, CREATE_TIME_, LAST_UPDATED_TIME_)
         values
-        <foreach collection="list" item="historicVariable" index="index" separator=",">
+        <foreach collection="list" item="historicVariableInstance" index="index" separator=",">
             (
-                #{historicVariable.id, jdbcType=VARCHAR},
-                #{historicVariable.processInstanceId, jdbcType=VARCHAR},
-                #{historicVariable.executionId, jdbcType=VARCHAR},
-                #{historicVariable.taskId, jdbcType=VARCHAR},
-                #{historicVariable.variableName, jdbcType=VARCHAR},
-                #{historicVariable.revision, jdbcType=VARCHAR},
-                #{historicVariable.variableType, jdbcType=VARCHAR},
-                #{historicVariable.scopeId, jdbcType=VARCHAR},
-                #{historicVariable.subScopeId, jdbcType=VARCHAR},
-                #{historicVariable.scopeType, jdbcType=VARCHAR},
-                #{historicVariable.byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
-                #{historicVariable.doubleValue, jdbcType=DOUBLE},
-                #{historicVariable.longValue, jdbcType=BIGINT},
-                #{historicVariable.textValue, jdbcType=VARCHAR},
-                #{historicVariable.textValue2, jdbcType=VARCHAR},
-                #{historicVariable.metaInfo, jdbcType=VARCHAR},
-                #{historicVariable.createTime, jdbcType=TIMESTAMP},
-                #{historicVariable.lastUpdatedTime, jdbcType=TIMESTAMP}
+                #{historicVariableInstance.id, jdbcType=NVARCHAR},
+                #{historicVariableInstance.processInstanceId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.executionId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.taskId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.variableName, jdbcType=NVARCHAR},
+                #{historicVariableInstance.revision, jdbcType=INTEGER},
+                #{historicVariableInstance.variableType, jdbcType=NVARCHAR},
+                #{historicVariableInstance.scopeId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.subScopeId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.scopeType, jdbcType=NVARCHAR},
+                #{historicVariableInstance.byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
+                #{historicVariableInstance.doubleValue, jdbcType=DOUBLE},
+                #{historicVariableInstance.longValue, jdbcType=BIGINT},
+                #{historicVariableInstance.textValue, jdbcType=NVARCHAR},
+                #{historicVariableInstance.textValue2, jdbcType=NVARCHAR},
+                #{historicVariableInstance.metaInfo, jdbcType=NVARCHAR},
+                #{historicVariableInstance.createTime, jdbcType=TIMESTAMP},
+                #{historicVariableInstance.lastUpdatedTime, jdbcType=TIMESTAMP}
             )
         </foreach>
     </insert>
 
     <insert id="bulkInsertHistoricVariableInstance" databaseId="oracle" parameterType="java.util.List">
         INSERT ALL
-        <foreach collection="list" item="historicVariable" index="index">
+        <foreach collection="list" item="historicVariableInstance" index="index">
             INTO ${prefix}ACT_HI_VARINST (ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, 
                 BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_, META_INFO_, CREATE_TIME_, LAST_UPDATED_TIME_) VALUES
             (
-                #{historicVariable.id, jdbcType=VARCHAR},
-                #{historicVariable.processInstanceId, jdbcType=VARCHAR},
-                #{historicVariable.executionId, jdbcType=VARCHAR},
-                #{historicVariable.taskId, jdbcType=VARCHAR},
-                #{historicVariable.variableName, jdbcType=VARCHAR},
-                #{historicVariable.revision, jdbcType=VARCHAR},
-                #{historicVariable.variableType, jdbcType=VARCHAR},
-                #{historicVariable.scopeId, jdbcType=VARCHAR},
-                #{historicVariable.subScopeId, jdbcType=VARCHAR},
-                #{historicVariable.scopeType, jdbcType=VARCHAR},
-                #{historicVariable.byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
-                #{historicVariable.doubleValue, jdbcType=DOUBLE},
-                #{historicVariable.longValue, jdbcType=BIGINT},
-                #{historicVariable.textValue, jdbcType=VARCHAR},
-                #{historicVariable.textValue2, jdbcType=VARCHAR},
-                #{historicVariable.metaInfo, jdbcType=VARCHAR},
-                #{historicVariable.createTime, jdbcType=TIMESTAMP},
-                #{historicVariable.lastUpdatedTime, jdbcType=TIMESTAMP}
+                #{historicVariableInstance.id, jdbcType=NVARCHAR},
+                #{historicVariableInstance.processInstanceId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.executionId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.taskId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.variableName, jdbcType=NVARCHAR},
+                #{historicVariableInstance.revision, jdbcType=INTEGER},
+                #{historicVariableInstance.variableType, jdbcType=NVARCHAR},
+                #{historicVariableInstance.scopeId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.subScopeId, jdbcType=NVARCHAR},
+                #{historicVariableInstance.scopeType, jdbcType=NVARCHAR},
+                #{historicVariableInstance.byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
+                #{historicVariableInstance.doubleValue, jdbcType=DOUBLE},
+                #{historicVariableInstance.longValue, jdbcType=BIGINT},
+                #{historicVariableInstance.textValue, jdbcType=NVARCHAR},
+                #{historicVariableInstance.textValue2, jdbcType=NVARCHAR},
+                #{historicVariableInstance.metaInfo, jdbcType=NVARCHAR},
+                #{historicVariableInstance.createTime, jdbcType=TIMESTAMP},
+                #{historicVariableInstance.lastUpdatedTime, jdbcType=TIMESTAMP}
             )
         </foreach>
         SELECT * FROM dual
@@ -109,7 +109,7 @@
         <set>
             REV_ = #{revisionNext, jdbcType=INTEGER},
             <if test="originalPersistentState.name != name">
-                NAME_ = #{name, jdbcType=VARCHAR},
+                NAME_ = #{name, jdbcType=NVARCHAR},
             </if>
             <if test="(byteArrayRef != null and originalPersistentState.byteArrayRef == null) or (byteArrayRef == null and originalPersistentState.byteArrayRef != null) or (byteArrayRef != null and originalPersistentState.byteArrayRef != byteArrayRef.id)">
                 BYTEARRAY_ID_ = #{byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
@@ -121,35 +121,35 @@
                 LONG_ = #{longValue, jdbcType=BIGINT},
             </if>
             <if test="originalPersistentState.textValue != textValue">
-                TEXT_ = #{textValue, jdbcType=VARCHAR},
+                TEXT_ = #{textValue, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.textValue2 != textValue2">
-                TEXT2_ = #{textValue2, jdbcType=VARCHAR},
+                TEXT2_ = #{textValue2, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.metaInfo != metaInfo">
-                META_INFO_ = #{metaInfo, jdbcType=VARCHAR},
+                META_INFO_ = #{metaInfo, jdbcType=NVARCHAR},
             </if>
             <if test="(originalPersistentState.typeName == null and variableType != null) or (originalPersistentState.typeName != null and variableType == null) or (originalPersistentState.typeName != variableType.typeName)">
-                VAR_TYPE_ = #{variableType, jdbcType=VARCHAR},
+                VAR_TYPE_ = #{variableType, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.lastUpdatedTime != lastUpdatedTime">
                 LAST_UPDATED_TIME_ = #{lastUpdatedTime, jdbcType=TIMESTAMP},
             </if>
         </set>
-        where ID_ = #{id, jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <!-- HISTORIC PROCESS VARIABLE DELETE -->
 
     <delete id="deleteHistoricVariableInstance" parameterType="org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityImpl">
-        delete from ${prefix}ACT_HI_VARINST where ID_ = #{id} and REV_ = #{revision}
+        delete from ${prefix}ACT_HI_VARINST where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
 
     <delete id="bulkDeleteHistoricVariableInstance" parameterType="java.util.Collection">
         delete from ${prefix}ACT_HI_VARINST where
         <foreach item="variable" collection="list" index="index" separator=" or ">
-            ID_ = #{variable.id, jdbcType=VARCHAR}
+            ID_ = #{variable.id, jdbcType=NVARCHAR}
         </foreach>
     </delete>
     
@@ -164,8 +164,8 @@
                 or
                 </if>
                 VARINST.PROC_INST_ID_ in 
-                <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-                  #{item}
+                <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+                  #{processInstanceId, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
         )
@@ -178,8 +178,8 @@
             or
             </if>
             PROC_INST_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="processInstanceId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{processInstanceId, jdbcType=NVARCHAR}
             </foreach>
         </foreach>
     </delete>
@@ -195,8 +195,8 @@
                 or
                 </if>
                 VARINST.TASK_ID_ in 
-                <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-                  #{item}
+                <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+                  #{taskId, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>
         )
@@ -209,8 +209,8 @@
             or
             </if>
             TASK_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="taskId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{taskId, jdbcType=NVARCHAR}
             </foreach>
         </foreach>
     </delete>
@@ -226,11 +226,11 @@
                 or
                 </if>
                 VARINST.SCOPE_ID_ in 
-                <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-                  #{item}
+                <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+                  #{scopeId, jdbcType=NVARCHAR}
                 </foreach>
             </foreach>)
-            and VARINST.SCOPE_TYPE_ = #{scopeType}
+            and VARINST.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
         )
     </delete>
     
@@ -241,11 +241,11 @@
             or
             </if>
             SCOPE_ID_ in 
-            <foreach item="item" index="index" collection="listItem" open="(" separator="," close=")">
-              #{item}
+            <foreach item="scopeId" index="index" collection="listItem" open="(" separator="," close=")">
+              #{scopeId, jdbcType=NVARCHAR}
             </foreach>
         </foreach>)
-        and SCOPE_TYPE_ = #{scopeType}
+        and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
     </delete>
     
     <delete id="bulkDeleteHistoricVariableInstancesForNonExistingProcessInstances" parameterType="java.util.Map">
@@ -323,21 +323,21 @@
 
     <!-- HISTORIC PROCESS VARIABLE RESULTMAP -->
     <resultMap id="historicProcessVariableResultMap" type="org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-        <result property="name" column="NAME_" javaType="String" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+        <result property="name" column="NAME_" javaType="String" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR" />
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR" />
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR" />
+        <result property="variableType" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR" />
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR" />
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR" />
         <result property="byteArrayRef" column="BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler" />
         <result property="doubleValue" column="DOUBLE_" jdbcType="DOUBLE" />
-        <result property="textValue" column="TEXT_" jdbcType="VARCHAR" />
-        <result property="textValue2" column="TEXT2_" jdbcType="VARCHAR" />
-        <result property="metaInfo" column="META_INFO_" jdbcType="VARCHAR" />
+        <result property="textValue" column="TEXT_" jdbcType="NVARCHAR" />
+        <result property="textValue2" column="TEXT2_" jdbcType="NVARCHAR" />
+        <result property="metaInfo" column="META_INFO_" jdbcType="NVARCHAR" />
         <result property="longValue" column="LONG_" jdbcType="BIGINT" />
         <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
         <result property="lastUpdatedTime" column="LAST_UPDATED_TIME_" jdbcType="TIMESTAMP" />
@@ -363,27 +363,27 @@
         from ${prefix}ACT_HI_VARINST RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="processInstanceId != null">
-                and RES.PROC_INST_ID_ = #{processInstanceId}
+                and RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="executionIds != null and !executionIds.empty">
                 and RES.EXECUTION_ID_ in
-                <foreach item="item" index="index" collection="executionIds" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="executionId" index="index" collection="executionIds" open="(" separator="," close=")">
+                    #{executionId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="taskId != null">
-                and RES.TASK_ID_ = #{taskId}
+                and RES.TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
             </if>
             <if test="taskIds != null and !taskIds.empty">
                 and RES.TASK_ID_ in
-                <foreach item="item" index="index" collection="taskIds" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="taskId" index="index" collection="taskIds" open="(" separator="," close=")">
+                    #{taskId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="excludeTaskRelated">
@@ -395,25 +395,25 @@
                 and RES.SUB_SCOPE_ID_ is NULL
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="variableName != null">
-                and RES.NAME_ = #{variableName}
+                and RES.NAME_ = #{variableName, jdbcType=NVARCHAR}
             </if>
             <if test="variableNameLike != null">
-                and RES.NAME_ like #{variableNameLike}${wildcardEscapeClause}
+                and RES.NAME_ like #{variableNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
 
             <!-- PLEASE NOTE: If you change anything have a look into the Execution, the same query object is used there! -->
             <if test="queryVariableValue != null">
                 <if test="queryVariableValue.needsTypeCheck()">
-                    and RES.VAR_TYPE_ = #{queryVariableValue.type}
+                    and RES.VAR_TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                 </if>
                 <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                     and (RES.TEXT_
@@ -423,7 +423,7 @@
                             <include refid="executionVariableOperator" />
                         </otherwise>
                     </choose>
-                    #{queryVariableValue.textValue}
+                    #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                     <choose>
                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                     </choose>
@@ -440,7 +440,7 @@
                             <include refid="executionVariableOperator" />
                         </otherwise>
                     </choose>
-                    #{queryVariableValue.textValue2}
+                    #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                     <choose>
                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                     </choose>
@@ -448,7 +448,7 @@
                 <if test="queryVariableValue.longValue != null">
                     and (RES.LONG_
                     <include refid="executionVariableOperator" />
-                    #{queryVariableValue.longValue}
+                    #{queryVariableValue.longValue, jdbcType=BIGINT}
                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                         or RES.LONG_ is null
                     </if>
@@ -457,7 +457,7 @@
                 <if test="queryVariableValue.doubleValue != null">
                     and (RES.DOUBLE_
                     <include refid="executionVariableOperator" />
-                    #{queryVariableValue.doubleValue}
+                    #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                         or RES.DOUBLE_ is null
                     </if>
@@ -491,27 +491,27 @@
     </sql>
 
     <select id="selectHistoricVariableInstance" resultMap="historicProcessVariableResultMap">
-        select * from ${prefix}ACT_HI_VARINST where ID_ = #{variableInstanceId}
+        select * from ${prefix}ACT_HI_VARINST where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectHistoricVariableInstanceByVariableInstanceId" resultMap="historicProcessVariableResultMap">
-        select * from ${prefix}ACT_HI_VARINST where ID_ = #{variableInstanceId}
+        select * from ${prefix}ACT_HI_VARINST where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectHistoricVariableInstanceByProcessInstanceId" resultMap="historicProcessVariableResultMap">
-        select * from ${prefix}ACT_HI_VARINST where PROC_INST_ID_ = #{parameter}
+        select * from ${prefix}ACT_HI_VARINST where PROC_INST_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectHistoricVariableInstanceByTaskId" resultMap="historicProcessVariableResultMap">
-        select * from ${prefix}ACT_HI_VARINST where TASK_ID_ = #{parameter}
+        select * from ${prefix}ACT_HI_VARINST where TASK_ID_ = #{parameter, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectHistoricVariableInstanceByScopeIdAndScopeType" resultMap="historicProcessVariableResultMap">
-        select * from ${prefix}ACT_HI_VARINST where SCOPE_ID_ = #{parameter.scopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+        select * from ${prefix}ACT_HI_VARINST where SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
     </select>
     
     <select id="selectHistoricVariableInstanceBySubScopeIdAndScopeType" resultMap="historicProcessVariableResultMap">
-        select * from ${prefix}ACT_HI_VARINST where SUB_SCOPE_ID_ = #{parameter.subScopeId} and SCOPE_TYPE_ = #{parameter.scopeType}
+        select * from ${prefix}ACT_HI_VARINST where SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectHistoricVariableInstanceByNativeQuery" parameterType="java.util.Map" resultMap="historicProcessVariableResultMap">
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml
index d56ce95e7c3..72d6bc3b7f0 100644
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml
+++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml
@@ -10,21 +10,21 @@
         insert into ${prefix}ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, 
             BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_, META_INFO_)
         values (
-            #{id, jdbcType=VARCHAR},
-            1, #{type, jdbcType=VARCHAR},
-            #{name, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{taskId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
+            #{id, jdbcType=NVARCHAR},
+            1, #{type, jdbcType=NVARCHAR},
+            #{name, jdbcType=NVARCHAR},
+            #{processInstanceId, jdbcType=NVARCHAR},
+            #{executionId, jdbcType=NVARCHAR},
+            #{taskId, jdbcType=NVARCHAR},
+            #{scopeId, jdbcType=NVARCHAR},
+            #{subScopeId, jdbcType=NVARCHAR},
+            #{scopeType, jdbcType=NVARCHAR},
             #{byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
             #{doubleValue, jdbcType=DOUBLE},
             #{longValue, jdbcType=BIGINT},
-            #{textValue, jdbcType=VARCHAR},
-            #{textValue2, jdbcType=VARCHAR},
-            #{metaInfo, jdbcType=VARCHAR}
+            #{textValue, jdbcType=NVARCHAR},
+            #{textValue2, jdbcType=NVARCHAR},
+            #{metaInfo, jdbcType=NVARCHAR}
         )
     </insert>
 
@@ -33,21 +33,21 @@
             BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_, META_INFO_) VALUES
         <foreach collection="list" item="variable" index="index" separator=",">
             (
-                #{variable.id, jdbcType=VARCHAR},
-                1, #{variable.typeName, jdbcType=VARCHAR },
-                #{variable.name, jdbcType=VARCHAR},
-                #{variable.processInstanceId, jdbcType=VARCHAR},
-                #{variable.executionId, jdbcType=VARCHAR},
-                #{variable.taskId, jdbcType=VARCHAR},
-                #{variable.scopeId, jdbcType=VARCHAR},
-                #{variable.subScopeId, jdbcType=VARCHAR},
-                #{variable.scopeType, jdbcType=VARCHAR},
+                #{variable.id, jdbcType=NVARCHAR},
+                1, #{variable.typeName, jdbcType=NVARCHAR },
+                #{variable.name, jdbcType=NVARCHAR},
+                #{variable.processInstanceId, jdbcType=NVARCHAR},
+                #{variable.executionId, jdbcType=NVARCHAR},
+                #{variable.taskId, jdbcType=NVARCHAR},
+                #{variable.scopeId, jdbcType=NVARCHAR},
+                #{variable.subScopeId, jdbcType=NVARCHAR},
+                #{variable.scopeType, jdbcType=NVARCHAR},
                 #{variable.byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
                 #{variable.doubleValue, jdbcType=DOUBLE},
                 #{variable.longValue, jdbcType=BIGINT},
-                #{variable.textValue, jdbcType=VARCHAR},
-                #{variable.textValue2, jdbcType=VARCHAR},
-                #{variable.metaInfo, jdbcType=VARCHAR}
+                #{variable.textValue, jdbcType=NVARCHAR},
+                #{variable.textValue2, jdbcType=NVARCHAR},
+                #{variable.metaInfo, jdbcType=NVARCHAR}
             )
         </foreach>
     </insert>
@@ -58,21 +58,21 @@
             INTO ${prefix}ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, 
                 BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_, META_INFO_) VALUES
             (
-                #{variable.id, jdbcType=VARCHAR},
-                1, #{variable.typeName, jdbcType=VARCHAR },
-                #{variable.name, jdbcType=VARCHAR},
-                #{variable.processInstanceId, jdbcType=VARCHAR},
-                #{variable.executionId, jdbcType=VARCHAR},
-                #{variable.taskId, jdbcType=VARCHAR},
-                #{variable.scopeId, jdbcType=VARCHAR},
-                #{variable.subScopeId, jdbcType=VARCHAR},
-                #{variable.scopeType, jdbcType=VARCHAR},
+                #{variable.id, jdbcType=NVARCHAR},
+                1, #{variable.typeName, jdbcType=NVARCHAR },
+                #{variable.name, jdbcType=NVARCHAR},
+                #{variable.processInstanceId, jdbcType=NVARCHAR},
+                #{variable.executionId, jdbcType=NVARCHAR},
+                #{variable.taskId, jdbcType=NVARCHAR},
+                #{variable.scopeId, jdbcType=NVARCHAR},
+                #{variable.subScopeId, jdbcType=NVARCHAR},
+                #{variable.scopeType, jdbcType=NVARCHAR},
                 #{variable.byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
                 #{variable.doubleValue, jdbcType=DOUBLE},
                 #{variable.longValue, jdbcType=BIGINT},
-                #{variable.textValue, jdbcType=VARCHAR},
-                #{variable.textValue2, jdbcType=VARCHAR},
-                #{variable.metaInfo, jdbcType=VARCHAR}
+                #{variable.textValue, jdbcType=NVARCHAR},
+                #{variable.textValue2, jdbcType=NVARCHAR},
+                #{variable.metaInfo, jdbcType=NVARCHAR}
             )
         </foreach>
         SELECT * FROM dual
@@ -85,25 +85,25 @@
         <set>
             REV_ = #{revisionNext, jdbcType=INTEGER},
             <if test="originalPersistentState.name != name">
-                NAME_ = #{name, jdbcType=VARCHAR},
+                NAME_ = #{name, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.executionId != executionId">
-                EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
+                EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeId != scopeId">
-                SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR},
+                SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.subScopeId != subScopeId">
-                SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR},
+                SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.scopeType != scopeType">
-                SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR},
+                SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR},
             </if>
             <if test="(byteArrayRef != null and originalPersistentState.byteArrayRef == null) or (byteArrayRef == null and originalPersistentState.byteArrayRef != null) or (byteArrayRef != null and  originalPersistentState.byteArrayRef != byteArrayRef.id)">
                 BYTEARRAY_ID_ = #{byteArrayRef, typeHandler=VariableByteArrayRefTypeHandler},
             </if>
             <if test="(originalPersistentState.typeName == null and type != null) or (originalPersistentState.typeName != null and type == null) or (originalPersistentState.typeName != type.typeName)">
-                TYPE_ = #{type, jdbcType=VARCHAR},
+                TYPE_ = #{type, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.doubleValue != doubleValue">
                 DOUBLE_ = #{doubleValue, jdbcType=DOUBLE},
@@ -112,78 +112,78 @@
                 LONG_ = #{longValue, jdbcType=BIGINT},
             </if>
             <if test="originalPersistentState.textValue != textValue">
-                TEXT_ = #{textValue, jdbcType=VARCHAR},
+                TEXT_ = #{textValue, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.textValue2 != textValue2">
-                TEXT2_ = #{textValue2, jdbcType=VARCHAR},
+                TEXT2_ = #{textValue2, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.metaInfo != metaInfo">
-                META_INFO_ = #{metaInfo, jdbcType=VARCHAR},
+                META_INFO_ = #{metaInfo, jdbcType=NVARCHAR},
             </if>
         </set>
-        where ID_ = #{id, jdbcType=VARCHAR}
+        where ID_ = #{id, jdbcType=NVARCHAR}
         and REV_ = #{revision, jdbcType=INTEGER}
     </update>
 
     <!-- VARIABLE INSTANCE DELETE -->
 
     <delete id="deleteVariableInstance" parameterType="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-        delete from ${prefix}ACT_RU_VARIABLE where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision}
+        delete from ${prefix}ACT_RU_VARIABLE where ID_ = #{id, jdbcType=NVARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
     </delete>
     
     <delete id="deleteVariableInstancesByTaskId" parameterType="string">
-        delete from ${prefix}ACT_RU_VARIABLE where TASK_ID_ = #{id, jdbcType=VARCHAR}
+        delete from ${prefix}ACT_RU_VARIABLE where TASK_ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
     
     <delete id="deleteVariableInstancesByExecutionId" parameterType="string">
-        delete from ${prefix}ACT_RU_VARIABLE where EXECUTION_ID_ = #{id, jdbcType=VARCHAR}
+        delete from ${prefix}ACT_RU_VARIABLE where EXECUTION_ID_ = #{id, jdbcType=NVARCHAR}
     </delete>
 
     <delete id="deleteVariablesByScopeIdAndScopeType" parameterType="java.util.Map">
-        delete from ${prefix}ACT_RU_VARIABLE where SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
+        delete from ${prefix}ACT_RU_VARIABLE where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR} and SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
     </delete>
 
     <delete id="deleteVariablesByScopeIdAndScopeTypes" parameterType="java.util.Map">
-        delete from ${prefix}ACT_RU_VARIABLE where SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR}
+        delete from ${prefix}ACT_RU_VARIABLE where SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
          and SCOPE_TYPE_ in
         <foreach item="scopeType" index="index" collection="scopeTypes" open="(" separator="," close=")">
-            #{scopeType}
+            #{scopeType, jdbcType=NVARCHAR}
         </foreach>
     </delete>
 
     <delete id="deleteVariablesBySubScopeIdAndScopeTypes" parameterType="java.util.Map">
         delete from ${prefix}ACT_RU_VARIABLE
-        where SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR}
+        where SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
          and SCOPE_TYPE_ in
         <foreach item="scopeType" index="index" collection="scopeTypes" open="(" separator="," close=")">
-            #{scopeType}
+            #{scopeType, jdbcType=NVARCHAR}
         </foreach>
     </delete>
 
     <!-- VARIABLE INSTANCE RESULTMAP -->
     <resultMap id="variableInstanceResultMap" type="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-        <id property="id" column="ID_" jdbcType="VARCHAR" />
+        <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="type" column="TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
-        <result property="name" column="NAME_" javaType="String" jdbcType="VARCHAR" />
-        <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-        <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-        <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
-        <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR" />
-        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR" />
-        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR" />
+        <result property="type" column="TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="NVARCHAR" />
+        <result property="name" column="NAME_" javaType="String" jdbcType="NVARCHAR" />
+        <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="NVARCHAR" />
+        <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
+        <result property="taskId" column="TASK_ID_" jdbcType="NVARCHAR" />
+        <result property="scopeId" column="SCOPE_ID_" jdbcType="NVARCHAR" />
+        <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="NVARCHAR" />
+        <result property="scopeType" column="SCOPE_TYPE_" jdbcType="NVARCHAR" />
         <result property="byteArrayRef" column="BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler" />
         <result property="doubleValue" column="DOUBLE_" jdbcType="DOUBLE" />
-        <result property="textValue" column="TEXT_" jdbcType="VARCHAR" />
-        <result property="textValue2" column="TEXT2_" jdbcType="VARCHAR" />
+        <result property="textValue" column="TEXT_" jdbcType="NVARCHAR" />
+        <result property="textValue2" column="TEXT2_" jdbcType="NVARCHAR" />
         <result property="longValue" column="LONG_" jdbcType="BIGINT" />
-        <result property="metaInfo" column="META_INFO_" jdbcType="VARCHAR" />
+        <result property="metaInfo" column="META_INFO_" jdbcType="NVARCHAR" />
     </resultMap>
 
     <!-- VARIABLE INSTANCE SELECT -->
 
     <select id="selectVariableInstance" parameterType="string" resultMap="variableInstanceResultMap">
-        select * from ${prefix}ACT_RU_VARIABLE where ID_ = #{id, jdbcType=VARCHAR}
+        select * from ${prefix}ACT_RU_VARIABLE where ID_ = #{id, jdbcType=NVARCHAR}
     </select>
 
     <select id="selectVariablesByQuery" parameterType="org.flowable.variable.service.impl.InternalVariableInstanceQueryImpl" resultMap="variableInstanceResultMap">
@@ -191,69 +191,69 @@
         from ${prefix}ACT_RU_VARIABLE
         <where>
             <if test="parameter.id != null">
-                AND ID_ = #{parameter.id, jdbcType=VARCHAR}
+                AND ID_ = #{parameter.id, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.taskId != null">
-                AND TASK_ID_ = #{parameter.taskId, jdbcType=VARCHAR}
+                AND TASK_ID_ = #{parameter.taskId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.taskIds != null">
                 AND TASK_ID_ in
-                <foreach collection="parameter.taskIds" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.taskIds" item="taskId" open="(" separator="," close=")">
+                    #{taskId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.processInstanceId != null">
-                AND PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=VARCHAR}
+                AND PROC_INST_ID_ = #{parameter.processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.executionId != null">
-                AND EXECUTION_ID_ = #{parameter.executionId, jdbcType=VARCHAR}
+                AND EXECUTION_ID_ = #{parameter.executionId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.executionIds != null">
                 AND EXECUTION_ID_ in
-                <foreach collection="parameter.executionIds" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.executionIds" item="executionId" open="(" separator="," close=")">
+                    #{executionId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.withoutTaskId">
                 AND TASK_ID_ is null
             </if>
             <if test="parameter.scopeId != null">
-                AND SCOPE_ID_ = #{parameter.scopeId, jdbcType=VARCHAR}
+                AND SCOPE_ID_ = #{parameter.scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.scopeIds != null and !parameter.scopeIds.empty">
                 AND SCOPE_ID_ in
-                <foreach collection="parameter.scopeIds" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.scopeIds" item="scopeId" open="(" separator="," close=")">
+                    #{scopeId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.subScopeId != null">
-                AND SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=VARCHAR}
+                AND SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.subScopeIds != null and !parameter.subScopeIds.empty">
                 AND SUB_SCOPE_ID_ in
-                <foreach collection="parameter.subScopeIds" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.subScopeIds" item="subScopeId" open="(" separator="," close=")">
+                    #{subScopeId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.withoutSubScopeId">
                 AND SUB_SCOPE_ID_ is null
             </if>
             <if test="parameter.scopeType != null">
-                AND SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
+                AND SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.scopeTypes != null and !parameter.scopeTypes.empty">
                 AND SCOPE_TYPE_ in
-                <foreach collection="parameter.scopeTypes" item="item" open="(" separator="," close=")">
-                    #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.scopeTypes" item="scopeType" open="(" separator="," close=")">
+                    #{scopeType, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="parameter.name != null">
-                AND NAME_ = #{parameter.name, jdbcType=VARCHAR}
+                AND NAME_ = #{parameter.name, jdbcType=NVARCHAR}
             </if>
             <if test="parameter.names != null and !parameter.names.empty">
                 AND (
-                <foreach collection="parameter.names" item="item" separator=" or ">
-                    NAME_= #{item, jdbcType=VARCHAR}
+                <foreach collection="parameter.names" item="name" separator=" or ">
+                    NAME_= #{name, jdbcType=NVARCHAR}
                 </foreach>
                 )
             </if>
@@ -278,27 +278,27 @@
         from ${prefix}ACT_RU_VARIABLE RES
         <where>
             <if test="id != null">
-                RES.ID_ = #{id}
+                RES.ID_ = #{id, jdbcType=NVARCHAR}
             </if>
             <if test="processInstanceId != null">
-                and RES.PROC_INST_ID_ = #{processInstanceId}
+                and RES.PROC_INST_ID_ = #{processInstanceId, jdbcType=NVARCHAR}
             </if>
             <if test="executionId != null">
-                and RES.EXECUTION_ID_ = #{executionId}
+                and RES.EXECUTION_ID_ = #{executionId, jdbcType=NVARCHAR}
             </if>
             <if test="executionIds != null and !executionIds.empty">
                 and RES.EXECUTION_ID_ in
-                <foreach item="item" index="index" collection="executionIds" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="executionId" index="index" collection="executionIds" open="(" separator="," close=")">
+                    #{executionId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="taskId != null">
-                and RES.TASK_ID_ = #{taskId}
+                and RES.TASK_ID_ = #{taskId, jdbcType=NVARCHAR}
             </if>
             <if test="taskIds != null and !taskIds.empty">
                 and RES.TASK_ID_ in
-                <foreach item="item" index="index" collection="taskIds" open="(" separator="," close=")">
-                    #{item}
+                <foreach item="taskId" index="index" collection="taskIds" open="(" separator="," close=")">
+                    #{taskId, jdbcType=NVARCHAR}
                 </foreach>
             </if>
             <if test="excludeTaskRelated">
@@ -310,25 +310,25 @@
                 and RES.SUB_SCOPE_ID_ is NULL
             </if>
             <if test="scopeId != null">
-                and RES.SCOPE_ID_ = #{scopeId}
+                and RES.SCOPE_ID_ = #{scopeId, jdbcType=NVARCHAR}
             </if>
             <if test="subScopeId != null">
-                and RES.SUB_SCOPE_ID_ = #{subScopeId}
+                and RES.SUB_SCOPE_ID_ = #{subScopeId, jdbcType=NVARCHAR}
             </if>
             <if test="scopeType != null">
-                and RES.SCOPE_TYPE_ = #{scopeType}
+                and RES.SCOPE_TYPE_ = #{scopeType, jdbcType=NVARCHAR}
             </if>
             <if test="variableName != null">
-                and RES.NAME_ = #{variableName}
+                and RES.NAME_ = #{variableName, jdbcType=NVARCHAR}
             </if>
             <if test="variableNameLike != null">
-                and RES.NAME_ like #{variableNameLike}${wildcardEscapeClause}
+                and RES.NAME_ like #{variableNameLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
             </if>
 
             <!-- PLEASE NOTE: If you change anything have a look into the Execution, the same query object is used there! -->
             <if test="queryVariableValue != null">
                 <if test="queryVariableValue.needsTypeCheck()">
-                    and RES.TYPE_ = #{queryVariableValue.type}
+                    and RES.TYPE_ = #{queryVariableValue.type, jdbcType=NVARCHAR}
                 </if>
                 <if test="queryVariableValue.textValue != null &amp;&amp; queryVariableValue.longValue == null &amp;&amp; queryVariableValue.doubleValue == null">
                     and (RES.TEXT_
@@ -338,7 +338,7 @@
                             <include refid="executionVariableOperator" />
                         </otherwise>
                     </choose>
-                    #{queryVariableValue.textValue}
+                    #{queryVariableValue.textValue, jdbcType=NVARCHAR}
                     <choose>
                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                     </choose>
@@ -355,7 +355,7 @@
                             <include refid="executionVariableOperator" />
                         </otherwise>
                     </choose>
-                    #{queryVariableValue.textValue2}
+                    #{queryVariableValue.textValue2, jdbcType=NVARCHAR}
                     <choose>
                         <when test="queryVariableValue.operator.equals('LIKE') || queryVariableValue.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
                     </choose>
@@ -363,7 +363,7 @@
                 <if test="queryVariableValue.longValue != null">
                     and (RES.LONG_
                     <include refid="executionVariableOperator" />
-                    #{queryVariableValue.longValue}
+                    #{queryVariableValue.longValue, jdbcType=BIGINT}
                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                         or RES.LONG_ is null
                     </if>
@@ -372,7 +372,7 @@
                 <if test="queryVariableValue.doubleValue != null">
                     and (RES.DOUBLE_
                     <include refid="executionVariableOperator" />
-                    #{queryVariableValue.doubleValue}
+                    #{queryVariableValue.doubleValue, jdbcType=DOUBLE}
                     <if test="queryVariableValue.operator.equals('NOT_EQUALS') || queryVariableValue.operator.equals('NOT_EQUALS_IGNORE_CASE')">
                         or RES.DOUBLE_ is null
                     </if>