MapBuilder reworked.