Updated changes for import and export and other stuff
Fix any conflicts