Adding search classes and interfaces.