More spirit parsing