Add back support for custom tokens.