Added JPA. Refactoring entity-repository-service