Add event helpers and classes