Added support for HEX and binary values