Add support of <command>