Made replaced units be part of mapData model