Remove carrier_duration, make constraint multivalued, change expiry_date into int