WorkflowAction refactor - separate code for macro and alaCarte