Remove the necessity for the client to provide the ip address in the message