Add new DataSource infrastructure for new client API.