More work on the JPA