- add support to handle authentification token support