Added token and uuid