[OPTIMIZATION] Remove use of INT to use int8/uint8/int16/uint16