Spring/Hibernate upgrade