Various changes to support Editors