Updated map, moved references