Improved Editor interface