TokenHandler update, Token class moved