Changes related to Events saving