Refactorization; no concrete exporters