Updates to try supporting partitions in JPA