Added support for authenticating using multiple headers

Implemented for both session token and regular token