Update manifest iterator to be more useful