Refactored data service