Added indexes to exporter