Add ability to define data source