Datasource class externalized