Added support for simple editor