JPA CredentialStore refactoring.