Refactoring data source output to any