Added support for spaces in argument variables