Added macro for CliCommand