Add map
Add small test and fixes for map