Updated export method and exported data