Add support for tokens in report call