Updated export script