Made it work for Spring 3.0.0