Added support for client macro commands