diff --git a/src/Delegate.Daxif/Common/CrmDataInternal.fs b/src/Delegate.Daxif/Common/CrmDataInternal.fs
index 30dda23..20e214c 100644
--- a/src/Delegate.Daxif/Common/CrmDataInternal.fs
+++ b/src/Delegate.Daxif/Common/CrmDataInternal.fs
@@ -565,7 +565,7 @@ module CrmDataInternal =
     
     let retrieveCustomAPIsBySolution proxy (solutionId: Guid) = 
       let q = QueryExpression("customapi")
-      q.ColumnSet <- ColumnSet(true)
+      q.ColumnSet <- ColumnSet("customapiid", "uniquename")
         
       let le = LinkEntity()
       le.JoinOperator <- JoinOperator.Inner
@@ -604,7 +604,7 @@ module CrmDataInternal =
       le.LinkCriteria.Conditions.Add
         (ConditionExpression(an, ConditionOperator.Equal, solutionId))
       let q = QueryExpression(ln)
-      q.ColumnSet <- ColumnSet(true)
+      q.ColumnSet <- ColumnSet("sdkmessageprocessingstepid", "name", "stage", "statecode", "statuscode")
       q.LinkEntities.Add(le)
       CrmDataHelper.retrieveMultiple proxy q
     
@@ -636,7 +636,7 @@ module CrmDataInternal =
       // Only definition workflows
       f.AddCondition(ConditionExpression(t, ConditionOperator.Equal, 1))
       let q = QueryExpression(ln)
-      q.ColumnSet <- ColumnSet(true)
+      q.ColumnSet <- ColumnSet("workflowid", "name", "ownerid", "statecode", "statuscode") // Determined primarily by Solution\Extend.fs usage
       q.LinkEntities.Add(le)
       q.Criteria <- f
       CrmDataHelper.retrieveMultiple proxy q
diff --git a/src/Delegate.Daxif/Modules/Workflows/WorkflowsHelper.fs b/src/Delegate.Daxif/Modules/Workflows/WorkflowsHelper.fs
index 34f7fa7..0d5d274 100644
--- a/src/Delegate.Daxif/Modules/Workflows/WorkflowsHelper.fs
+++ b/src/Delegate.Daxif/Modules/Workflows/WorkflowsHelper.fs
@@ -103,7 +103,7 @@ let instantiateAssembly (solutionId : Guid) (solutionName : string) dllName dllP
   log.Verbose "Retrieving assemblies from CRM"
 
   let ln = @"pluginassembly"
-  let attrToReturn = Query.ColumnSet (true)
+  let attrToReturn = Query.ColumnSet ("pluginassemblyid", "name", "publickeytoken", "culture") // Based on usage in updateAssembly function
   let version = asm.GetName().Version.ToString()
 
   let pluginAssemblies =