Migrated to Spring 4.0