Now collects SpellId as well