Add iterator feature