Refactoring Spf data fetch