added new Workflow Entities, Model and cleaned up existing Entities a little