Added hooks for keyup and click listeners