Added more JPA to accomodate changes in tables.