Refactored how the workflow is configured