Added scenarios and updated solvers