Adds support for multiple workers and worker types