Type Generics for dCoDataSource and some fixes