Improve the interface of controls