Update for Hibernate 4