Updated EfficientPuzzleContext cloning logic to consider the new data structures