Added Generics to spells as we make them more general