Further updates based on latest code in Spring 4