Implement new CSP formulation.