Added token check