Converted to Iterable API 2.0