Update parsing logic p1