Added JPA capabilities