Added schema validation and fixed xml