More refactorring for spring