added cdi events and websockets