Migration to Spring 4.1