Workflow states extension

Extended the workflow states based on the comments of Lucian