Made changes to NumericField