Added spring capabilities