Better gestion of messages
True message handling