Added language and syntax highlight support