Adding token based authentication