Shouldn't this be contained in Event?