Added click support