Added support for 16-bit and 32-bit strings