Updated the DataSourceResource to be more extensible