Added ability to work on solution states