Added initial solution support.