Changes for commands with string parameters with xml format