Add support for Spring, in process, not yet complete!