Add parsing of numbers