Improved export speed