More support for the editor.