Added missing controls