Add more syntax support