Use new helper method in client library