Revise parser in prototype