Updated Control class