Changed input arguments for client.