Updated for Spring 3.2