Added support for typing numbers (including hex)