update apis for unknowntokenhandling