Refactor Workflow Load