Updated multiple worker container support (untested)