Import / Export Changes

Fixed import and export functions