Editor enhancements