adding support for click handlers