Adding the solutionId and returnedItems (with hasReturnedItems)