EditorServer refactored