- datasource class adapted