diff --git a/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java b/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java
index 068d62e75..2b980f58e 100644
--- a/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java
+++ b/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java
@@ -62,6 +62,8 @@ private static Map<DeserializationFeature, Boolean> defaultDeserialization()
     {
         Map<DeserializationFeature, Boolean> map = new EnumMap<>( DeserializationFeature.class );
         map.put( DeserializationFeature.READ_ENUMS_USING_TO_STRING, true );
+        map.put( DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true );
+        map.put( DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE, true );
         map.put( DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS, true );
         map.put( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false );
         return map;
diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseSubscriptionDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseSubscriptionDTO.java
index fafef9ce8..26f18288a 100644
--- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseSubscriptionDTO.java
+++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseSubscriptionDTO.java
@@ -1,6 +1,6 @@
 package com.cloudesire.platform.apiclient.dto.model.dto;
 
-import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatusEnum;
+import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatus;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
@@ -26,7 +26,7 @@ public abstract class BaseSubscriptionDTO extends NamedEntityDTO
     private Date endDate;
 
     @ApiModelProperty( value = "Current status of the subscription", readOnly = true )
-    private DeploymentStatusEnum deploymentStatus;
+    private DeploymentStatus deploymentStatus;
 
     @Valid
     private Set<UrlEntityDTO> virtualMachineInstance = new HashSet<>();
@@ -147,12 +147,12 @@ public void setEndDate( Date endDate )
         this.endDate = endDate;
     }
 
-    public DeploymentStatusEnum getDeploymentStatus()
+    public DeploymentStatus getDeploymentStatus()
     {
         return deploymentStatus;
     }
 
-    public void setDeploymentStatus( DeploymentStatusEnum deploymentStatus )
+    public void setDeploymentStatus( DeploymentStatus deploymentStatus )
     {
         this.deploymentStatus = deploymentStatus;
     }
diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/SubscriptionPatchDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/SubscriptionPatchDTO.java
index 35ca0071d..95ee9386e 100644
--- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/SubscriptionPatchDTO.java
+++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/SubscriptionPatchDTO.java
@@ -1,6 +1,6 @@
 package com.cloudesire.platform.apiclient.dto.model.dto;
 
-import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatusEnum;
+import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,7 +21,7 @@ public class SubscriptionPatchDTO extends DTO
     private Map<UrlEntityDTO, String> configurationParameters;
 
     @ApiModelProperty( "Deployment status of the subscription" )
-    private DeploymentStatusEnum deploymentStatus;
+    private DeploymentStatus deploymentStatus;
 
     @ApiModelProperty( hidden = true )
     @Deprecated
@@ -101,12 +101,12 @@ public SubscriptionPatchDTO setConfigurationParameters( Map<UrlEntityDTO, String
         return this;
     }
 
-    public DeploymentStatusEnum getDeploymentStatus()
+    public DeploymentStatus getDeploymentStatus()
     {
         return deploymentStatus;
     }
 
