Further progress on the conditions parser