- add support for ushort and ushort?