Move from System to Control hierarchy