Updated OclSolver