Single classification for E+M import && some occurrence import fixes