Refactored JPA entities.