Make spirits support optional