Added some iterator functionality