Replaced TokenRegistry with SecretStore