EditorService class optimizations