Updated to handle sub tuple with multiple values