Updated map callback