Switch to BatooJPA ; Consolidate parallel behaviour