Few changes in Control class and few performance improvements.