[FIX] Uncomment XML definitions