Updated events plugin