Added XML view support