Add initial support for macro commands