Added map and foldr