Big enhancement for numeric values.