Improve constraints to add matching

Need docs