Added support for new 'token' field.