Updated map functionality