Adding exporter (WIP)