Support multiple controllers [BVS-118]