changed datasource class