Modified parsing of buffer