TariffOverride is now not nullable