Updated events manager