Added support for arguments in a <command>