Added XML encoding