Added support for longer strings