Refactoring data sources to support resource, service, arguments