Fixed import and export with requested changes.