Add call to save_custom_field_values