Everything but MODS class back to usual