Refactorings
Bugfix for exporter