[PATCH 3/4] Add External tokens