Added more overriding for editor.