Added support for bubbling events