Update after latest changes in Spring