Added support for numeric input