Added string argument handling