Add pair based solving