diff --git a/VAST 4.1 Samples/Ad_Verification-test.xml b/VAST 4.1 Samples/Ad_Verification-test.xml
index e59357a..93720e0 100644
--- a/VAST 4.1 Samples/Ad_Verification-test.xml	
+++ b/VAST 4.1 Samples/Ad_Verification-test.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">
   <Ad id="20001" sequence="1" conditionalAd="false">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>http://example.com/error</Error>
       <Extensions>
         <Extension type="iab-Count">
@@ -32,7 +32,7 @@
       <Category authority="foo" />
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="12:22:11">http://example.com/tracking/start</Tracking>
@@ -41,11 +41,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -59,6 +54,11 @@
               </MediaFile>
 			  
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Audio_DAAST_Sample.xml b/VAST 4.1 Samples/Audio_DAAST_Sample.xml
index ac97982..e137cc4 100644
--- a/VAST 4.1 Samples/Audio_DAAST_Sample.xml	
+++ b/VAST 4.1 Samples/Audio_DAAST_Sample.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">
   <Ad id="20007" sequence="1" conditionalAd="false" adType="audio">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>http://example.com/error</Error>
       <Extensions>
         <Extension type="iab-Count">
@@ -18,7 +18,7 @@
       <AdTitle>iabtechlab audio ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="01:28:23">http://example.com/tracking/start</Tracking>
@@ -27,11 +27,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -44,6 +39,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Category-test.xml b/VAST 4.1 Samples/Category-test.xml
index 99378b5..9f69939 100644
--- a/VAST 4.1 Samples/Category-test.xml	
+++ b/VAST 4.1 Samples/Category-test.xml	
@@ -14,7 +14,7 @@
       <Category authority="http://www.iabtechlab.com/categoryauthority">Vegan</Category>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="08:34:01">http://example.com/tracking/start</Tracking>
@@ -23,11 +23,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -40,6 +35,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Closed_Caption_Test.xml b/VAST 4.1 Samples/Closed_Caption_Test.xml
index c46dc7f..3b15bc1 100644
--- a/VAST 4.1 Samples/Closed_Caption_Test.xml	
+++ b/VAST 4.1 Samples/Closed_Caption_Test.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">
   <Ad id="20001" sequence="1" conditionalAd="false">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>http://example.com/error</Error>
       <Extensions>
         <Extension type="iab-Count">
@@ -18,7 +18,7 @@
       <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="09:15:23">http://example.com/tracking/start</Tracking>
@@ -27,11 +27,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
 				<ClosedCaptionFiles>
@@ -59,6 +54,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Conditional_Ad-test.xml b/VAST 4.1 Samples/Conditional_Ad-test.xml
index 042e1c0..79736cb 100644
--- a/VAST 4.1 Samples/Conditional_Ad-test.xml	
+++ b/VAST 4.1 Samples/Conditional_Ad-test.xml	
@@ -19,7 +19,7 @@
       <Category authority="http://www.iabtechlab.com/categoryauthority">AD CONTENT description category</Category>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226" apiFramework="VAST">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="12:20:10">http://example.com/tracking/start</Tracking>
@@ -28,11 +28,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -45,6 +40,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Event_Tracking-test.xml b/VAST 4.1 Samples/Event_Tracking-test.xml
index a38047f..bc807e4 100644
--- a/VAST 4.1 Samples/Event_Tracking-test.xml	
+++ b/VAST 4.1 Samples/Event_Tracking-test.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">
   <Ad id="20001" sequence="1" conditionalAd="false">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>http://example.com/error</Error>
       <Extensions>
         <Extension type="iab-Count">
@@ -18,7 +18,7 @@
       <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="10:05:20">http://example.com/tracking/start</Tracking>
@@ -27,11 +27,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -44,6 +39,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Inline_Companion_Tag-test.xml b/VAST 4.1 Samples/Inline_Companion_Tag-test.xml
index 0fb0d66..568b75a 100644
--- a/VAST 4.1 Samples/Inline_Companion_Tag-test.xml	
+++ b/VAST 4.1 Samples/Inline_Companion_Tag-test.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns="http://www.iab.com/VAST">
   <Ad id="20004" sequence="1" conditionalAd="false">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>http://example.com/error</Error>
       <Extensions>
         <Extension type="iab-Count">
