Added ability in solver to replace specified variables and constants