Modified parser