Minor refactoring. Added spring nature to fething logic.