Added message handling in both client and server description.