Datasources refactoring fix