Event impl supporting changes

Can you add a round trip test?