diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21977c57..4b5f9d84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.11.2 - (Sandcastle Vienna) - March 2021
+
+### Bugfixes and Improvements 3.11.2
+
+- Fix for the changed mapping behavior which now supports nullable strings [[#238](https://github.com/mindsphere/mindconnect-nodejs/issues/238)]
+
 ## 3.11.1 - (Sandcastle Vienna) - March 2021
 
 ### Bugfixes and Improvements 3.11.1
diff --git a/package-lock.json b/package-lock.json
index 4544438e..bd791b8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "@mindconnect/mindconnect-nodejs",
-    "version": "3.11.1",
+    "version": "3.11.2",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index 498e3b61..10a13dd7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mindconnect/mindconnect-nodejs",
-    "version": "3.11.1",
+    "version": "3.11.2",
     "description": "MindConnect Library for NodeJS (community based)",
     "main": "./dist/src/index.js",
     "browser": "./dist/src/index.bundle.js",
diff --git a/src/api/mindconnect-models.ts b/src/api/mindconnect-models.ts
index bbad288f..100d1b50 100644
--- a/src/api/mindconnect-models.ts
+++ b/src/api/mindconnect-models.ts
@@ -370,7 +370,8 @@ export interface DataPoint {
      * @type {string}
      * @memberof DataPoint
      */
-    unit: string;
+    // ! this had to be manually patched due to unitless mapping
+    unit?: string;
     /**
      * A list of string tuples. Max 5 tuples allowed.
      * @type {{ [key: string]: string; }}
diff --git a/src/api/sdk/agent/agent-models.ts b/src/api/sdk/agent/agent-models.ts
index 4078bb78..d2cebe56 100644
--- a/src/api/sdk/agent/agent-models.ts
+++ b/src/api/sdk/agent/agent-models.ts
@@ -100,7 +100,7 @@ export namespace AgentManagementModels {
          */
         export enum SecurityProfileEnum {
             SHAREDSECRET = <any>"SHARED_SECRET",
-            RSA3072 = <any>"RSA_3072"
+            RSA3072 = <any>"RSA_3072",
         }
     }
 
@@ -218,7 +218,7 @@ export namespace AgentManagementModels {
          */
         export enum GrantTypesEnum {
             SHAREDSECRET = <any>"SHARED_SECRET",
-            RSA3072 = <any>"RSA_3072"
+            RSA3072 = <any>"RSA_3072",
         }
         /**
          * @export
@@ -226,7 +226,7 @@ export namespace AgentManagementModels {
          */
         export enum TokenEndpointAuthMethodEnum {
             ClientSecretJwt = <any>"client_secret_jwt",
-            PrivateKeyJwt = <any>"private_key_jwt"
+            PrivateKeyJwt = <any>"private_key_jwt",
         }
     }
 
@@ -305,7 +305,8 @@ export namespace AgentManagementModels {
          * @type {string}
          * @memberof DataPoint
          */
-        unit: string;
+        // ! this had to be manually patched because of unitless mapping
+        unit?: string;
         /**
          * A list of string tuples. Max 5 tuples allowed.
          * @type {{ [key: string]: string; }}
@@ -328,7 +329,7 @@ export namespace AgentManagementModels {
             LONG = <any>"LONG",
             DOUBLE = <any>"DOUBLE",
             BOOLEAN = <any>"BOOLEAN",
-            STRING = <any>"STRING"
+            STRING = <any>"STRING",
         }
     }
 
@@ -587,7 +588,7 @@ export namespace AgentManagementModels {
         export enum StatusEnum {
             NOTONBOARDED = <any>"NOT_ONBOARDED",
             ONBOARDING = <any>"ONBOARDING",
-            ONBOARDED = <any>"ONBOARDED"
+            ONBOARDED = <any>"ONBOARDED",
         }
     }
 
@@ -622,7 +623,7 @@ export namespace AgentManagementModels {
          */
         export enum StatusEnum {
             ONLINE = <any>"ONLINE",
-            OFFLINE = <any>"OFFLINE"
+            OFFLINE = <any>"OFFLINE",
         }
     }
 
@@ -681,7 +682,7 @@ export namespace AgentManagementModels {
          */
         export enum DirectionEnum {
             ASC = <any>"ASC",
-            DESC = <any>"DESC"
+            DESC = <any>"DESC",
         }
         /**
          * @export
@@ -690,7 +691,7 @@ export namespace AgentManagementModels {
         export enum NullHandlingEnum {
             NATIVE = <any>"NATIVE",
             NULLSFIRST = <any>"NULLS_FIRST",
-            NULLSLAST = <any>"NULLS_LAST"
+            NULLSLAST = <any>"NULLS_LAST",
         }
     }
 
diff --git a/src/api/sdk/mcapi/mcapi.ts b/src/api/sdk/mcapi/mcapi.ts
index d46a6dc2..3dc685b2 100644
--- a/src/api/sdk/mcapi/mcapi.ts
+++ b/src/api/sdk/mcapi/mcapi.ts
@@ -404,7 +404,7 @@ export class MindConnectApiClient extends SdkClient {
                             : `DP-${variable!.name!.substr(0, 33)}`,
                     name: variable!.name!.substr(0, 64),
                     type: (variable.dataType as unknown) as DataPoint.TypeEnum,
-                    unit: `${variable.unit}`,
+                    unit: variable.unit,
                     customData: {
                         variable: `${variable.name}`,
                     },
diff --git a/src/cli/commands/html/sc/index.html b/src/cli/commands/html/sc/index.html
index 8f7a876c..77d179c1 100644
--- a/src/cli/commands/html/sc/index.html
+++ b/src/cli/commands/html/sc/index.html
@@ -320,7 +320,7 @@ <h4 class="notification__title">
 
             <script type="text/javascript">
                 _msb.init({
-                    title: "mindconnect-nodejs 3.11.1",
+                    title: "mindconnect-nodejs 3.11.2",
                     appId: "_mdspcontent",
                     appInfoPath: "/app-info.json",
                     polyfills: {
diff --git a/src/version.ts b/src/version.ts
index 82b5f63d..7c3f2505 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1,2 +1,2 @@
-export const MC_VERSION = "3.11.1";
+export const MC_VERSION = "3.11.2";
 export const MC_NAME = "mindconnect-nodejs";