[PATCH 2/4] Add interfaces for Token and TokenPersistence