More data structure adjustments.