Add raw_id_fields