Added XML and HTML language support