Improved the Workflow base class