changed to persistent token store