Applied recommendation for event keys
Added client side web socket event handling