Implement version 3 which include token based authentication