MapEditor enhancements