Further improvements to worker class