Modified worker class