Updated to use new client