Added support for string