Refactor

- Improve Iterate performance (while keeping Add relatively stable)