Refactored data source