refactored Solvers adapter creation, now uses builder and is much more flexible