Added functionality for multiple controllers