Added iteration support