Move data source methods to separate module