Added support for syntax highlighting