Added more map functionality