Added support for returning count on clicks