Intermediate work for new JPA server