Add overloads for empty components.
Also keep track of exporters.
Adapt to new CAF type announcement.