Spring usage improved