Updated map structure