Added Parse logic for in buffer