INT-2312: Polishing docs and XSD