Added support for multiple swarms