Test
new MapBuilder function
MapBuilder enhancements