Modified data structures to support for...in loop