Added and updated JPA entities