Added support for click events