Adding basic support for tokens.