Change the way event attributes are passed into v0.0.1