Added Number and Currency fields