Upgraded to Spring 3.2.x