Changes for the Server to Server communication