adding token support