Wrokflow --> Work
Fix regressions introduced by the refactoring