Switch to .iterator()
Optimize org member addition