Add initial support for solver.