Added uint8 and 16 definitions