M3 related updates - mostly iterables