Added support for token payments