Made changes to Spring