Simplified data structure for iteration later on