MapBuilder merged into common Builders class