Updated syntax rules