Added update_mapping