Added map and mapValues