Added more syntax rules