Updated struct definitions for iterator