IFindOne should not extend IFindAll. And other changes.