Removed ProductBundle, added CatalogBundle