Added EditorHandler