Keep parser structure consistent