[PATCH 1/4] Change Token to Internal token