Feature/datasource configuration