-    public SubscriptionPatchDTO setDeploymentStatus( DeploymentStatusEnum deploymentStatus )
+    public SubscriptionPatchDTO setDeploymentStatus( DeploymentStatus deploymentStatus )
     {
         this.deploymentStatus = deploymentStatus;
         return this;
diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatus.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatus.java
new file mode 100644
index 000000000..0d36a7b98
--- /dev/null
+++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatus.java
@@ -0,0 +1,28 @@
+package com.cloudesire.platform.apiclient.dto.model.enums;
+
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel( "Deployment status of a subscription" )
+public enum DeploymentStatus
+{
+    @ApiModelProperty( "Waiting for deploy" )
+    PENDING,
+    DEPLOYED,
+    UNDEPLOYED,
+    STOPPED,
+    FAILED,
+    @ApiModelProperty( "Requires approval by admin" )
+    REQUIRES_APPROVAL,
+    @ApiModelProperty( "Undeploy request has been sent" )
+    UNDEPLOY_SENT,
+    @ApiModelProperty( "Requires post-configuration" )
+    POST_CONFIGURATION,
+    @ApiModelProperty( "Waiting for invoice payment" )
+    WAITING_PAYMENT,
+    @ApiModelProperty( "Invoice payment time expired" )
+    PAYMENT_EXPIRED,
+    @JsonEnumDefaultValue
+    UNKNOWN
+}
diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java
deleted file mode 100644
index f6990cb24..000000000
--- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.cloudesire.platform.apiclient.dto.model.enums;
-
-import java.util.EnumSet;
-import java.util.Set;
-
-public enum DeploymentStatusEnum
-{
-    /** waiting for deploy */
-    PENDING,
-    DEPLOYED,
-    UNDEPLOYED,
-    STOPPED,
-    FAILED,
-    /** requires approval by admin */
-    REQUIRES_APPROVAL,
-    UNDEPLOY_SENT,
-    /** app that requires post-configuration */
-    POST_CONFIGURATION,
-    /** only for normal orders, when invoice get paid become PENDING */
-    WAITING_PAYMENT,
-    /** invoice payment time expired */
-    PAYMENT_EXPIRED;
-
-    /**
-     * The statuses in which the subscription is active
-     */
-    public static Set<DeploymentStatusEnum> active()
-    {
-        return EnumSet.of( DEPLOYED, FAILED, POST_CONFIGURATION );
-    }
-
-    /**
-     * The statuses for a subscription to be renewed automatically
-     */
-    public static Set<DeploymentStatusEnum> autoRenewable()
-    {
-        return EnumSet.of( DEPLOYED );
-    }
-
-    public static Set<DeploymentStatusEnum> deployable()
-    {
-        return EnumSet.of( PENDING, POST_CONFIGURATION );
-    }
-
-    /**
-     * The statuses in which the subscription are no longer active
-     */
-    public static Set<DeploymentStatusEnum> terminated()
-    {
-        return EnumSet.of( PAYMENT_EXPIRED, UNDEPLOYED );
-    }
-
-    /**
-     * The statuses in which the subscription has been/will be undeployed
-     */
-    public static Set<DeploymentStatusEnum> undeployed()
-    {
-        return EnumSet.of( PAYMENT_EXPIRED, UNDEPLOY_SENT, UNDEPLOYED );
-    }
-}
diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/filters/SubscriptionFilter.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/filters/SubscriptionFilter.java
index f0e12d6fa..f6a28bfb6 100644
--- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/filters/SubscriptionFilter.java
+++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/filters/SubscriptionFilter.java
@@ -1,7 +1,7 @@
 package com.cloudesire.platform.apiclient.dto.model.filters;
 
 import com.cloudesire.platform.apiclient.dto.model.dto.PageRequestDTO;
-import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatusEnum;
+import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatus;
 import com.cloudesire.platform.apiclient.dto.model.enums.OrderType;
 import com.cloudesire.platform.apiclient.dto.model.enums.ProductType;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +18,7 @@ public final class SubscriptionFilter extends PageRequestDTO
     private Map<String, String> metadata;
 
     @ApiModelProperty( "Filter by deployment status" )
-    private Set<DeploymentStatusEnum> status;
+    private Set<DeploymentStatus> status;
 
     @ApiModelProperty( "Filter by Order type" )
     private OrderType type;
@@ -48,12 +48,12 @@ public void setMetadata( Map<String, String> metadata )
         this.metadata = metadata;
     }
 
-    public Set<DeploymentStatusEnum> getStatus()
+    public Set<DeploymentStatus> getStatus()
     {
         return status;
     }
 
-    public void setStatus( Set<DeploymentStatusEnum> status )
+    public void setStatus( Set<DeploymentStatus> status )
     {
         this.status = status;
     }
diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java
index 7071cbad9..7a410f674 100644
--- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/SubscriptionQuery.java
@@ -1,6 +1,6 @@
 package com.cloudesire.platform.apiclient.query;
 
-import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatusEnum;
+import com.cloudesire.platform.apiclient.dto.model.enums.DeploymentStatus;
 import com.cloudesire.platform.apiclient.dto.model.enums.OrderType;
 import com.cloudesire.platform.apiclient.dto.model.enums.ProductType;
 import org.apache.commons.lang3.StringUtils;
@@ -31,7 +31,7 @@ public SubscriptionQuery setFilter( String value )
         return this;
     }
 
-    public SubscriptionQuery setStatus( DeploymentStatusEnum... values )
+    public SubscriptionQuery setStatus( DeploymentStatus... values )
     {
         String value = StringUtils.join( values, ',' );
         put( STATUS, value );