make saved_mapping update optional