Added support for multi-digit numbers