Fixed Builder's mapper search and added MapType to simple map and
multiple build methods