Added comment and cdata support