Various changes and initial work to natively support Editor types