Better JPA schema