WIP -> Support for auth v2