Changed map success to use iterable