Support for Spring 4