Use abstract classes and interfaces for CatalogBundle entities in specs (where possible)