Changes to support the editor.