Add multiple iteration support