diff --git a/Core/build.gradle b/Core/build.gradle
index cec7e01..5d8de5b 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.scaleoutsoftware.digitaltwin'
-version '3.0.8'
+version '3.0.9'
 
 sourceCompatibility = JavaVersion.VERSION_12
 
diff --git a/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/ModelSchema.java b/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/ModelSchema.java
index 2a8bece..a2fe2f7 100644
--- a/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/ModelSchema.java
+++ b/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/ModelSchema.java
@@ -271,6 +271,7 @@ public ModelSchema(
             case SQLite:
             case SQLServer:
             case DynamoDb:
+            case CosmosDb:
                 enablePersistence           = true;
                 azureDigitalTwinModelName   = null;
                 break;
@@ -445,6 +446,7 @@ public ModelSchema(
             case SQLite:
             case SQLServer:
             case DynamoDb:
+            case CosmosDb:
                 enablePersistence           = true;
                 azureDigitalTwinModelName   = null;
                 break;
diff --git a/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/PersistenceProviderType.java b/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/PersistenceProviderType.java
index d6712f7..17681a2 100644
--- a/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/PersistenceProviderType.java
+++ b/Core/src/main/java/com/scaleoutsoftware/digitaltwin/core/PersistenceProviderType.java
@@ -26,6 +26,11 @@ public enum PersistenceProviderType implements Serializable {
      * Enum for the Azure Digital Twin service.
      */
     AzureDigitalTwinsService("AzureDigitalTwinsService", 1),
+    /**
+     * Enum for CosmosDB
+     */
+    CosmosDb("Azure Cosmos DB", 6),
+
     /**
      * Enum for DynamoDB
      */
@@ -68,6 +73,8 @@ public static PersistenceProviderType fromString(String name) {
                     return SQLServer;
                 case "DynamoDB":
                     return DynamoDb;
+                case "Azure Cosmos DB":
+                    return CosmosDb;
                 default:
                     return null;
             }
@@ -92,6 +99,8 @@ public static PersistenceProviderType fromOrdinal(int ordinal) {
                 return SQLite;
             case 5:
                 return DynamoDb;
+            case 6:
+                return CosmosDb;
             default:
                 return null;
         }