Separate parametric and non-parametric solver
Separate parametric and non-parametric solver