Upgraded to latest spring and hibernate