Added handling of numbers