Updated to support 3.0.0 client.