Token Support updated