Started working on token based authentication