Add support for spring