OZP-16 Use Iterable instead of List