Improve constraints to add matching