added initial support for tokens