Added more map statements