Updated to work with latest 2.0.0 client