Changes for JoinSolution