adding support for Spring 4.1