Added more event types to subscribe to