Added support for Strings