Add support for hex (and octal) values