Added support for strings