diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionworkflow/DescriptionWorkflowBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/descriptionworkflow/DescriptionWorkflowBuilder.java
index 852f5b713..dbcef644d 100644
--- a/backend/core/src/main/java/org/opencdmp/model/builder/descriptionworkflow/DescriptionWorkflowBuilder.java
+++ b/backend/core/src/main/java/org/opencdmp/model/builder/descriptionworkflow/DescriptionWorkflowBuilder.java
@@ -1,7 +1,6 @@
 package org.opencdmp.model.builder.descriptionworkflow;
 
 import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
@@ -14,7 +13,6 @@ import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DescriptionWorkflowEntity;
 import org.opencdmp.model.builder.BaseBuilder;
 import org.opencdmp.model.descriptionworkflow.DescriptionWorkflow;
-import org.opencdmp.model.descriptionworkflow.DescriptionWorkflowDefinition;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionworkflow/DescriptionWorkflowPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionworkflow/DescriptionWorkflowPersist.java
index 0faf2a9a7..fb98bb9e9 100644
--- a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionworkflow/DescriptionWorkflowPersist.java
+++ b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionworkflow/DescriptionWorkflowPersist.java
@@ -25,9 +25,6 @@ public class DescriptionWorkflowPersist {
     private String description;
     public final static String _description = "description";
 
-    private IsActive isActive;
-    public final static String _isActive = "isActive";
-
     private String hash;
     public final static String _hash = "hash";
 
@@ -47,10 +44,6 @@ public class DescriptionWorkflowPersist {
 
     public void setDescription(String description) { this.description = description; }
 
-    public IsActive getIsActive() { return isActive; }
-
-    public void setIsActive(IsActive isActive) { this.isActive = isActive; }
-
     public String getHash() { return hash; }
 
     public void setHash(String hash) { this.hash = hash; }
@@ -94,10 +87,6 @@ public class DescriptionWorkflowPersist {
                             .must(() -> !this.isNull(item.getName()))
                             .failOn(DescriptionWorkflowPersist._name)
                             .failWith(this.messageSource.getMessage("Validation_Required", new Object[]{DescriptionWorkflowPersist._name}, LocaleContextHolder.getLocale())),
-                    this.spec()
-                            .must(() -> !this.isNull(item.getIsActive()))
-                            .failOn(DescriptionWorkflowPersist._isActive)
-                            .failWith(this.messageSource.getMessage("Validation_Required", new Object[]{DescriptionWorkflowPersist._isActive}, LocaleContextHolder.getLocale())),
                     this.refSpec()
                             .iff(() -> !this.isNull(item.getDefinition()))
                             .on(DescriptionWorkflowPersist._description)
diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/planworkflow/PlanWorkflowPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/planworkflow/PlanWorkflowPersist.java
index 1294666ba..d31123f54 100644
--- a/backend/core/src/main/java/org/opencdmp/model/persist/planworkflow/PlanWorkflowPersist.java
+++ b/backend/core/src/main/java/org/opencdmp/model/persist/planworkflow/PlanWorkflowPersist.java
@@ -28,9 +28,6 @@ public class PlanWorkflowPersist {
     public static final String _description = "description";
     private String description;
 
-    public static final String _isActive = "isActive";
-    private IsActive isActive;
-
     public static final String _hash = "hash";
     private String hash;
 
@@ -50,10 +47,6 @@ public class PlanWorkflowPersist {
 
     public void setDescription(String description) { this.description = description; }
 
-    public IsActive getIsActive() { return isActive; }
-
-    public void setIsActive(IsActive isActive) { this.isActive = isActive; }
-
     public String getHash() { return hash; }
 
     public void setHash(String hash) { this.hash = hash; }
@@ -99,10 +92,6 @@ public class PlanWorkflowPersist {
                             .must(() -> !this.isNull(item.getName()) && !this.isEmpty(item.getName()))
                             .failOn(PlanWorkflowPersist._name)
                             .failWith(this.messageSource.getMessage("Validation_Required", new Object[]{PlanWorkflowPersist._name}, LocaleContextHolder.getLocale())),
-                    this.spec()
-                            .must(() -> !this.isNull(item.getIsActive()))
-                            .failOn(PlanWorkflowPersist._isActive)
-                            .failWith(this.messageSource.getMessage("Validation_Required", new Object[]{PlanWorkflowPersist._isActive}, LocaleContextHolder.getLocale())),
                     this.refSpec()
                             .iff(() -> !this.isNull(item.getDefinition()))
                             .on(PlanWorkflowPersist._definition)
diff --git a/backend/core/src/main/java/org/opencdmp/query/PlanWorkflowQuery.java b/backend/core/src/main/java/org/opencdmp/query/PlanWorkflowQuery.java
index 08b04b8ca..0ce7f17b9 100644
--- a/backend/core/src/main/java/org/opencdmp/query/PlanWorkflowQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/PlanWorkflowQuery.java
@@ -10,8 +10,10 @@ import jakarta.persistence.criteria.Predicate;
 import org.opencdmp.authorization.AuthorizationFlags;
 import org.opencdmp.commons.enums.IsActive;
 import org.opencdmp.data.DescriptionWorkflowEntity;
+import org.opencdmp.data.PlanBlueprintEntity;
 import org.opencdmp.data.PlanWorkflowEntity;
 import org.opencdmp.data.TenantEntityManager;
+import org.opencdmp.model.planblueprint.PlanBlueprint;
 import org.opencdmp.model.planworkflow.PlanWorkflow;
 import org.opencdmp.query.utils.QueryUtilsService;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -137,9 +139,7 @@ public class PlanWorkflowQuery extends QueryBase<PlanWorkflowEntity> {
     }
 
     @Override
-    protected EntityManager entityManager(){
-        return this.entityManager.getEntityManager();
-    }
+    protected EntityManager entityManager(){ return this.entityManager.getEntityManager(); }
 
     @Override
     protected Boolean isFalseQuery() {