Updated new exporter of database