Update syntax rules a little bit