Several intermediate changes
Made working with EditorBase