#1 JPA fix pojo builder