#6 Improved JPA classes and DAO class.