Improved export compatibility with MongoDB