Better manage events

Events from the socket vs Events generated from the client