Changes for MPL v2
for_each changes