Adding support for strings