New JPA templates (generation and tests OK)