Exporting feature improved