Spring refactored