Add code for MapWrapper including performance tests