Improved handling of numbers