Schema changes on spirit - sapio commit