Added onClick() support