Added more Spring functionality