Added support for <command> element