Added Spring functionality