Created more general Datasource datasource

Created more general Datasource datasource