Update parsing rules a bit