Adding ContractNegotiatedRatePlan support