Added map and test for map