Restructured composite data calculation and query efficiency.