Added string support