Improve command macro to use invoker for execute command