added token macros