[PATCH 4/4] Extend app to utilize new external tokens