Worker management

post code-review patch