Added support for dynamic arguments that contain spaces.