Missed the spec constraints when refactoring
Add Conjunctive/DisjunctiveConstraint