Added token support