diff --git a/Documentation/SIS-XSD/make-classes.bat b/Documentation/SIS-XSD/make-classes.bat
new file mode 100644
index 0000000..ec86e2d
--- /dev/null
+++ b/Documentation/SIS-XSD/make-classes.bat
@@ -0,0 +1 @@
+"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8.1 Tools\x64\xsd.exe" /classes sis.xsd /namespace:Voile.Patchouli.Dvb.Sis.Model 
diff --git a/Documentation/SIS-XSD/sis.cs b/Documentation/SIS-XSD/sis.cs
new file mode 100644
index 0000000..f23c893
--- /dev/null
+++ b/Documentation/SIS-XSD/sis.cs
@@ -0,0 +1,1697 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// 
+// This source code was auto-generated by xsd, Version=4.8.9037.0.
+// 
+namespace Voile.Patchouli.Dvb.Sis.Model {
+    using System.Xml.Serialization;
+    
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
+    public partial class DSACI {
+        
+        private type_global_configuration global_configurationField;
+        
+        private type_input_parent[] input_configurationField;
+        
+        private type_output_TS[] remultiplexingField;
+        
+        private type_output_processing output_processingField;
+        
+        /// <remarks/>
+        public type_global_configuration global_configuration {
+            get {
+                return this.global_configurationField;
+            }
+            set {
+                this.global_configurationField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("input", IsNullable=false)]
+        public type_input_parent[] input_configuration {
+            get {
+                return this.input_configurationField;
+            }
+            set {
+                this.input_configurationField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("output_TS", IsNullable=false)]
+        public type_output_TS[] remultiplexing {
+            get {
+                return this.remultiplexingField;
+            }
+            set {
+                this.remultiplexingField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_output_processing output_processing {
+            get {
+                return this.output_processingField;
+            }
+            set {
+                this.output_processingField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_global_configuration {
+        
+        private int current_DSA_group_idField;
+        
+        private int global_version_numberField;
+        
+        private int global_application_timeField;
+        
+        private type_SIS_edition sIS_editionField;
+        
+        /// <remarks/>
+        public int current_DSA_group_id {
+            get {
+                return this.current_DSA_group_idField;
+            }
+            set {
+                this.current_DSA_group_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int global_version_number {
+            get {
+                return this.global_version_numberField;
+            }
+            set {
+                this.global_version_numberField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int global_application_time {
+            get {
+                return this.global_application_timeField;
+            }
+            set {
+                this.global_application_timeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_SIS_edition SIS_edition {
+            get {
+                return this.sIS_editionField;
+            }
+            set {
+                this.sIS_editionField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_SIS_edition {
+        
+        private int majorField;
+        
+        private int middleField;
+        
+        private int minorField;
+        
+        /// <remarks/>
+        public int major {
+            get {
+                return this.majorField;
+            }
+            set {
+                this.majorField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int middle {
+            get {
+                return this.middleField;
+            }
+            set {
+                this.middleField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int minor {
+            get {
+                return this.minorField;
+            }
+            set {
+                this.minorField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_L2_signalling {
+        
+        private int output_TS_idField;
+        
+        private int output_ON_idField;
+        
+        private int output_L2_service_idField;
+        
+        private string output_L2_service_provider_nameField;
+        
+        private string output_L2_service_nameField;
+        
+        private int output_L2_PCR_PIDField;
+        
+        private int output_L2_PMT_PIDField;
+        
+        /// <remarks/>
+        public int output_TS_id {
+            get {
+                return this.output_TS_idField;
+            }
+            set {
+                this.output_TS_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_ON_id {
+            get {
+                return this.output_ON_idField;
+            }
+            set {
+                this.output_ON_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_L2_service_id {
+            get {
+                return this.output_L2_service_idField;
+            }
+            set {
+                this.output_L2_service_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string output_L2_service_provider_name {
+            get {
+                return this.output_L2_service_provider_nameField;
+            }
+            set {
+                this.output_L2_service_provider_nameField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string output_L2_service_name {
+            get {
+                return this.output_L2_service_nameField;
+            }
+            set {
+                this.output_L2_service_nameField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_L2_PCR_PID {
+            get {
+                return this.output_L2_PCR_PIDField;
+            }
+            set {
+                this.output_L2_PCR_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_L2_PMT_PID {
+            get {
+                return this.output_L2_PMT_PIDField;
+            }
+            set {
+                this.output_L2_PMT_PIDField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class dvb_t2_standard {
+        
+        private int output_T2_MI_PIDField;
+        
+        private int output_T2_MI_stream_idField;
+        
+        private int output_rateField;
+        
+        private type_L2_signalling l2_signallingField;
+        
+        /// <remarks/>
+        public int output_T2_MI_PID {
+            get {
+                return this.output_T2_MI_PIDField;
+            }
+            set {
+                this.output_T2_MI_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_T2_MI_stream_id {
+            get {
+                return this.output_T2_MI_stream_idField;
+            }
+            set {
+                this.output_T2_MI_stream_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_rate {
+            get {
+                return this.output_rateField;
+            }
+            set {
+                this.output_rateField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_L2_signalling L2_signalling {
+            get {
+                return this.l2_signallingField;
+            }
+            set {
+                this.l2_signallingField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_terrestrial_standard_generation {
+        
+        private object itemField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("dvb_t", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("dvb_t2", typeof(dvb_t2_standard))]
+        public object Item {
+            get {
+                return this.itemField;
+            }
+            set {
+                this.itemField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_output_processing {
+        
+        private type_terrestrial_standard_generation terrestrial_standard_generationField;
+        
+        /// <remarks/>
+        public type_terrestrial_standard_generation terrestrial_standard_generation {
+            get {
+                return this.terrestrial_standard_generationField;
+            }
+            set {
+                this.terrestrial_standard_generationField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_DTT_only_service {
+        
+        private int dTT_only_service_idField;
+        
+        private int input_EIT_PIDField;
+        
+        private int source_idField;
+        
+        /// <remarks/>
+        public int DTT_only_service_id {
+            get {
+                return this.dTT_only_service_idField;
+            }
+            set {
+                this.dTT_only_service_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int input_EIT_PID {
+            get {
+                return this.input_EIT_PIDField;
+            }
+            set {
+                this.input_EIT_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int source_id {
+            get {
+                return this.source_idField;
+            }
+            set {
+                this.source_idField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class eit_regeneration_processing {
+        
+        private int eit_pf_actual_periodField;
+        
+        private int eit_pf_other_periodField;
+        
+        private int eit_sch_1stday_actual_periodField;
+        
+        private int eit_sch_1stday_other_periodField;
+        
+        private int eit_sch_2nd_8th_actual_periodField;
+        
+        private int eit_sch_2nd_8th_other_periodField;
+        
+        private int eit_sch_sup_8th_actual_periodField;
+        
+        private int eit_sch_sup_8th_other_periodField;
+        
+        private int eit_insertion_window_durationField;
+        
+        private bool eit_cross_referencing_flagField;
+        
+        private type_other_mux[] other_muxField;
+        
+        private type_DTT_only_service[] dTT_only_serviceField;
+        
+        /// <remarks/>
+        public int eit_pf_actual_period {
+            get {
+                return this.eit_pf_actual_periodField;
+            }
+            set {
+                this.eit_pf_actual_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_pf_other_period {
+            get {
+                return this.eit_pf_other_periodField;
+            }
+            set {
+                this.eit_pf_other_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_sch_1stday_actual_period {
+            get {
+                return this.eit_sch_1stday_actual_periodField;
+            }
+            set {
+                this.eit_sch_1stday_actual_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_sch_1stday_other_period {
+            get {
+                return this.eit_sch_1stday_other_periodField;
+            }
+            set {
+                this.eit_sch_1stday_other_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_sch_2nd_8th_actual_period {
+            get {
+                return this.eit_sch_2nd_8th_actual_periodField;
+            }
+            set {
+                this.eit_sch_2nd_8th_actual_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_sch_2nd_8th_other_period {
+            get {
+                return this.eit_sch_2nd_8th_other_periodField;
+            }
+            set {
+                this.eit_sch_2nd_8th_other_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_sch_sup_8th_actual_period {
+            get {
+                return this.eit_sch_sup_8th_actual_periodField;
+            }
+            set {
+                this.eit_sch_sup_8th_actual_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_sch_sup_8th_other_period {
+            get {
+                return this.eit_sch_sup_8th_other_periodField;
+            }
+            set {
+                this.eit_sch_sup_8th_other_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int eit_insertion_window_duration {
+            get {
+                return this.eit_insertion_window_durationField;
+            }
+            set {
+                this.eit_insertion_window_durationField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool eit_cross_referencing_flag {
+            get {
+                return this.eit_cross_referencing_flagField;
+            }
+            set {
+                this.eit_cross_referencing_flagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("other_mux")]
+        public type_other_mux[] other_mux {
+            get {
+                return this.other_muxField;
+            }
+            set {
+                this.other_muxField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("DTT_only_service")]
+        public type_DTT_only_service[] DTT_only_service {
+            get {
+                return this.dTT_only_serviceField;
+            }
+            set {
+                this.dTT_only_serviceField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_other_mux {
+        
+        private int other_DSA_group_idField;
+        
+        private int dSACI_PIDField;
+        
+        private int source_idField;
+        
+        /// <remarks/>
+        public int other_DSA_group_id {
+            get {
+                return this.other_DSA_group_idField;
+            }
+            set {
+                this.other_DSA_group_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int DSACI_PID {
+            get {
+                return this.dSACI_PIDField;
+            }
+            set {
+                this.dSACI_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int source_id {
+            get {
+                return this.source_idField;
+            }
+            set {
+                this.source_idField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class eit_patching_processing {
+        
+        private bool eit_crossreferencing_flagField;
+        
+        private type_other_mux[] other_muxField;
+        
+        /// <remarks/>
+        public bool eit_crossreferencing_flag {
+            get {
+                return this.eit_crossreferencing_flagField;
+            }
+            set {
+                this.eit_crossreferencing_flagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("other_mux")]
+        public type_other_mux[] other_mux {
+            get {
+                return this.other_muxField;
+            }
+            set {
+                this.other_muxField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_eit_processing_mode {
+        
+        private object itemField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("eit_passthrough", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("eit_patching", typeof(eit_patching_processing))]
+        [System.Xml.Serialization.XmlElementAttribute("eit_regeneration", typeof(eit_regeneration_processing))]
+        public object Item {
+            get {
+                return this.itemField;
+            }
+            set {
+                this.itemField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class sdt_regeneration_processing {
+        
+        private int sdt_actual_periodField;
+        
+        private int m_actualField;
+        
+        private int offsetField;
+        
+        private int sdt_actual_version_numberField;
+        
+        private bool sdt_crossreferencing_flagField;
+        
+        private type_other_mux[] other_muxField;
+        
+        private type_bouquet[] bouquetField;
+        
+        /// <remarks/>
+        public int sdt_actual_period {
+            get {
+                return this.sdt_actual_periodField;
+            }
+            set {
+                this.sdt_actual_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int M_actual {
+            get {
+                return this.m_actualField;
+            }
+            set {
+                this.m_actualField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int offset {
+            get {
+                return this.offsetField;
+            }
+            set {
+                this.offsetField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int sdt_actual_version_number {
+            get {
+                return this.sdt_actual_version_numberField;
+            }
+            set {
+                this.sdt_actual_version_numberField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool sdt_crossreferencing_flag {
+            get {
+                return this.sdt_crossreferencing_flagField;
+            }
+            set {
+                this.sdt_crossreferencing_flagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("other_mux")]
+        public type_other_mux[] other_mux {
+            get {
+                return this.other_muxField;
+            }
+            set {
+                this.other_muxField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("bouquet")]
+        public type_bouquet[] bouquet {
+            get {
+                return this.bouquetField;
+            }
+            set {
+                this.bouquetField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_bouquet {
+        
+        private int source_idField;
+        
+        private int input_bouquet_idField;
+        
+        private int terrestrial_bouquet_idField;
+        
+        /// <remarks/>
+        public int source_id {
+            get {
+                return this.source_idField;
+            }
+            set {
+                this.source_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int input_bouquet_id {
+            get {
+                return this.input_bouquet_idField;
+            }
+            set {
+                this.input_bouquet_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int terrestrial_bouquet_id {
+            get {
+                return this.terrestrial_bouquet_idField;
+            }
+            set {
+                this.terrestrial_bouquet_idField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class sdt_patching_processing {
+        
+        private bool sdt_crossreferencing_flagField;
+        
+        private type_other_mux[] other_muxField;
+        
+        private type_bouquet[] bouquetField;
+        
+        /// <remarks/>
+        public bool sdt_crossreferencing_flag {
+            get {
+                return this.sdt_crossreferencing_flagField;
+            }
+            set {
+                this.sdt_crossreferencing_flagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("other_mux")]
+        public type_other_mux[] other_mux {
+            get {
+                return this.other_muxField;
+            }
+            set {
+                this.other_muxField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("bouquet")]
+        public type_bouquet[] bouquet {
+            get {
+                return this.bouquetField;
+            }
+            set {
+                this.bouquetField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_sdt_bat_processing_mode {
+        
+        private object itemField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("sdt_passthrough", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("sdt_patching", typeof(sdt_patching_processing))]
+        [System.Xml.Serialization.XmlElementAttribute("sdt_regeneration", typeof(sdt_regeneration_processing))]
+        public object Item {
+            get {
+                return this.itemField;
+            }
+            set {
+                this.itemField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class cat_regeneration_processing {
+        
+        private int table_repetition_periodField;
+        
+        private int offsetField;
+        
+        private int cAT_version_numberField;
+        
+        private type_ca_provider[] ca_providerField;
+        
+        /// <remarks/>
+        public int table_repetition_period {
+            get {
+                return this.table_repetition_periodField;
+            }
+            set {
+                this.table_repetition_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int offset {
+            get {
+                return this.offsetField;
+            }
+            set {
+                this.offsetField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int CAT_version_number {
+            get {
+                return this.cAT_version_numberField;
+            }
+            set {
+                this.cAT_version_numberField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ca_provider")]
+        public type_ca_provider[] ca_provider {
+            get {
+                return this.ca_providerField;
+            }
+            set {
+                this.ca_providerField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_ca_provider {
+        
+        private int cAS_idField;
+        
+        private int output_EMM_PIDField;
+        
+        /// <remarks/>
+        public int CAS_id {
+            get {
+                return this.cAS_idField;
+            }
+            set {
+                this.cAS_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_EMM_PID {
+            get {
+                return this.output_EMM_PIDField;
+            }
+            set {
+                this.output_EMM_PIDField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class cat_patching_processing {
+        
+        private type_ca_provider[] ca_providerField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ca_provider")]
+        public type_ca_provider[] ca_provider {
+            get {
+                return this.ca_providerField;
+            }
+            set {
+                this.ca_providerField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_cat_processing_mode {
+        
+        private object itemField;
+        
+        private ItemChoiceType1 itemElementNameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("cat_passthrough", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("cat_patching", typeof(cat_patching_processing))]
+        [System.Xml.Serialization.XmlElementAttribute("cat_regeneration", typeof(cat_regeneration_processing))]
+        [System.Xml.Serialization.XmlElementAttribute("cat_stopping", typeof(string))]
+        [System.Xml.Serialization.XmlChoiceIdentifierAttribute("ItemElementName")]
+        public object Item {
+            get {
+                return this.itemField;
+            }
+            set {
+                this.itemField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public ItemChoiceType1 ItemElementName {
+            get {
+                return this.itemElementNameField;
+            }
+            set {
+                this.itemElementNameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
+    public enum ItemChoiceType1 {
+        
+        /// <remarks/>
+        cat_passthrough,
+        
+        /// <remarks/>
+        cat_patching,
+        
+        /// <remarks/>
+        cat_regeneration,
+        
+        /// <remarks/>
+        cat_stopping,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class pat_regeneration_processing {
+        
+        private int table_repetition_periodField;
+        
+        private int offsetField;
+        
+        private int pAT_version_numberField;
+        
+        /// <remarks/>
+        public int table_repetition_period {
+            get {
+                return this.table_repetition_periodField;
+            }
+            set {
+                this.table_repetition_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int offset {
+            get {
+                return this.offsetField;
+            }
+            set {
+                this.offsetField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int PAT_version_number {
+            get {
+                return this.pAT_version_numberField;
+            }
+            set {
+                this.pAT_version_numberField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_pat_processing_mode {
+        
+        private object itemField;
+        
+        private ItemChoiceType itemElementNameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("pat_passthrough", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("pat_patching", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("pat_regeneration", typeof(pat_regeneration_processing))]
+        [System.Xml.Serialization.XmlChoiceIdentifierAttribute("ItemElementName")]
+        public object Item {
+            get {
+                return this.itemField;
+            }
+            set {
+                this.itemField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public ItemChoiceType ItemElementName {
+            get {
+                return this.itemElementNameField;
+            }
+            set {
+                this.itemElementNameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]
+    public enum ItemChoiceType {
+        
+        /// <remarks/>
+        pat_passthrough,
+        
+        /// <remarks/>
+        pat_patching,
+        
+        /// <remarks/>
+        pat_regeneration,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_psisi_processing_mode {
+        
+        private type_pat_processing_mode patField;
+        
+        private type_cat_processing_mode catField;
+        
+        private type_sdt_bat_processing_mode sdt_batField;
+        
+        private type_eit_processing_mode eitField;
+        
+        /// <remarks/>
+        public type_pat_processing_mode pat {
+            get {
+                return this.patField;
+            }
+            set {
+                this.patField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_cat_processing_mode cat {
+            get {
+                return this.catField;
+            }
+            set {
+                this.catField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_sdt_bat_processing_mode sdt_bat {
+            get {
+                return this.sdt_batField;
+            }
+            set {
+                this.sdt_batField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_eit_processing_mode eit {
+            get {
+                return this.eitField;
+            }
+            set {
+                this.eitField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class pmt_regeneration_processing {
+        
+        private int table_repetition_periodField;
+        
+        private int offsetField;
+        
+        private int pCR_PIDField;
+        
+        private int[] output_pidField;
+        
+        private type_ECM[] eCMField;
+        
+        /// <remarks/>
+        public int table_repetition_period {
+            get {
+                return this.table_repetition_periodField;
+            }
+            set {
+                this.table_repetition_periodField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int offset {
+            get {
+                return this.offsetField;
+            }
+            set {
+                this.offsetField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int PCR_PID {
+            get {
+                return this.pCR_PIDField;
+            }
+            set {
+                this.pCR_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("output_pid")]
+        public int[] output_pid {
+            get {
+                return this.output_pidField;
+            }
+            set {
+                this.output_pidField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ECM")]
+        public type_ECM[] ECM {
+            get {
+                return this.eCMField;
+            }
+            set {
+                this.eCMField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_ECM {
+        
+        private int cAS_idField;
+        
+        private int output_ECM_PIDField;
+        
+        /// <remarks/>
+        public int CAS_id {
+            get {
+                return this.cAS_idField;
+            }
+            set {
+                this.cAS_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_ECM_PID {
+            get {
+                return this.output_ECM_PIDField;
+            }
+            set {
+                this.output_ECM_PIDField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class pmt_patching_processing {
+        
+        private type_ECM[] eCMField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ECM")]
+        public type_ECM[] ECM {
+            get {
+                return this.eCMField;
+            }
+            set {
+                this.eCMField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_pmt_processing_mode {
+        
+        private object itemField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("pmt_passthrough", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("pmt_patching", typeof(pmt_patching_processing))]
+        [System.Xml.Serialization.XmlElementAttribute("pmt_regeneration", typeof(pmt_regeneration_processing))]
+        public object Item {
+            get {
+                return this.itemField;
+            }
+            set {
+                this.itemField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_service {
+        
+        private int source_idField;
+        
+        private int input_service_idField;
+        
+        private int output_service_idField;
+        
+        private string output_service_nameField;
+        
+        private string output_provider_nameField;
+        
+        private bool eit_schedule_flagField;
+        
+        private bool eit_present_following_flagField;
+        
+        private int running_statusField;
+        
+        private int free_ca_modeField;
+        
+        private int output_PMT_PIDField;
+        
+        private type_pmt_processing_mode pmt_processing_modeField;
+        
+        /// <remarks/>
+        public int source_id {
+            get {
+                return this.source_idField;
+            }
+            set {
+                this.source_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int input_service_id {
+            get {
+                return this.input_service_idField;
+            }
+            set {
+                this.input_service_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_service_id {
+            get {
+                return this.output_service_idField;
+            }
+            set {
+                this.output_service_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string output_service_name {
+            get {
+                return this.output_service_nameField;
+            }
+            set {
+                this.output_service_nameField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string output_provider_name {
+            get {
+                return this.output_provider_nameField;
+            }
+            set {
+                this.output_provider_nameField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool eit_schedule_flag {
+            get {
+                return this.eit_schedule_flagField;
+            }
+            set {
+                this.eit_schedule_flagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool eit_present_following_flag {
+            get {
+                return this.eit_present_following_flagField;
+            }
+            set {
+                this.eit_present_following_flagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int running_status {
+            get {
+                return this.running_statusField;
+            }
+            set {
+                this.running_statusField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int free_ca_mode {
+            get {
+                return this.free_ca_modeField;
+            }
+            set {
+                this.free_ca_modeField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_PMT_PID {
+            get {
+                return this.output_PMT_PIDField;
+            }
+            set {
+                this.output_PMT_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_pmt_processing_mode pmt_processing_mode {
+            get {
+                return this.pmt_processing_modeField;
+            }
+            set {
+                this.pmt_processing_modeField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_pid_proc {
+        
+        private int source_idField;
+        
+        private int input_PIDField;
+        
+        private int output_PIDField;
+        
+        /// <remarks/>
+        public int source_id {
+            get {
+                return this.source_idField;
+            }
+            set {
+                this.source_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int input_PID {
+            get {
+                return this.input_PIDField;
+            }
+            set {
+                this.input_PIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_PID {
+            get {
+                return this.output_PIDField;
+            }
+            set {
+                this.output_PIDField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_output_TS {
+        
+        private int pLP_idField;
+        
+        private bool pLP_idFieldSpecified;
+        
+        private int output_TS_idField;
+        
+        private int output_ON_idField;
+        
+        private type_pid_proc[] pid_processingField;
+        
+        private type_service[] service_pmt_processingField;
+        
+        private type_psisi_processing_mode psisi_processingField;
+        
+        private int nsteps_to_liveField;
+        
+        /// <remarks/>
+        public int PLP_id {
+            get {
+                return this.pLP_idField;
+            }
+            set {
+                this.pLP_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public bool PLP_idSpecified {
+            get {
+                return this.pLP_idFieldSpecified;
+            }
+            set {
+                this.pLP_idFieldSpecified = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_TS_id {
+            get {
+                return this.output_TS_idField;
+            }
+            set {
+                this.output_TS_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int output_ON_id {
+            get {
+                return this.output_ON_idField;
+            }
+            set {
+                this.output_ON_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("pid", IsNullable=false)]
+        public type_pid_proc[] pid_processing {
+            get {
+                return this.pid_processingField;
+            }
+            set {
+                this.pid_processingField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlArrayItemAttribute("service", IsNullable=false)]
+        public type_service[] service_pmt_processing {
+            get {
+                return this.service_pmt_processingField;
+            }
+            set {
+                this.service_pmt_processingField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public type_psisi_processing_mode psisi_processing {
+            get {
+                return this.psisi_processingField;
+            }
+            set {
+                this.psisi_processingField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int Nsteps_to_live {
+            get {
+                return this.nsteps_to_liveField;
+            }
+            set {
+                this.nsteps_to_liveField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.8.9037.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class type_input_parent {
+        
+        private int input_TS_idField;
+        
+        private int input_ON_idField;
+        
+        private int source_idField;
+        
+        private int pMT_PID_SIS_serviceField;
+        
+        private bool primary_SIS_Service_FlagField;
+        
+        /// <remarks/>
+        public int input_TS_id {
+            get {
+                return this.input_TS_idField;
+            }
+            set {
+                this.input_TS_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int input_ON_id {
+            get {
+                return this.input_ON_idField;
+            }
+            set {
+                this.input_ON_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int source_id {
+            get {
+                return this.source_idField;
+            }
+            set {
+                this.source_idField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public int PMT_PID_SIS_service {
+            get {
+                return this.pMT_PID_SIS_serviceField;
+            }
+            set {
+                this.pMT_PID_SIS_serviceField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool Primary_SIS_Service_Flag {
+            get {
+                return this.primary_SIS_Service_FlagField;
+            }
+            set {
+                this.primary_SIS_Service_FlagField = value;
+            }
+        }
+    }
+}
diff --git a/Documentation/SIS-XSD/sis.xsd b/Documentation/SIS-XSD/sis.xsd
new file mode 100644
index 0000000..dc8200b
--- /dev/null
+++ b/Documentation/SIS-XSD/sis.xsd
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="DSACI">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="global_configuration" type="type_global_configuration" />
+				<xs:element name="input_configuration" type="type_input_configuration" />
+				<xs:element name="remultiplexing" type="type_remultiplexing"/>
+				<xs:element name="output_processing" type="type_output_processing"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	
+	<!-- type_global_configuration -->
+	<xs:complexType name="type_global_configuration">
+		<xs:sequence>
+			<xs:element name="current_DSA_group_id" type="xs:int"/>
+			<xs:element name="global_version_number" type="type_version_number"/>
+			<xs:element name="global_application_time" type="xs:int"/>
+			<xs:element name="SIS_edition" type="type_SIS_edition"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_SIS_edition -->
+	<xs:complexType name="type_SIS_edition">
+		<xs:sequence>
+			<xs:element name="major" type="xs:int"/>
+			<xs:element name="middle" type="xs:int"/>
+			<xs:element name="minor" type="xs:int"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_input_configuration -->
+	<xs:complexType name="type_input_configuration">
+		<xs:sequence>
+			<xs:element maxOccurs="unbounded" minOccurs="1" name="input" type="type_input_parent" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_input_parent: number of instances equals number of defined inputs -->
+	<xs:complexType name="type_input_parent">
+		<xs:sequence>
+			<xs:element name="input_TS_id" type="xs:int"/>
+			<xs:element name="input_ON_id" type="xs:int"/>
+			<xs:element name="source_id" type="xs:int"/>
+			<xs:element name="PMT_PID_SIS_service" type="type_pid"/>
+			<xs:element name="Primary_SIS_Service_Flag" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_remultiplexing -->
+	<xs:complexType name="type_remultiplexing">
+		<xs:sequence>
+			<xs:element name="output_TS" type= "type_output_TS" minOccurs="1" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_output_TS: number of instances equals number of defined output TS -->
+	<xs:complexType name="type_output_TS">
+		<xs:sequence>
+			<xs:element name="PLP_id" minOccurs="0" maxOccurs="1" type="xs:int"/>
+			<xs:element name="output_TS_id" type="xs:int"/>
+			<xs:element name="output_ON_id" type="xs:int"/>
+			<xs:element name="pid_processing" type= "type_pid_processing"/>
+			<xs:element name="service_pmt_processing" type="type_service_pmt_processing"/>
+			<xs:element name="psisi_processing" type="type_psisi_processing_mode"/>
+			<xs:element name="Nsteps_to_live" type="xs:int"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_pid_processing -->
+	<xs:complexType name="type_pid_processing">
+		<xs:sequence>
+			<xs:element name="pid" type="type_pid_proc" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_pid_proc: number of instances equals number of defined output pid -->
+	<xs:complexType name="type_pid_proc">
+		<xs:sequence>
+			<xs:element name="source_id" type="xs:int"/>
+			<xs:element name="input_PID" type="type_pid"/>
+			<xs:element name="output_PID" type="type_pid"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_service_pmt_processing -->
+	<xs:complexType name="type_service_pmt_processing">
+		<xs:sequence>
+			<xs:element name="service" type="type_service" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- type_service: number of instances equals number of defined service in an output TS -->
+	<xs:complexType name="type_service">
+		<xs:sequence>
+			<xs:element name="source_id" type="xs:int"/>
+			<xs:element name="input_service_id" type="xs:int"/>
+			<xs:element name="output_service_id" type="xs:int"/>
+			<xs:element name="output_service_name" type="xs:string"/>
+			<xs:element name="output_provider_name" type="xs:string"/>
+			<xs:element name="eit_schedule_flag" type="xs:boolean"/>
+			<xs:element name="eit_present_following_flag" type="xs:boolean"/>
+			<xs:element name="running_status" type="xs:int"/>
+			<xs:element name="free_ca_mode" type="xs:int"/>
+			<xs:element name="output_PMT_PID" type="type_pid"/>
+			<xs:element name="pmt_processing_mode" type="type_pmt_processing_mode"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_pmt_processing_mode -->
+	<xs:complexType name="type_pmt_processing_mode">
+		<xs:choice>
+			<xs:element name="pmt_passthrough" type="pmt_passthrough_processing"/>
+			<xs:element name="pmt_patching" type="pmt_patching_processing"/>
+			<xs:element name="pmt_regeneration" type="pmt_regeneration_processing"/>
+		</xs:choice>
+	</xs:complexType>
+	
+	<!-- pmt_passthrough_processing -->
+	<xs:simpleType name="pmt_passthrough_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<!-- pmt_patching_processing -->
+	<xs:complexType name="pmt_patching_processing">
+		<xs:sequence>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="ECM" type="type_ECM"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- pmt_regeneration_processing -->
+	<xs:complexType name="pmt_regeneration_processing">
+		<xs:sequence>
+			<xs:element name="table_repetition_period" type="xs:int"/>
+			<xs:element name="offset" type="xs:int"/>
+			<xs:element name="PCR_PID" type="type_pid"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="output_pid" type="type_pid"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="ECM" type="type_ECM"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_ECM -->
+	<xs:complexType name="type_ECM">
+		<xs:sequence>
+			<xs:element name="CAS_id" type="xs:int"/>
+			<xs:element name="output_ECM_PID" type="type_pid"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_psisi_processing_mode -->
+	<xs:complexType name="type_psisi_processing_mode">
+		<xs:sequence>
+			<xs:element name="pat" type="type_pat_processing_mode"/>
+			<xs:element name="cat" type="type_cat_processing_mode"/>
+			<xs:element name="sdt_bat" type="type_sdt_bat_processing_mode"/>
+			<xs:element name="eit" type="type_eit_processing_mode"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_pat_processing_mode -->
+	<xs:complexType name="type_pat_processing_mode">
+		<xs:choice>
+			<xs:element name="pat_passthrough" type="pat_passthrough_processing"/>
+			<xs:element name="pat_patching" type="pat_patching_processing"/>
+			<xs:element name="pat_regeneration" type="pat_regeneration_processing"/>
+		</xs:choice>
+	</xs:complexType>
+	
+	<!-- pat_passthrough_processing -->
+	<xs:simpleType name="pat_passthrough_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+	<!-- pat_patching_processing -->
+	<xs:simpleType name="pat_patching_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	
+	<!-- pat_regeneration_processing -->
+	<xs:complexType name="pat_regeneration_processing">
+		<xs:sequence>
+			<xs:element name="table_repetition_period" type="xs:int"/>
+			<xs:element name="offset" type="xs:int"/>
+			<xs:element name="PAT_version_number" type="type_version_number"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- type_cat_processing_mode -->
+	<xs:complexType name="type_cat_processing_mode">
+		<xs:choice>
+			<xs:element name="cat_stopping" type="cat_stopping_processing"/>
+			<xs:element name="cat_passthrough" type="cat_passthrough_processing"/>
+			<xs:element name="cat_patching" type="cat_patching_processing"/>
+			<xs:element name="cat_regeneration" type="cat_regeneration_processing"/>
+		</xs:choice>
+	</xs:complexType>
+	
+	<!-- cat_stopping_processing -->
+	<xs:simpleType name="cat_stopping_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	
+	<!-- cat_passthrough_processing -->
+	<xs:simpleType name="cat_passthrough_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	
+	<!-- cat_patching_processing -->
+	<xs:complexType name="cat_patching_processing">
+		<xs:sequence>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="ca_provider" type="type_ca_provider"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- cat_regeneration_processing -->
+	<xs:complexType name="cat_regeneration_processing">
+		<xs:sequence>
+			<xs:element name="table_repetition_period" type="xs:int"/>
+			<xs:element name="offset" type="xs:int"/>
+			<xs:element name="CAT_version_number" type="type_version_number"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="ca_provider" type="type_ca_provider"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- ca_provider: number of instances equals number of output EMM_PID’s -->
+	<xs:complexType name="type_ca_provider">
+		<xs:sequence>
+			<xs:element name="CAS_id" type="xs:int"/>
+			<xs:element name="output_EMM_PID" type="type_pid"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- type_sdt_processing_mode -->
+	<xs:complexType name="type_sdt_bat_processing_mode">
+		<xs:choice>
+			<xs:element name="sdt_passthrough" type="sdt_passthrough_processing"/>
+			<xs:element name="sdt_patching" type="sdt_patching_processing"/>
+			<xs:element name="sdt_regeneration" type="sdt_regeneration_processing"/>
+		</xs:choice>
+	</xs:complexType>
+	
+	<!-- sdt_passthrough_processing -->
+	<xs:simpleType name="sdt_passthrough_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	
+	<!-- sdt_patching_processing -->
+	<xs:complexType name="sdt_patching_processing">
+		<xs:sequence>
+			<xs:element name="sdt_crossreferencing_flag" type="xs:boolean"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="other_mux" type="type_other_mux"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="bouquet" type="type_bouquet"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- sdt_regeneration_processing -->
+	<xs:complexType name="sdt_regeneration_processing">
+		<xs:sequence>
+			<xs:element name="sdt_actual_period" type="xs:int"/>
+			<xs:element name="M_actual" type="xs:int"/>
+			<xs:element name="offset" type="xs:int"/>
+			<xs:element name="sdt_actual_version_number" type="xs:int"/>
+			<xs:element name="sdt_crossreferencing_flag" type="xs:boolean"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="other_mux" type="type_other_mux"/>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="bouquet" type="type_bouquet"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- other_mux: number of instances equals number of defined other muxes -->
+	<xs:complexType name="type_other_mux">
+		<xs:sequence>
+			<xs:element name="other_DSA_group_id" type="xs:int"/>
+			<xs:element name="DSACI_PID" type="type_pid"/>
+			<xs:element name="source_id" type="xs:int"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_bouquet -->
+	<xs:complexType name="type_bouquet">
+		<xs:sequence>
+			<xs:element name="source_id" type="xs:int"/>
+			<xs:element name="input_bouquet_id" type="xs:int"/>
+			<xs:element name="terrestrial_bouquet_id" type="xs:int"/>
+		</xs:sequence>
+	</xs:complexType>
+	
+	<!-- type_eit_processing_mode -->
+	<xs:complexType name="type_eit_processing_mode">
+		<xs:choice>
+			<xs:element name="eit_passthrough" type="eit_passthrough_processing"/>
+			<xs:element name="eit_patching" type="eit_patching_processing"/>
+			<xs:element name="eit_regeneration" type="eit_regeneration_processing"/>
+		</xs:choice>
+	</xs:complexType>
+	
+	<!-- eit_passthrough_processing -->
+	<xs:simpleType name="eit_passthrough_processing">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+
+<!-- eit_patching_processing -->
+<xs:complexType name="eit_patching_processing">
+<xs:sequence>
+<xs:element name="eit_crossreferencing_flag" type="xs:boolean"/>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="other_mux" type="type_other_mux"/>
+</xs:sequence>
+</xs:complexType>
+<!-- eit_regeneration_processing -->
+<xs:complexType name="eit_regeneration_processing">
+<xs:sequence>
+<xs:element name="eit_pf_actual_period" type="xs:int"/>
+<xs:element name="eit_pf_other_period" type="xs:int"/>
+<xs:element name="eit_sch_1stday_actual_period" type="xs:int"/>
+<xs:element name="eit_sch_1stday_other_period" type="xs:int"/>
+<xs:element name="eit_sch_2nd_8th_actual_period" type="xs:int"/>
+<xs:element name="eit_sch_2nd_8th_other_period" type="xs:int"/>
+<xs:element name="eit_sch_sup_8th_actual_period" type="xs:int"/>
+<xs:element name="eit_sch_sup_8th_other_period" type="xs:int"/>
+<xs:element name="eit_insertion_window_duration" type="xs:int"/>
+<xs:element name="eit_cross_referencing_flag" type="xs:boolean"/>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="other_mux" type="type_other_mux"/>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="DTT_only_service"
+type="type_DTT_only_service"/>
+</xs:sequence>
+</xs:complexType>
+<!-- DTT_only_service: number of instances equals number of defined DTT only service -->
+<xs:complexType name="type_DTT_only_service">
+<xs:sequence>
+<xs:element name="DTT_only_service_id" type="xs:int"/>
+<xs:element name="input_EIT_PID" type="type_pid"/>
+<xs:element name="source_id" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<!-- type_output_processing -->
+<xs:complexType name="type_output_processing">
+<xs:sequence>
+<xs:element name="terrestrial_standard_generation"
+type="type_terrestrial_standard_generation" />
+</xs:sequence>
+</xs:complexType>
+<!-- type_terrestrial_standard -->
+<xs:complexType name="type_terrestrial_standard_generation">
+<xs:choice>
+<xs:element name="dvb_t" type="dvb_t_standard"/>
+<xs:element name="dvb_t2" type="dvb_t2_standard"/>
+</xs:choice>
+</xs:complexType>
+<!-- dvb_t_standard -->
+<xs:simpleType name="dvb_t_standard">
+<xs:restriction base="xs:string"/>
+</xs:simpleType>
+<!-- dvb_t2_standard -->
+<xs:complexType name="dvb_t2_standard">
+<xs:sequence>
+<xs:element name="output_T2_MI_PID" type="type_pid"/>
+<xs:element name="output_T2_MI_stream_id" type="xs:int"/>
+<xs:element name="output_rate" type="xs:int"/>
+<xs:element maxOccurs="1" minOccurs="0" name="L2_signalling" type="type_L2_signalling"/>
+</xs:sequence>
+</xs:complexType>
+<!-- L2_signalling -->
+<xs:complexType name="type_L2_signalling">
+<xs:sequence>
+<xs:element name="output_TS_id" type="xs:int"/>
+<xs:element name="output_ON_id" type="xs:int"/>
+<xs:element name="output_L2_service_id" type="xs:int"/>
+<xs:element name="output_L2_service_provider_name" type="xs:string"/>
+<xs:element name="output_L2_service_name" type="xs:string"/>
+
+<xs:element name="output_L2_PCR_PID" type="type_pid"/>
+<xs:element name="output_L2_PMT_PID" type="type_pid"/>
+</xs:sequence>
+</xs:complexType>
+<!-- Other types -->
+<xs:simpleType name="type_version_number">
+<xs:restriction base="xs:int">
+<xs:minInclusive value="0"/>
+<xs:maxInclusive value="31"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="type_pid">
+<xs:restriction base="xs:int">
+<xs:minInclusive value="0"/>
+<xs:maxInclusive value="8191"/>
+</xs:restriction>
+</xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/skyscraper8/Mpeg2/Psi/Model/ProgramMappingStream.cs b/skyscraper8/Mpeg2/Psi/Model/ProgramMappingStream.cs
index 465840b..ed81701 100644
--- a/skyscraper8/Mpeg2/Psi/Model/ProgramMappingStream.cs
+++ b/skyscraper8/Mpeg2/Psi/Model/ProgramMappingStream.cs
@@ -221,8 +221,9 @@ namespace skyscraper5.Mpeg2.Psi.Model
 		public byte[] PrivateData { get; internal set; }
 
         //Voile tools
-		public bool Ac3DescriptorPresent { get; internal set; }
+		public bool? Ac3DescriptorPresent { get; internal set; }
 		public int NumDescriptors { get; internal set; }
+		public bool? Ac3PlusDescriptorPresent { get; internal set; }
 
 		public List<UserDefinedDescriptor> UnknownUserDefines;
 		public ProgramMappingStream(PmtStreamType streamType, int elementaryPid)
diff --git a/skyscraper8/Mpeg2/Psi/PmtParser.cs b/skyscraper8/Mpeg2/Psi/PmtParser.cs
index 1fa80cc..f48025e 100644
--- a/skyscraper8/Mpeg2/Psi/PmtParser.cs
+++ b/skyscraper8/Mpeg2/Psi/PmtParser.cs
@@ -258,6 +258,7 @@ namespace skyscraper5.Mpeg2.Psi
                         output.Substream1 = eac3d.Substream1;
                         output.Substream2 = eac3d.Substream2;
                         output.Substream3 = eac3d.Substream3;
+                        output.Ac3PlusDescriptorPresent = true;
                         break;
                     case nameof(HevcVideoDescriptor):
                         HevcVideoDescriptor hvd = (HevcVideoDescriptor)dvbDescriptor;
diff --git a/skyscraper8/Skyscraper/Scraper/ISkyscraperUiJunction.cs b/skyscraper8/Skyscraper/Scraper/ISkyscraperUiJunction.cs
index 9c1fade..bb18805 100644
--- a/skyscraper8/Skyscraper/Scraper/ISkyscraperUiJunction.cs
+++ b/skyscraper8/Skyscraper/Scraper/ISkyscraperUiJunction.cs
@@ -227,6 +227,10 @@ namespace skyscraper5.Skyscraper.Scraper
 		void OnDvbSisTimestamp(int pid, _0x20_DvbT2Timestamp t2Timestamp);
 		void OnDvbSisPat(int sourcePid, SisPatContainer patContainer);
 		void OnDvbSisSdt(int sourcePid, SisSdtContainer sdtContainer);
+		void OnDvbSisDsaci(ushort currentDsaGroupId, int versionNumber, byte sectionNumber, byte lastSectionNumber, Stream dsaci);
+		void OnDvbSisPmt(int sourcePid, SisPmtContainer pmtContainer);
+		void OnDvbSisNit(int sourcePid, SisNitContainer nitContainer);
+		void OnDvbSisTdt(int sourcePid, DateTime? utcTime);
 
 		TaskQueue Tasks { get; set; }
 
diff --git a/skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs b/skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs
index 5b29bbe..960fec5 100644
--- a/skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs
+++ b/skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs
@@ -3413,6 +3413,8 @@ namespace skyscraper5.Skyscraper.Scraper
 
         public void OnSisDsaci(ushort currentDsaGroupId, int versionNumber, byte sectionNumber, byte lastSectionNumber, Stream dsaci)
         {
+            UiJunction?.OnDvbSisDsaci(currentDsaGroupId, versionNumber, sectionNumber, lastSectionNumber, dsaci);
+
             if (!CurrentNetworkId.HasValue)
                 return;
 
@@ -3429,11 +3431,9 @@ namespace skyscraper5.Skyscraper.Scraper
                 {
                     dsaci = new GZipStream(dsaci, CompressionMode.Decompress);
                 }
-                MemoryStream ms = new MemoryStream();
-                dsaci.CopyTo(ms);
 
                 LogEvent(SkyscraperContextEvent.DvbSisDaughterSiteAdapterConfiguration, String.Format("Group ID = {0}, Version = {1}", currentDsaGroupId, versionNumber));
-                ObjectStorage.StoreSisDsaci(CurrentNetworkId.Value, CurrentTransportStreamId.Value, currentDsaGroupId, versionNumber, ms);
+                ObjectStorage.StoreSisDsaci(CurrentNetworkId.Value, CurrentTransportStreamId.Value, currentDsaGroupId, versionNumber, dsaci);
                 dsaci.Dispose();
             }
         }
@@ -3474,6 +3474,7 @@ namespace skyscraper5.Skyscraper.Scraper
 
         public void OnSisNit(int sourcePid, ushort sourceProgram, SisNitContainer nitContainer)
         {
+            UiJunction?.OnDvbSisNit(sourcePid, nitContainer);
             SkyscraperContext skyscraperContext = GetSisContext(sourceProgram);
             if (nitContainer.NetworkId.HasValue)
                 skyscraperContext.SetNetworkId(nitContainer.NetworkId.Value);
@@ -3507,6 +3508,7 @@ namespace skyscraper5.Skyscraper.Scraper
 
         public void OnSisPmt(int sourcePid, ushort sourceProgram, SisPmtContainer pmtContainer)
         {
+            UiJunction?.OnDvbSisPmt(sourcePid, pmtContainer);
             SkyscraperContext context = GetSisContext(sourceProgram);
             context.PmtEvent(pmtContainer.ProgramMapping, 0);
         }
@@ -3532,6 +3534,7 @@ namespace skyscraper5.Skyscraper.Scraper
 
         public void OnSisTdt(int sourcePid, ushort sourceProgram, SisTdtContainer tdtContainer)
         {
+            UiJunction?.OnDvbSisTdt(sourcePid, tdtContainer.UtcTime);
             if (tdtContainer.UtcTime.HasValue)
             {
                 SkyscraperContext context = GetSisContext(sourceProgram);