BRID-219 : Controls update