Worker refactoring