MapBuilder enhancements