Added multi sensor control support