Fixed conflict with other extensions which uses DatasourceManager