Introduced solver context
Minor