Added more map features