Adding option iterator