Added multiple worker support