Add support for numbers up to 8 digits in length