Added string support
Added string support