Added support for ClickHandler