Add hold_until_date and expiry_date fields.