Improve constraints to add matching

Need docs
s/and/on/