Add map and filter to utility.js