Added token authentication (not finished)