Feature/use token auth