Refactored xml stuff on client.