Add support for autodetection of numbers.