Support more syntax patterns