Add support for EDITOR