Updated with Hibernate Integration.