Adding some CDI event processing