Did some enhancements in config of the control