Added token classes to allow using same functions with both types of auth.