This will probably also include requiring a new "JPA API" module to have the ORM and generic version use the same API.