[46350/46552] More enumerator implementations