Updated for JPA