Added map and flatMap