Added make-command-trigger macro