Added support for spells