Use non-deprecated Spring classes