Changed to work with spring
Small update