Adding support for controls