Also tag notify messages
Split GenEvent.Stream into its own file