Hibernate upgrades