Add CSP-based solver