continued adding support for spring