Made changes to the xml format to allow regex returnparsing for all commands