Adding support for number-only fields