Datasource classes improvment