Fix exporting and importing