Change so iterator does not need to be passed to API methods