Enhanced Workflow