Some minor updates to the worker class