diff --git a/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs b/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs
index 5364de0..2116566 100644
--- a/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs
+++ b/Solutions/Ais.Net.Specs/Ais/Net/Specs/ParsePayloadSpecs.feature.cs
@@ -26,7 +26,7 @@ public partial class ParsePayloadSpecsFeature
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = ((string[])(null));
+        private static string[] featureTags = ((string[])(null));
         
 #line 1 "ParsePayloadSpecs.feature"
 #line hidden
@@ -36,7 +36,7 @@ public virtual void FeatureSetup()
         {
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
             TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Ais/Net/Specs", "ParsePayloadSpecs", "    In order process AIS messages from an nm4 file\r\n    As a developer\r\n    I wan" +
-                    "t the NmeaPayloadParser to be able report the message type", ProgrammingLanguage.CSharp, ((string[])(null)));
+                    "t the NmeaPayloadParser to be able report the message type", ProgrammingLanguage.CSharp, featureTags);
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -48,28 +48,28 @@ public virtual void FeatureTearDown()
         }
         
         [NUnit.Framework.SetUpAttribute()]
-        public virtual void TestInitialize()
+        public void TestInitialize()
         {
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public void TestTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioInitialize(scenarioInfo);
             testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
         }
         
-        public virtual void ScenarioStart()
+        public void ScenarioStart()
         {
             testRunner.OnScenarioStart();
         }
         
-        public virtual void ScenarioCleanup()
+        public void ScenarioCleanup()
         {
             testRunner.CollectScenarioErrors();
         }
@@ -88,28 +88,18 @@ public virtual void ScenarioCleanup()
         [NUnit.Framework.TestCaseAttribute("B3o8B<00F8:0h694gOtbgwqUoP06", "0", "18", null)]
         [NUnit.Framework.TestCaseAttribute("H000000000000000000000000000", "0", "24", null)]
         [NUnit.Framework.TestCaseAttribute("H3m9b308tL5<d`4E80000000000", "2", "24", null)]
-        public virtual void PeekMessageTypeWithoutDecodingInFull(string payload, string padding, string type, string[] exampleTags)
+        public void PeekMessageTypeWithoutDecodingInFull(string payload, string padding, string type, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("payload", payload);
             argumentsOfScenario.Add("padding", padding);
             argumentsOfScenario.Add("type", type);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Peek message type without decoding in full", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Peek message type without decoding in full", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 15
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
diff --git a/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs b/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs
index f6fe0b5..d48bfcf 100644
--- a/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs
+++ b/Solutions/Ais.Net.Specs/Ais/Net/Specs/SentenceLayerSpecs.feature.cs
@@ -26,7 +26,7 @@ public partial class SentenceLayerSpecsFeature
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = ((string[])(null));
+        private static string[] featureTags = ((string[])(null));
         
 #line 1 "SentenceLayerSpecs.feature"
 #line hidden
@@ -37,7 +37,7 @@ public virtual void FeatureSetup()
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
             TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Ais/Net/Specs", "SentenceLayerSpecs", "    In order process AIS messages from an nm4 file\r\n    As a developer\r\n    I wan" +
                     "t to the NmeaLineParser to be able to identify the main parts of a line from an " +
-                    "NMEA file", ProgrammingLanguage.CSharp, ((string[])(null)));
+                    "NMEA file", ProgrammingLanguage.CSharp, featureTags);
             testRunner.OnFeatureStart(featureInfo);
         }
         
@@ -49,53 +49,43 @@ public virtual void FeatureTearDown()
         }
         
         [NUnit.Framework.SetUpAttribute()]
-        public virtual void TestInitialize()
+        public void TestInitialize()
         {
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public void TestTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        public void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioInitialize(scenarioInfo);
             testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
         }
         
-        public virtual void ScenarioStart()
+        public void ScenarioStart()
         {
             testRunner.OnScenarioStart();
         }
         
-        public virtual void ScenarioCleanup()
+        public void ScenarioCleanup()
         {
             testRunner.CollectScenarioErrors();
         }
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Tag block not present")]
-        public virtual void TagBlockNotPresent()
+        public void TagBlockNotPresent()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block not present", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block not present", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 15
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -114,25 +104,15 @@ public virtual void TagBlockNotPresent()
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Tag block present")]
-        public virtual void TagBlockPresent()
+        public void TagBlockPresent()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block present", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Tag block present", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 19
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -162,27 +142,17 @@ public virtual void TagBlockPresent()
         [NUnit.Framework.TestCaseAttribute("AXVDM", "RepeaterStation", null)]
         [NUnit.Framework.TestCaseAttribute("BSVDM", "DeprecatedBaseStation", null)]
         [NUnit.Framework.TestCaseAttribute("SAVDM", "PhysicalShoreStation", null)]
