Updated master, subproblem, controller and solution structures