Added support for ArgumentString