Adds in more support for syntax