Added support for update events