Events & Iterable refactoring and improvements