Added XML mode