Added Spring support
Added Spring support