Minor revision of export-import subsystem