Spell class converted to new methods where possible