Issue #972 - Polishing DPF xsd schema