Added support for multiple click handlers