fix Annotation Problem

fix Annotation Problem
add new function for token