Added context to map()