Work manager and refactoring