Using map. No need to run query again