Updated map component