Add 8 and 16 bit versions