Improved export