Use "collect" instead of "map"

Because we use "collect" in other files.