Adding object clicking to event handling