Updated for ControlFactory