Added multiple control support