Added streambuf parsing