Updating to use the abstract client implementation