Use exports to resolve Circular Dependencies