Add token support