Adding support for spring