Use containment instead of inheritance around search classes and article libraries