Added solver class