Upgrade to Hibernate 4