-        public virtual void AISTalkerId(string tag, string talkerId, string[] exampleTags)
+        public void AISTalkerId(string tag, string talkerId, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("tag", tag);
             argumentsOfScenario.Add("talkerId", talkerId);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS talker id", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS talker id", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 23
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -203,27 +173,17 @@ public virtual void AISTalkerId(string tag, string talkerId, string[] exampleTag
         [NUnit.Framework.DescriptionAttribute("AIS Origin")]
         [NUnit.Framework.TestCaseAttribute("AIVDM", "Vdm", null)]
         [NUnit.Framework.TestCaseAttribute("AIVDO", "Vdo", null)]
-        public virtual void AISOrigin(string tag, string dataOrigin, string[] exampleTags)
+        public void AISOrigin(string tag, string dataOrigin, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("tag", tag);
             argumentsOfScenario.Add("dataOrigin", dataOrigin);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS Origin", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("AIS Origin", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 40
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -242,25 +202,15 @@ public virtual void AISOrigin(string tag, string dataOrigin, string[] exampleTag
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Non-fragmented messages")]
-        public virtual void Non_FragmentedMessages()
+        public void Non_FragmentedMessages()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Non-fragmented messages", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Non-fragmented messages", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 51
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -293,7 +243,7 @@ public virtual void Non_FragmentedMessages()
         [NUnit.Framework.TestCaseAttribute("3", "1", "0", "3451", null)]
         [NUnit.Framework.TestCaseAttribute("3", "2", "0", "3451", null)]
         [NUnit.Framework.TestCaseAttribute("3", "3", "0", "3451", null)]
-        public virtual void FragmentedMessages(string totalFragments, string currentFragment, string sequentialMessageId, string sentenceGroupId, string[] exampleTags)
+        public void FragmentedMessages(string totalFragments, string currentFragment, string sequentialMessageId, string sentenceGroupId, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
@@ -301,21 +251,11 @@ public virtual void FragmentedMessages(string totalFragments, string currentFrag
             argumentsOfScenario.Add("currentFragment", currentFragment);
             argumentsOfScenario.Add("sequentialMessageId", sequentialMessageId);
             argumentsOfScenario.Add("sentenceGroupId", sentenceGroupId);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 74
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -349,28 +289,18 @@ public virtual void FragmentedMessages(string totalFragments, string currentFrag
         [NUnit.Framework.TestCaseAttribute("3", "1", "0", null)]
         [NUnit.Framework.TestCaseAttribute("3", "2", "0", null)]
         [NUnit.Framework.TestCaseAttribute("3", "3", "0", null)]
-        public virtual void FragmentedMessagesWithoutGroupIdsInHeader(string totalFragments, string currentFragment, string sequentialMessageId, string[] exampleTags)
+        public void FragmentedMessagesWithoutGroupIdsInHeader(string totalFragments, string currentFragment, string sequentialMessageId, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("totalFragments", totalFragments);
             argumentsOfScenario.Add("currentFragment", currentFragment);
             argumentsOfScenario.Add("sequentialMessageId", sequentialMessageId);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages without group ids in header", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Fragmented messages without group ids in header", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 92
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -400,26 +330,16 @@ public virtual void FragmentedMessagesWithoutGroupIdsInHeader(string totalFragme
         [NUnit.Framework.TestCaseAttribute("B", null)]
         [NUnit.Framework.TestCaseAttribute("1", null)]
         [NUnit.Framework.TestCaseAttribute("2", null)]
-        public virtual void RadioChannelCode(string channelCode, string[] exampleTags)
+        public void RadioChannelCode(string channelCode, string[] exampleTags)
         {
             string[] tagsOfScenario = exampleTags;
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
             argumentsOfScenario.Add("channelCode", channelCode);
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Radio channel code", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Radio channel code", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 107
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -438,25 +358,15 @@ public virtual void RadioChannelCode(string channelCode, string[] exampleTags)
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Payload")]
-        public virtual void Payload()
+        public void Payload()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Payload", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Payload", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 118
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
@@ -475,25 +385,15 @@ public virtual void Payload()
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Padding")]
-        public virtual void Padding()
+        public void Padding()
         {
             string[] tagsOfScenario = ((string[])(null));
             System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Padding", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Padding", null, tagsOfScenario, argumentsOfScenario, featureTags);
 #line 124
 this.ScenarioInitialize(scenarioInfo);
 #line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
+            if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags)))
             {
                 testRunner.SkipScenario();
             }
diff --git a/Solutions/Ais.Net/Ais/Net/NmeaTagBlockParser.cs b/Solutions/Ais.Net/Ais/Net/NmeaTagBlockParser.cs
index 3e7b1d1..325616a 100644
--- a/Solutions/Ais.Net/Ais/Net/NmeaTagBlockParser.cs
+++ b/Solutions/Ais.Net/Ais/Net/NmeaTagBlockParser.cs
@@ -60,7 +60,7 @@ public NmeaTagBlockParser(ReadOnlySpan<byte> source, bool throwWhenTagBlockConta
                 switch (fieldType)
                 {
                     case 'g':
-                        this.SentenceGrouping = this.ParseSentenceGrouping(ref source);
+                        this.SentenceGrouping = ParseSentenceGrouping(ref source);
                         break;
 
                     case 's':
@@ -105,7 +105,7 @@ public NmeaTagBlockParser(ReadOnlySpan<byte> source, bool throwWhenTagBlockConta
                         break;
                 }
 
-                static ReadOnlySpan<byte> AdvanceToNextField(ref ReadOnlySpan<byte> source)
+                static ReadOnlySpan<byte> AdvanceToNextField(scoped ref ReadOnlySpan<byte> source)
                 {
                     ReadOnlySpan<byte> result;
                     int next = source.IndexOf((byte)',');
@@ -140,7 +140,7 @@ static ReadOnlySpan<byte> AdvanceToNextField(ref ReadOnlySpan<byte> source)
         /// </summary>
         public long? UnixTimestamp { get; }
 
-        private static bool GetEnd(in ReadOnlySpan<byte> source, char? delimiter, out ReadOnlySpan<byte> remaining, out int length)
+        private static bool GetEnd(ref ReadOnlySpan<byte> source, char? delimiter, out int length)
         {
             if (delimiter.HasValue)
             {
@@ -148,11 +148,10 @@ private static bool GetEnd(in ReadOnlySpan<byte> source, char? delimiter, out Re
 
                 if (length < 0)
                 {
-                    remaining = source;
                     return false;
                 }
 
-                remaining = source.Slice(length + 1);
+                source = source.Slice(length + 1);
             }
             else
             {
@@ -161,12 +160,12 @@ private static bool GetEnd(in ReadOnlySpan<byte> source, char? delimiter, out Re
 
                 if (isLastField)
                 {
-                    remaining = ReadOnlySpan<byte>.Empty;
                     length = source.Length;
+                    source = ReadOnlySpan<byte>.Empty;
                 }
                 else
                 {
-                    remaining = source.Slice(length + 1);
+                    source = source.Slice(length + 1);
                 }
             }
 
@@ -177,19 +176,18 @@ private static bool ParseDelimitedInt(ref ReadOnlySpan<byte> source, out int res
         {
             result = default;
 
-            if (!GetEnd(source, delimiter, out ReadOnlySpan<byte> remaining, out int length))
+            ReadOnlySpan<byte> original = source;
+            if (!GetEnd(ref source, delimiter, out int length))
             {
                 return false;
             }
 
-            if (!Utf8Parser.TryParse(source, out result, out int consumed)
+            if (!Utf8Parser.TryParse(original, out result, out int consumed)
                 || consumed != length)
             {
                 return false;
             }
 
-            source = remaining;
-
             return true;
         }
 
@@ -197,23 +195,22 @@ private static bool ParseDelimitedLong(ref ReadOnlySpan<byte> source, out long r
         {
             result = default;
 
-            if (!GetEnd(source, delimiter, out ReadOnlySpan<byte> remaining, out int length))
+            ReadOnlySpan<byte> original = source;
+            if (!GetEnd(ref source, delimiter, out int length))
             {
                 return false;
             }
 
-            if (!Utf8Parser.TryParse(source, out result, out int consumed)
+            if (!Utf8Parser.TryParse(original, out result, out int consumed)
                 || consumed != length)
             {
                 return false;
             }
 
-            source = remaining;
-
             return true;
         }
 
-        private NmeaTagBlockSentenceGrouping ParseSentenceGrouping(ref ReadOnlySpan<byte> source)
+        private static NmeaTagBlockSentenceGrouping ParseSentenceGrouping(ref ReadOnlySpan<byte> source)
         {
             if (!ParseDelimitedInt(ref source, out int sentenceNumber, '-'))
             {