Working on re-export/re-import