Added support for uint32/uint16