Adding support for numeric values.