Added string/upload support