Updated JPA Entities