[WIP] Simplified XML schema