@@ -20,8 +20,9 @@
       </AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <CompanionAds>
-            <Companion id="1232" width="100" height="150" assetWidth="250" assetHeight="200" expandedWidth="350" expandedHeight="250" adSlotID="3214" pxratio="1400">
+            <Companion id="1232" width="100" height="150" assetWidth="250" assetHeight="200" expandedWidth="350" expandedHeight="250" adSlotId="3214" pxratio="1400">
               <StaticResource creativeType="image/png">
                 <![CDATA[https://www.iab.com/wp-content/uploads/2014/09/iab-tech-lab-6-644x290.png]]>
               </StaticResource>
@@ -30,9 +31,9 @@
               </CompanionClickThrough>
             </Companion>
           </CompanionAds>
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
         </Creative>
-        <Creative id="5480" sequence="1" adId="2447226">
+        <Creative id="5481" sequence="1" adId="2447226">
+          <UniversalAdId idRegistry="Ad-ID" >8466</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="09:15:23">http://example.com/tracking/start</Tracking>
@@ -41,11 +42,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -58,8 +54,12 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
         </Creative>
       </Creatives>
       <Description>
diff --git a/VAST 4.1 Samples/Inline_Linear_Tag-test.xml b/VAST 4.1 Samples/Inline_Linear_Tag-test.xml
index d56013c..86e045d 100644
--- a/VAST 4.1 Samples/Inline_Linear_Tag-test.xml	
+++ b/VAST 4.1 Samples/Inline_Linear_Tag-test.xml	
@@ -18,7 +18,7 @@
       <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="09:15:23">http://example.com/tracking/start</Tracking>
@@ -27,11 +27,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -44,6 +39,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Inline_Non-Linear_Tag-test.xml b/VAST 4.1 Samples/Inline_Non-Linear_Tag-test.xml
index 95fbbb5..8190c80 100644
--- a/VAST 4.1 Samples/Inline_Non-Linear_Tag-test.xml	
+++ b/VAST 4.1 Samples/Inline_Non-Linear_Tag-test.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns="http://www.iab.com/VAST">
   <Ad id="20005" sequence="1" conditionalAd="false">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>
         <![CDATA[http://example.com/error]]>
       </Error>
@@ -24,9 +24,9 @@
       </AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <NonLinearAds>
-            <NonLinear>
+            <NonLinear width="350" height="350">
               <StaticResource creativeType="image/png">
                 <![CDATA[http://mms.businesswire.com/media/20150623005446/en/473787/21/iab_tech_lab.jpg]]>
               </StaticResource>
diff --git a/VAST 4.1 Samples/Inline_Simple.xml b/VAST 4.1 Samples/Inline_Simple.xml
index a173caa..1fd3563 100644
--- a/VAST 4.1 Samples/Inline_Simple.xml	
+++ b/VAST 4.1 Samples/Inline_Simple.xml	
@@ -1,7 +1,7 @@
 <VAST version="4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">
   <Ad id="20001" sequence="1" conditionalAd="false">
     <InLine>
-      <AdSystem version="4.0">iabtechlab</AdSystem>
+      <AdSystem version="4.1">iabtechlab</AdSystem>
       <Error>http://example.com/error</Error>
       <Impression id="Impression-ID">http://example.com/track/impression</Impression>
       <Pricing model="cpm" currency="USD">
@@ -14,7 +14,7 @@
       <Category authority="http://www.iabtechlab.com/categoryauthority">AD CONTENT description category</Category>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID">8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="09:15:23">http://example.com/tracking/start</Tracking>
@@ -23,11 +23,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -40,6 +35,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/No_Wrapper_Tag-test.xml b/VAST 4.1 Samples/No_Wrapper_Tag-test.xml
index e216621..3814b64 100644
--- a/VAST 4.1 Samples/No_Wrapper_Tag-test.xml	
+++ b/VAST 4.1 Samples/No_Wrapper_Tag-test.xml	
@@ -18,7 +18,7 @@
       <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="09:34:50">http://example.com/tracking/start</Tracking>
@@ -27,11 +27,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -44,6 +39,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Ready_to_serve_Media_Files_check-test.xml b/VAST 4.1 Samples/Ready_to_serve_Media_Files_check-test.xml
index 5a141dd..92f9547 100644
--- a/VAST 4.1 Samples/Ready_to_serve_Media_Files_check-test.xml	
+++ b/VAST 4.1 Samples/Ready_to_serve_Media_Files_check-test.xml	
@@ -18,7 +18,7 @@
       <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="01:28:23">http://example.com/tracking/start</Tracking>
@@ -27,11 +27,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -44,6 +39,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/SSAI_stitching _VPAID_separation-test.xml b/VAST 4.1 Samples/SSAI_stitching _VPAID_separation-test.xml
index 4f1510b..3a2aef8 100644
--- a/VAST 4.1 Samples/SSAI_stitching _VPAID_separation-test.xml	
+++ b/VAST 4.1 Samples/SSAI_stitching _VPAID_separation-test.xml	
@@ -14,10 +14,11 @@
       <Pricing model="cpm" currency="USD">
         <![CDATA[ 25.00 ]]>
       </Pricing>
-      <AdTitle>iabtechlab video ad</AdTitle>
+      <AdServingId>998-ABC-123</AdServingId>
+	  <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="10:32:23">http://example.com/tracking/start</Tracking>
@@ -31,8 +32,8 @@
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2500" width="1280" height="720" minBitrate="1800" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
                 <![CDATA[http://cdn.iabcdn.com/website/engineering/vast_4_0_pilot/vast_4.0_pilot-iab-hd.mp4]]>
               </MediaFile>
-              <Mezzanine>
-                <![CDATA[http://pilot.iabtechlab.com/beacon?type=complete&imprid=s5-ea2f7f298e28c0c98374491aec3dfeb1&ts=4235]]>
+              <Mezzanine delivery="streaming" width="1280" height="120" type="video/mp4">
+                <![CDATA[rtsp://pilot.iabtechlab.com/rawvideo?type=complete&imprid=s5-ea2f7f298e28c0c98374491aec3dfeb1&ts=4235]]>
               </Mezzanine>
               <InteractiveCreativeFile>
                 <![CDATA[http://pilot.iabtechlab.com/beacon?type=complete&imprid=s5-ea2f7f298e28c0c98374491aec3dfeb1&ts=4235]]>
diff --git a/VAST 4.1 Samples/SSAI_stitching_mezzanine_file_support-test.xml b/VAST 4.1 Samples/SSAI_stitching_mezzanine_file_support-test.xml
index f43d1c1..06e2818 100644
--- a/VAST 4.1 Samples/SSAI_stitching_mezzanine_file_support-test.xml	
+++ b/VAST 4.1 Samples/SSAI_stitching_mezzanine_file_support-test.xml	
@@ -7,10 +7,11 @@
       <Pricing model="cpm" currency="USD">
         <![CDATA[ 25.00 ]]>
       </Pricing>
+      <AdServingId>768-ABC-123</AdServingId>
       <AdTitle>iabtechlab video ad</AdTitle>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226" apiFramework="VPAID">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">1234</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >1234</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="01:34:00">http://example.com/tracking/start</Tracking>
@@ -30,8 +31,8 @@
               <MediaFile id="5246" delivery="progressive" type="video/mp4" bitrate="600" width="640" height="360" minBitrate="500" maxBitrate="700" scalable="1" maintainAspectRatio="1" codec="0">
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
-              <Mezzanine>
-                <![CDATA[http://pilot.iabtechlab.com/beacon?type=complete&imprid=s5-ea2f7f298e28c0c98374491aec3dfeb1&ts=4235]]>
+              <Mezzanine delivery="streaming" width="1280" height="120" type="video/mp4">
+                <![CDATA[rtsp://pilot.iabtechlab.com/rawvideo?type=complete&imprid=s5-ea2f7f298e28c0c98374491aec3dfeb1&ts=4235]]>
               </Mezzanine>
             </MediaFiles>
             <VideoClicks>
diff --git a/VAST 4.1 Samples/Universal_Ad_ID-test.xml b/VAST 4.1 Samples/Universal_Ad_ID-test.xml
index d957fb5..4b229e6 100644
--- a/VAST 4.1 Samples/Universal_Ad_ID-test.xml	
+++ b/VAST 4.1 Samples/Universal_Ad_ID-test.xml	
@@ -19,7 +19,7 @@
       <Category authority="http://www.iabtechlab.com/categoryauthority">AD CONTENT description category</Category>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID" >8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="08:34:01">http://example.com/tracking/start</Tracking>
@@ -28,11 +28,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -45,6 +40,11 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Video_Clicks_and_click_tracking-Inline-test.xml b/VAST 4.1 Samples/Video_Clicks_and_click_tracking-Inline-test.xml
index 61b3e44..2373a12 100644
--- a/VAST 4.1 Samples/Video_Clicks_and_click_tracking-Inline-test.xml	
+++ b/VAST 4.1 Samples/Video_Clicks_and_click_tracking-Inline-test.xml	
@@ -19,7 +19,7 @@
       <Category authority="http://www.iabtechlab.com/categoryauthority">AD CONTENT description category</Category>
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
-          <UniversalAdId idRegistry="Ad-ID" idValue="8465">8465</UniversalAdId>
+          <UniversalAdId idRegistry="Ad-ID">8465</UniversalAdId>
           <Linear>
             <TrackingEvents>
               <Tracking event="start" offset="09:45:23">http://example.com/tracking/start</Tracking>
@@ -28,14 +28,6 @@
               <Tracking event="thirdQuartile">http://example.com/tracking/thirdQuartile</Tracking>
               <Tracking event="complete">http://example.com/tracking/complete</Tracking>
             </TrackingEvents>
-            <VideoClicks>
-              <ClickThrough id="blog">
-                <![CDATA[https://iabtechlab.com]]>
-              </ClickThrough>
-              <ClickTracking>
-                <![CDATA[http://myTrackingURL/clickTracking]]>
-              </ClickTracking>
-            </VideoClicks>
             <Duration>00:00:16</Duration>
             <MediaFiles>
               <MediaFile id="5241" delivery="progressive" type="video/mp4" bitrate="2000" width="1280" height="720" minBitrate="1500" maxBitrate="2500" scalable="1" maintainAspectRatio="1" codec="0">
@@ -48,6 +40,14 @@
                 <![CDATA[https://iabtechlab.com/wp-content/uploads/2017/12/VAST-4.0-Short-Intro-low-resolution.mp4]]>
               </MediaFile>
             </MediaFiles>
+            <VideoClicks>
+              <ClickTracking>
+                <![CDATA[http://myTrackingURL/clickTracking]]>
+              </ClickTracking>
+              <ClickThrough id="blog">
+                <![CDATA[https://iabtechlab.com]]>
+              </ClickThrough>
+            </VideoClicks>
           </Linear>
         </Creative>
       </Creatives>
diff --git a/VAST 4.1 Samples/Wrapper_Tag-test.xml b/VAST 4.1 Samples/Wrapper_Tag-test.xml
index 203e11d..7c683ec 100644
--- a/VAST 4.1 Samples/Wrapper_Tag-test.xml	
+++ b/VAST 4.1 Samples/Wrapper_Tag-test.xml	
@@ -7,7 +7,7 @@
       <Creatives>
         <Creative id="5480" sequence="1" adId="2447226">
           <CompanionAds>
-            <Companion id="1232" width="100" height="150" assetWidth="250" assetHeight="200" expandedWidth="350" expandedHeight="250" apiFramework="VPAID" adSlotID="3214" pxratio="1400">
+            <Companion id="1232" width="100" height="150" assetWidth="250" assetHeight="200" expandedWidth="350" expandedHeight="250" apiFramework="VPAID" adSlotId="3214" pxratio="1400">
               <StaticResource creativeType="image/png">
                 <![CDATA[https://www.iab.com/wp-content/uploads/2014/09/iab-tech-lab-6-644x290.png]]>
               </StaticResource>