Make spirits optional (in progress)