Updgrades in export.py