Trying to simplify the editor hierarchy