Adjust grammar to match SQL syntax