Support features for spring 3.1