Added support for custom controls