Added shorthand behaviour that converts numbers to shorthand form