added WorkflowInfo
refactoring & bug fixes