Added message creation in client