Added iterator and builder.