Update client to use StrBuf api