Added tap/click support