Feature/workflow improvements