Client using Latest API

This is the fix for #5