updated jpa classes and daos