Update to use StrBuf