Added click handler to Core class