Add base Solver class