Updated to support 3.0.1 client.