Add short-short-int support