Added token based auth system