JPA refactoring
JPA refactoring