debugging the datasource refactoring