Code refactoring JPA-store.