Add map.
Update signature