#47: Workflow improvement