Add support for token overflow