Modified events handling