Adding support for onClick