moving over to using generic token model