Config: Moved calls to Workflow for better testability