Update for new NumericExtensions