Refactoring.  'properties' are now known as 'predicates', and a predicate + value is known as a property.  Parser now understands enum values.