Added strbuf and so