Added ability to call a token macro