Use update_fields when possible