Attempt to switch to JPA