Add code for MapWrapper