Added support for multiple controllers