Added a new map function