Added listeners to be able to catch OnClick and OnFocusChange events