Replaced temp state store with token store