Original JPA implementation