Added structure for controls