DDF-527  updated CatalogService to use new PersistentStore API and map helper