Improved Jpa archetype.