Add map functionality