Made CatalogDataSource a singleton.