Use new pbclient feature