preparing for multi datasource types handling