added some support for Simple Workflow