Add some more syntax logic