Add generic custom events and custom event injection