Changed from underscore map to native array map