Updated client to support API version 2.