Updating to make Event constructor not "dirty"