Changing to use JPA store.