Add more syntax matches