Added FinderFactoryInterface