- Refactored data structure for the new version matrix layout