diff --git a/.gitignore b/.gitignore
index 4af11ff..663f9df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,80 @@
-# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
-[Oo]bj/
-
-# mstest test results
-TestResults
-
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
+*.userosscache
 *.sln.docstates
 
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
+[Dd]ebugPublic/
 [Rr]elease/
+[Rr]eleases/
 x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
+*_h.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -32,35 +83,81 @@ x64/
 *.tli
 *.tlh
 *.tmp
+*.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
 .builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
 
 # Visual C++ cache files
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
 
 # Guidance Automation Toolkit
 *.gpState
 
 # ReSharper is a .NET coding add-in
-_ReSharper*
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
 
 # NCrunch
-*.ncrunch*
+_NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
 
-# Installshield output folder 
-[Ee]xpress
+# Installshield output folder
+[Ee]xpress/
 
 # DocProject is a documentation generator add-in
 DocProject/buildhelp/
@@ -73,37 +170,184 @@ DocProject/Help/Html2
 DocProject/Help/html
 
 # Click-Once directory
-publish
+publish/
 
 # Publish Web Output
-*.Publish.xml
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
 
-# NuGet Packages Directory
-packages
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
 
-# Windows Azure Build Output
-csx
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
 *.build.csdef
 
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
 
 # Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-[Tt]est[Rr]esult*
-*.Cache
-ClientBin
-[Ss]tyle[Cc]op.*
+ClientBin/
 ~$*
+*~
 *.dbmdl
-Generated_Code #added for RIA/Silverlight projects
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
 
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
-/YoutubeExtractor/YoutubeExtractor.sln.ide
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
\ No newline at end of file
diff --git a/YoutubeExtractor/ExampleApplication.Portable/ExampleApplication.Portable.csproj b/YoutubeExtractor/ExampleApplication.Portable/ExampleApplication.Portable.csproj
index a52208a..8022b39 100644
--- a/YoutubeExtractor/ExampleApplication.Portable/ExampleApplication.Portable.csproj
+++ b/YoutubeExtractor/ExampleApplication.Portable/ExampleApplication.Portable.csproj
@@ -43,6 +43,10 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\YoutubeExtractor\YoutubeExtractor.csproj">
+      <Project>{ECDC127F-8DEF-4F99-8300-72C13597339D}</Project>
+      <Name>YoutubeExtractor</Name>
+    </ProjectReference>
     <ProjectReference Include="..\YoutubeExtractor\YoutubeExtractor_Portable.csproj">
       <Project>{1bb4cf4d-3617-4a23-b51a-da7711e6f8eb}</Project>
       <Name>YoutubeExtractor_Portable</Name>
diff --git a/YoutubeExtractor/ExampleApplication/ExampleApplication.csproj b/YoutubeExtractor/ExampleApplication/ExampleApplication.csproj
index 2a54837..795f328 100644
--- a/YoutubeExtractor/ExampleApplication/ExampleApplication.csproj
+++ b/YoutubeExtractor/ExampleApplication/ExampleApplication.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ExampleApplication</RootNamespace>
     <AssemblyName>ExampleApplication</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -30,6 +30,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <OutputPath>bin\Release\</OutputPath>
@@ -45,6 +46,7 @@
     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -60,6 +62,9 @@
       <Name>YoutubeExtractor</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/YoutubeExtractor/ExampleApplication/Program.cs b/YoutubeExtractor/ExampleApplication/Program.cs
index 257640a..d778a52 100644
--- a/YoutubeExtractor/ExampleApplication/Program.cs
+++ b/YoutubeExtractor/ExampleApplication/Program.cs
@@ -61,6 +61,7 @@ private static void DownloadVideo(IEnumerable<VideoInfo> videoInfos)
             /*
              * If the video has a decrypted signature, decipher it
              */
+            //Decrypt only if needed
             if (video.RequiresDecryption)
             {
                 DownloadUrlResolver.DecryptDownloadUrl(video);
@@ -72,8 +73,8 @@ private static void DownloadVideo(IEnumerable<VideoInfo> videoInfos)
              * The second argument is the path to save the video file.
              */
             var videoDownloader = new VideoDownloader(video,
-                Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                RemoveIllegalPathCharacters(video.Title) + video.VideoExtension));
+                 Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                 RemoveIllegalPathCharacters(video.Title) + video.VideoExtension));
 
             // Register the ProgressChanged event and print the current progress
             videoDownloader.DownloadProgressChanged += (sender, args) => Console.WriteLine(args.ProgressPercentage);
@@ -88,7 +89,14 @@ private static void DownloadVideo(IEnumerable<VideoInfo> videoInfos)
         private static void Main()
         {
             // Our test youtube link
-            const string link = "https://www.youtube.com/watch?v=YQHsXMglC9A";
+            // needs deciphering
+            //const string link = "https://www.youtube.com/watch?v=D92-DmVmB8Y";
+
+            // needs no deciphering
+            //const string link = "https://www.youtube.com/watch?v=2a4Uxdy9TQY";
+
+            //can't embed
+            const string link = "https://www.youtube.com/watch?v=nhZvvdRSQaE";
 
             /*
              * Get the available video formats.
@@ -107,4 +115,4 @@ private static string RemoveIllegalPathCharacters(string path)
             return r.Replace(path, "");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/YoutubeExtractor/ExampleApplication/app.config b/YoutubeExtractor/ExampleApplication/app.config
new file mode 100644
index 0000000..51278a4
--- /dev/null
+++ b/YoutubeExtractor/ExampleApplication/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/YoutubeExtractor/YoutubeExtractor.Tests/YoutubeExtractor.Tests.csproj b/YoutubeExtractor/YoutubeExtractor.Tests/YoutubeExtractor.Tests.csproj
index 9f50697..b4c177a 100644
--- a/YoutubeExtractor/YoutubeExtractor.Tests/YoutubeExtractor.Tests.csproj
+++ b/YoutubeExtractor/YoutubeExtractor.Tests/YoutubeExtractor.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>YoutubeExtractor.Tests</RootNamespace>
     <AssemblyName>YoutubeExtractor.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,11 +33,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net35\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -46,16 +50,22 @@
     <Compile Include="DownloadUrlResolverTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\YoutubeExtractor\YoutubeExtractor.csproj">
       <Project>{ecdc127f-8def-4f99-8300-72c13597339d}</Project>
       <Name>YoutubeExtractor</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>此專案參考這部電腦上所缺少的 NuGet 套件。請啟用 NuGet 套件還原，以下載該套件。如需詳細資訊，請參閱 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的檔案是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/YoutubeExtractor/YoutubeExtractor.Tests/packages.config b/YoutubeExtractor/YoutubeExtractor.Tests/packages.config
index 11e8d22..690be75 100644
--- a/YoutubeExtractor/YoutubeExtractor.Tests/packages.config
+++ b/YoutubeExtractor/YoutubeExtractor.Tests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net35" />
+  <package id="NUnit" version="3.12.0" targetFramework="net35" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/YoutubeExtractor/YoutubeExtractor/Decipherer.cs b/YoutubeExtractor/YoutubeExtractor/Decipherer.cs
index 65014cb..c5d41b1 100644
--- a/YoutubeExtractor/YoutubeExtractor/Decipherer.cs
+++ b/YoutubeExtractor/YoutubeExtractor/Decipherer.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -7,22 +8,19 @@ namespace YoutubeExtractor
 {
     internal static class Decipherer
     {
-        public static string DecipherWithVersion(string cipher, string cipherVersion)
+        public static string DecipherWithVersion(string js, string cipher)
         {
-            string jsUrl = string.Format("http://s.ytimg.com/yts/jsbin/player-{0}.js", cipherVersion);
-            string js = HttpHelper.DownloadString(jsUrl);
-
-            //Find "C" in this: var A = B.sig||C (B.s)
-            string functNamePattern = @"\.sig\s*\|\|([a-zA-Z0-9\$]+)\("; //Regex Formed To Find Word or DollarSign
+            //Find "yv" in this: c&&a.set(b,encodeURIComponent(yv(
+            string functNamePattern = @"(\w+)=function\(\w+\){(\w+)=\2\.split\(\x22{2}\);.*?return\s+\2\.join\(\x22{2}\)}"; //Regex Formed To Find Word or DollarSign
 
             var funcName = Regex.Match(js, functNamePattern).Groups[1].Value;
-            
-            if (funcName.Contains("$")) 
+
+            if (funcName.Contains("$"))
             {
                 funcName = "\\" + funcName; //Due To Dollar Sign Introduction, Need To Escape
             }
 
-            string funcPattern = @"(?!h\.)" + @funcName + @"=function\(\w+\)\{.*?\}"; //Escape funcName string
+            string funcPattern = @"(?!h\.)" + @funcName + @"=function\(\w+\)\{(.*?)\}"; //Escape funcName string
             var funcBody = Regex.Match(js, funcPattern, RegexOptions.Singleline).Value; //Entire sig function
             var lines = funcBody.Split(';'); //Each line in sig function
 
@@ -85,6 +83,36 @@ public static string DecipherWithVersion(string cipher, string cipherVersion)
             return DecipherWithOperations(cipher, operations);
         }
 
+        /// <summary>
+        /// From yt_dlp
+        /// Compute the response to YT's "n" parameter challenge
+        /// </summary>
+        /// <param name="js">text of the JS player code that includes the challenge response algorithm</param>
+        /// <param name="n_param">challenge string that is the value of the URL's "n" query parameter</param>
+        /// <returns></returns>
+        public static string NDescramble(string js, string n_param)
+        {
+            if (string.IsNullOrEmpty(js))
+                return n_param;
+
+            // yt_dlp/extractor/youtube.py#L1872 def _extract_n_function
+            var n_functionName = new Regex(@"\.get\(""n""\)\)&&\(b=([a-zA-Z0-9$]{3})\([a-zA-Z0-9]\)");
+
+            var funcname = n_functionName.Match(js).Groups[1].Value;
+
+            var func_m = Regex.Match(js, @"(?:function\s+" + funcname + @"|[{;,]\s*" + funcname + @"\s*=\s*function|var\s+" + funcname + @"\s*=\s*function)\s*\(([^)]*)\)\s*(\{(?:(?!};)[^""]|""([^""]|\\"")*"")+\})");
+
+            var str = func_m.Groups[0].Value;
+
+            var context = new NiL.JS.Core.Context();
+
+            context.Eval(str);
+            var result = context.Eval($"{funcname}('{n_param}')");
+            n_param = result.ToString();
+
+            return n_param;
+        }
+
         private static string ApplyOperation(string cipher, string op)
         {
             switch (op[0])
diff --git a/YoutubeExtractor/YoutubeExtractor/DownloadUrlResolver.cs b/YoutubeExtractor/YoutubeExtractor/DownloadUrlResolver.cs
index 6896edf..e6765da 100644
--- a/YoutubeExtractor/YoutubeExtractor/DownloadUrlResolver.cs
+++ b/YoutubeExtractor/YoutubeExtractor/DownloadUrlResolver.cs
@@ -1,9 +1,9 @@
-using System;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
-using Newtonsoft.Json.Linq;
 
 namespace YoutubeExtractor
 {
@@ -13,7 +13,8 @@ namespace YoutubeExtractor
     public static class DownloadUrlResolver
     {
         private const string RateBypassFlag = "ratebypass";
-        private const string SignatureQuery = "signature";
+        private const string SignatureQuery = "sig";
+        private const string NQuery = "n";
 
         /// <summary>
         /// Decrypts the signature in the <see cref="VideoInfo.DownloadUrl" /> property and sets it
@@ -24,28 +25,51 @@ public static class DownloadUrlResolver
         /// <exception cref="YoutubeParseException">
         /// There was an error while deciphering the signature.
         /// </exception>
-        public static void DecryptDownloadUrl(VideoInfo videoInfo)
+        public static void DecryptDownloadUrl(VideoInfo videoInfo, string js = "")
         {
-            IDictionary<string, string> queries = HttpHelper.ParseQueryString(videoInfo.DownloadUrl);
-
-            if (queries.ContainsKey(SignatureQuery))
+            string decipheredSignature = string.Empty;
+            IDictionary<string, string> strs = HttpHelper.ParseQueryString(videoInfo.DownloadUrl);
+            if (strs.ContainsKey(SignatureQuery))
             {
-                string encryptedSignature = queries[SignatureQuery];
+                string sigitem = strs[SignatureQuery];
+                try
+                {
+                    if (!string.IsNullOrEmpty(videoInfo.HtmlPlayerVersion))
+                    {
+                        string jsUrl = string.Format("https://www.youtube.com{0}", videoInfo.HtmlPlayerVersion);
+                        js = HttpHelper.DownloadString(jsUrl);
+
+                        decipheredSignature = GetDecipheredSignature(js, sigitem);
+                    }
+                    else
+                        decipheredSignature = sigitem;
+                }
+                catch (Exception exception)
+                {
+                    throw new YoutubeParseException("Could not decipher signature", exception);
+                }
+                videoInfo.DownloadUrl = HttpHelper.ReplaceQueryStringParameter(videoInfo.DownloadUrl, SignatureQuery, decipheredSignature);
+                videoInfo.RequiresDecryption = false;
+            }
+        }
 
-                string decrypted;
+        private static void DecryptDownloadUrlNParam(VideoInfo videoInfo, string js = "")
+        {
+            string n_param = string.Empty;
 
+            IDictionary<string, string> strs = HttpHelper.ParseQueryString(videoInfo.DownloadUrl);
+            if (strs.ContainsKey(SignatureQuery))
+            {
+                string nitem = strs[NQuery];
                 try
                 {
-                    decrypted = GetDecipheredSignature(videoInfo.HtmlPlayerVersion, encryptedSignature);
+                    n_param = GetNDescramble(js, nitem);
                 }
-
-                catch (Exception ex)
+                catch (Exception exception)
                 {
-                    throw new YoutubeParseException("Could not decipher signature", ex);
+                    Console.WriteLine(exception);
                 }
-
-                videoInfo.DownloadUrl = HttpHelper.ReplaceQueryStringParameter(videoInfo.DownloadUrl, SignatureQuery, decrypted);
-                videoInfo.RequiresDecryption = false;
+                videoInfo.DownloadUrl = HttpHelper.ReplaceQueryStringParameter(videoInfo.DownloadUrl, NQuery, n_param);
             }
         }
 
@@ -74,40 +98,43 @@ public static void DecryptDownloadUrl(VideoInfo videoInfo)
         public static IEnumerable<VideoInfo> GetDownloadUrls(string videoUrl, bool decryptSignature = true)
         {
             if (videoUrl == null)
+            {
                 throw new ArgumentNullException("videoUrl");
+            }
 
-            bool isYoutubeUrl = TryNormalizeYoutubeUrl(videoUrl, out videoUrl);
-
-            if (!isYoutubeUrl)
+            if (!TryNormalizeYoutubeUrl(videoUrl, out videoUrl))
             {
                 throw new ArgumentException("URL is not a valid youtube URL!");
             }
 
             try
             {
-                var json = LoadJson(videoUrl);
+                var model = LoadModel(videoUrl);
 
-                string videoTitle = GetVideoTitle(json);
+                string videoTitle = GetVideoTitle(model);
 
-                IEnumerable<ExtractionInfo> downloadUrls = ExtractDownloadUrls(json);
+                IEnumerable<VideoInfo> infos = GetVideoInfos(model).ToList();
 
-                IEnumerable<VideoInfo> infos = GetVideoInfos(downloadUrls, videoTitle).ToList();
+                string html5PlayerVersion = GetHtml5PlayerVersion(model.Microformat?.PlayerMicroformatRenderer?.Embed?.IframeUrl ?? videoUrl);
 
-                string htmlPlayerVersion = GetHtml5PlayerVersion(json);
+                string jsUrl = string.Format("https://www.youtube.com{0}", html5PlayerVersion);
+                string js = HttpHelper.DownloadString(jsUrl);
 
-                foreach (VideoInfo info in infos)
+                foreach (VideoInfo videoInfo in infos)
                 {
-                    info.HtmlPlayerVersion = htmlPlayerVersion;
+                    videoInfo.Title = videoTitle;
+                    videoInfo.HtmlPlayerVersion = html5PlayerVersion;
 
-                    if (decryptSignature && info.RequiresDecryption)
+                    DecryptDownloadUrlNParam(videoInfo, js);
+
+                    if (decryptSignature && videoInfo.RequiresDecryption)
                     {
-                        DecryptDownloadUrl(info);
+                        DecryptDownloadUrl(videoInfo, js);
                     }
                 }
 
                 return infos;
             }
-
             catch (Exception ex)
             {
                 if (ex is WebException || ex is VideoNotAvailableException)
@@ -135,200 +162,228 @@ public static System.Threading.Tasks.Task<IEnumerable<VideoInfo>> GetDownloadUrl
         /// and returns whether the normalization was successful or not.
         /// </summary>
         /// <param name="url">The YouTube URL to normalize.</param>
-        /// <param name="normalizedUrl">The normalized YouTube URL.</param>
+        /// <param name="videoId">The normalized YouTube URL.</param>
         /// <returns>
         /// <c>true</c>, if the normalization was successful; <c>false</c>, if the URL is invalid.
         /// </returns>
         public static bool TryNormalizeYoutubeUrl(string url, out string normalizedUrl)
         {
             url = url.Trim();
-
             url = url.Replace("youtu.be/", "youtube.com/watch?v=");
             url = url.Replace("www.youtube", "youtube");
             url = url.Replace("youtube.com/embed/", "youtube.com/watch?v=");
-
             if (url.Contains("/v/"))
             {
-                url = "http://youtube.com" + new Uri(url).AbsolutePath.Replace("/v/", "/watch?v=");
+                url = string.Concat("http://youtube.com", (new Uri(url)).AbsolutePath.Replace("/v/", "/watch?v="));
             }
-
             url = url.Replace("/watch#", "/watch?");
 
-            IDictionary<string, string> query = HttpHelper.ParseQueryString(url);
 
-            string v;
-
-            if (!query.TryGetValue("v", out v))
+            if (!HttpHelper.ParseQueryString(url).TryGetValue("v", out string v))
             {
                 normalizedUrl = null;
                 return false;
             }
 
-            normalizedUrl = "http://youtube.com/watch?v=" + v;
+            normalizedUrl = "https://youtube.com/watch?v=" + v;
 
             return true;
         }
 
-        private static IEnumerable<ExtractionInfo> ExtractDownloadUrls(JObject json)
+        private static List<Format> GetAdaptiveStreamMap(YoutubeModel model)
         {
-            string[] splitByUrls = GetStreamMap(json).Split(',');
-            string[] adaptiveFmtSplitByUrls = GetAdaptiveStreamMap(json).Split(',');
-            splitByUrls = splitByUrls.Concat(adaptiveFmtSplitByUrls).ToArray();
-
-            foreach (string s in splitByUrls)
-            {
-                IDictionary<string, string> queries = HttpHelper.ParseQueryString(s);
-                string url;
-
-                bool requiresDecryption = false;
-
-                if (queries.ContainsKey("s") || queries.ContainsKey("sig"))
-                {
-                    requiresDecryption = queries.ContainsKey("s");
-                    string signature = queries.ContainsKey("s") ? queries["s"] : queries["sig"];
-
-                    url = string.Format("{0}&{1}={2}", queries["url"], SignatureQuery, signature);
-
-                    string fallbackHost = queries.ContainsKey("fallback_host") ? "&fallback_host=" + queries["fallback_host"] : String.Empty;
-
-                    url += fallbackHost;
-                }
-
-                else
-                {
-                    url = queries["url"];
-                }
-
-                url = HttpHelper.UrlDecode(url);
-                url = HttpHelper.UrlDecode(url);
-
-                IDictionary<string, string> parameters = HttpHelper.ParseQueryString(url);
-                if (!parameters.ContainsKey(RateBypassFlag))
-                    url += string.Format("&{0}={1}", RateBypassFlag, "yes");
+            return model.StreamingData?.AdaptiveFormats.ToList();
+        }
 
-                yield return new ExtractionInfo { RequiresDecryption = requiresDecryption, Uri = new Uri(url) };
-            }
+        private static string GetNDescramble(string js, string signature)
+        {
+            return Decipherer.NDescramble(js, signature);
+        }
+        private static string GetDecipheredSignature(string js, string signature)
+        {
+            return Decipherer.DecipherWithVersion(js, signature);
         }
 
-        private static string GetAdaptiveStreamMap(JObject json)
+        private static string GetHtml5PlayerVersion(string url)
         {
-            JToken streamMap = json["args"]["adaptive_fmts"];
+            if (string.IsNullOrEmpty(url))
+                return null;
+
+            string str = HttpHelper.DownloadString(url);
 
-            // bugfix: adaptive_fmts is missing in some videos, use url_encoded_fmt_stream_map instead
-            if (streamMap == null)
+            var regexs = new List<Regex>() {
+                new Regex("\"(?:PLAYER_JS_URL|jsUrl)\"\\s*:\\s*\"([^\"]+)\""),
+                new Regex(@"\/s\/player\/([a-zA-Z0-9_-]{8,})\/player"),
+                // uncheck
+                new Regex(@"\/([a-zA-Z0-9_-]{8,})\/player(?:_ias\.vflset(?:\/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\.vflset)\/base\.js$"),
+                // uncheck
+                new Regex(@"\b(vfl[a-zA-Z0-9_-]+)\b.*?\.js$"),
+            };
+
+            foreach (var regex in regexs)
             {
-              streamMap = json["args"]["url_encoded_fmt_stream_map"];
+                if (regex.IsMatch(str))
+                    return regex.Match(str).Result("$1").Replace("\\/", "/");
             }
 
-            return streamMap.ToString();
+            return null;
         }
 
-        private static string GetDecipheredSignature(string htmlPlayerVersion, string signature)
+        private static List<Format> GetStreamMap(YoutubeModel model)
         {
-            return Decipherer.DecipherWithVersion(signature, htmlPlayerVersion);
+            return model.StreamingData?.Formats.ToList();
         }
 
-        private static string GetHtml5PlayerVersion(JObject json)
+        private static IEnumerable<VideoInfo> GetVideoInfos(YoutubeModel model)
         {
-            var regex = new Regex(@"player-(.+?).js");
+            var streamingFormats = GetStreamMap(model);
+            if (streamingFormats == null)
+                streamingFormats = new List<Format>();
 
-            string js = json["assets"]["js"].ToString();
+            var adaptiveStream = GetAdaptiveStreamMap(model);
+            if (adaptiveStream != null)
+                streamingFormats.AddRange(adaptiveStream);
 
-            return regex.Match(js).Result("$1");
-        }
+            var n_cache = new Dictionary<string, string>();
+            foreach (var fmt in streamingFormats)
+            {
+                if (!fmt.Itag.HasValue) continue;
 
-        private static string GetStreamMap(JObject json)
-        {
-            JToken streamMap = json["args"]["url_encoded_fmt_stream_map"];
+                var itag = (int)fmt.Itag.Value;
 
-            string streamMapString = streamMap == null ? null : streamMap.ToString();
+                VideoInfo videoInfo = VideoInfo.Defaults.SingleOrDefault(info => info.FormatCode == itag);
 
-            if (streamMapString == null || streamMapString.Contains("been+removed"))
-            {
-                throw new VideoNotAvailableException("Video is removed or has an age restriction.");
-            }
+                videoInfo = videoInfo ?? new VideoInfo(itag);
 
-            return streamMapString;
-        }
+                if (!string.IsNullOrEmpty(fmt.Url))
+                {
+                    videoInfo.DownloadUrl = HttpHelper.UrlDecode(HttpHelper.UrlDecode(fmt.Url));
+                }
+                else if (!string.IsNullOrEmpty(fmt.Cipher) || !string.IsNullOrEmpty(fmt.SignatureCipher))
+                {
+                    IDictionary<string, string> cipher = null;
 
-        private static IEnumerable<VideoInfo> GetVideoInfos(IEnumerable<ExtractionInfo> extractionInfos, string videoTitle)
-        {
-            var downLoadInfos = new List<VideoInfo>();
+                    if (!string.IsNullOrEmpty(fmt.Cipher))
+                        cipher = HttpHelper.ParseQueryString(fmt.Cipher);
+                    if (!string.IsNullOrEmpty(fmt.SignatureCipher))
+                        cipher = HttpHelper.ParseQueryString(fmt.SignatureCipher);
 
-            foreach (ExtractionInfo extractionInfo in extractionInfos)
-            {
-                string itag = HttpHelper.ParseQueryString(extractionInfo.Uri.Query)["itag"];
+                    if (!cipher.ContainsKey("url"))
+                        continue;
+                    if (!cipher.ContainsKey("s"))
+                        continue;
+
+                    var url = cipher["url"];
+                    var sig = cipher["s"];
 
-                int formatCode = int.Parse(itag);
+                    url = HttpHelper.UrlDecode(url);
+                    url = HttpHelper.UrlDecode(url);
 
-                VideoInfo info = VideoInfo.Defaults.SingleOrDefault(videoInfo => videoInfo.FormatCode == formatCode);
+                    sig = HttpHelper.UrlDecode(sig);
+                    sig = HttpHelper.UrlDecode(sig);
 
-                if (info != null)
+                    url = url.Replace("&s=", "&sig=");
+                    videoInfo.DownloadUrl = HttpHelper.ReplaceQueryStringParameter(url, SignatureQuery, sig);
+                    videoInfo.RequiresDecryption = true;
+                }
+                else
+                    continue;
+
+                if (!HttpHelper.ParseQueryString(videoInfo.DownloadUrl).ContainsKey(RateBypassFlag))
                 {
-                    info = new VideoInfo(info)
-                    {
-                        DownloadUrl = extractionInfo.Uri.ToString(),
-                        Title = videoTitle,
-                        RequiresDecryption = extractionInfo.RequiresDecryption
-                    };
+                    videoInfo.DownloadUrl = string.Concat(videoInfo.DownloadUrl, string.Format("&{0}={1}", "ratebypass", "yes"));
                 }
 
+                if (fmt.AudioSampleRate.HasValue)
+                    videoInfo.AudioBitrate = (int)fmt.AudioSampleRate.Value;
+
+                if (fmt.ContentLength.HasValue)
+                    videoInfo.FileSize = (int)fmt.ContentLength.Value;
+
+                if (!string.IsNullOrEmpty(fmt.QualityLabel))
+                    videoInfo.FormatNote = fmt.QualityLabel;
                 else
+                    videoInfo.FormatNote = fmt.Quality;
+
+                if (fmt.Fps.HasValue)
+                    videoInfo.FPS = (int)fmt.Fps.Value;
+
+                if (fmt.Height.HasValue)
+                    videoInfo.Height = (int)fmt.Height.Value;
+
+                if (fmt.Width.HasValue)
+                    videoInfo.Width = (int)fmt.Width.Value;
+
+                // bitrate for itag 43 is always 2147483647
+                if (itag != 43)
                 {
-                    info = new VideoInfo(formatCode)
-                    {
-                        DownloadUrl = extractionInfo.Uri.ToString()
-                    };
+                    if (fmt.AverageBitrate.HasValue)
+                        videoInfo.AverageBitrate = fmt.AverageBitrate.Value / 1000f;
+                    else if (fmt.Bitrate.HasValue)
+                        videoInfo.AverageBitrate = fmt.Bitrate.Value / 1000f;
                 }
 
-                downLoadInfos.Add(info);
-            }
+                if (fmt.Height.HasValue)
+                    videoInfo.Height = (int)fmt.Height.Value;
 
-            return downLoadInfos;
+                if (fmt.Width.HasValue)
+                    videoInfo.Width = (int)fmt.Width.Value;
+
+                yield return videoInfo;
+            }
         }
 
-        private static string GetVideoTitle(JObject json)
+        private static string GetVideoTitle(YoutubeModel model)
         {
-            JToken title = json["args"]["title"];
-
-            return title == null ? String.Empty : title.ToString();
+            return model.VideoDetails.Title.Replace("+", " ");
         }
 
-        private static bool IsVideoUnavailable(string pageSource)
+        private static YoutubeModel LoadModel(string videoUrl)
         {
-            const string unavailableContainer = "<div id=\"watch-player-unavailable\">";
+            var videoId = videoUrl.Replace("https://youtube.com/watch?v=", "");
 
-            return pageSource.Contains(unavailableContainer);
-        }
+            var url = $"https://www.youtube.com/watch?v={videoId}&gl=US&hl=en&has_verified=1&bpctr=9999999999";
 
-        private static JObject LoadJson(string url)
-        {
-            string pageSource = HttpHelper.DownloadString(url);
+            var pageSource = HttpHelper.DownloadString(url);
+            string player_response;
+            if (Regex.IsMatch(pageSource, @"[""\']status[""\']\s*:\s*[""\']LOGIN_REQUIRED"))
+            {
+                url = $"https://www.youtube.com/get_video_info?video_id={videoId}&eurl=https://youtube.googleapis.com/v/{videoId}";
+                pageSource = HttpHelper.DownloadString(url);
+                player_response = HttpHelper.ParseQueryString(pageSource)["player_response"];
+                player_response = HttpHelper.UrlDecode(player_response);
+
+                return YoutubeModel.FromJson(player_response);
+            }
 
-            if (IsVideoUnavailable(pageSource))
+            var dataRegex = new Regex(@"ytInitialPlayerResponse\s*=\s*({.+?})\s*;\s*(?:var\s+meta|</script|\n)", RegexOptions.Multiline);
+            var dataMatch = dataRegex.Match(pageSource);
+            if (dataMatch.Success)
             {
-                throw new VideoNotAvailableException();
+                player_response = dataMatch.Result("$1");
+
+                return YoutubeModel.FromJson(player_response);
             }
 
-            var dataRegex = new Regex(@"ytplayer\.config\s*=\s*(\{.+?\});", RegexOptions.Multiline);
+            dataRegex = new Regex(@"ytInitialPlayerResponse\s*=\s*({.+?})\s*;", RegexOptions.Multiline);
+            dataMatch = dataRegex.Match(pageSource);
+            if (dataMatch.Success)
+            {
+                player_response = dataMatch.Result("$1");
 
-            string extractedJson = dataRegex.Match(pageSource).Result("$1");
+                return YoutubeModel.FromJson(player_response);
+            }
 
-            return JObject.Parse(extractedJson);
+            ThrowYoutubeParseException(new VideoNotAvailableException("Unable to extract video data"), videoUrl);
+            return null;
         }
 
+
         private static void ThrowYoutubeParseException(Exception innerException, string videoUrl)
         {
             throw new YoutubeParseException("Could not parse the Youtube page for URL " + videoUrl + "\n" +
                                             "This may be due to a change of the Youtube page structure.\n" +
                                             "Please report this bug at www.github.com/flagbug/YoutubeExtractor/issues", innerException);
         }
-
-        private class ExtractionInfo
-        {
-            public bool RequiresDecryption { get; set; }
-
-            public Uri Uri { get; set; }
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/YoutubeExtractor/YoutubeExtractor/HttpHelper.cs b/YoutubeExtractor/YoutubeExtractor/HttpHelper.cs
index e25f23a..ced8722 100644
--- a/YoutubeExtractor/YoutubeExtractor/HttpHelper.cs
+++ b/YoutubeExtractor/YoutubeExtractor/HttpHelper.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Web;
 
 namespace YoutubeExtractor
 {
@@ -42,7 +44,7 @@ public static string HtmlDecode(string value)
         public static IDictionary<string, string> ParseQueryString(string s)
         {
             // remove anything other than query string from url
-            if (s.Contains("?"))
+            if (s.StartsWith("http") && s.Contains("?"))
             {
                 s = s.Substring(s.IndexOf('?') + 1);
             }
@@ -52,7 +54,16 @@ public static IDictionary<string, string> ParseQueryString(string s)
             foreach (string vp in Regex.Split(s, "&"))
             {
                 string[] strings = Regex.Split(vp, "=");
-                dictionary.Add(strings[0], strings.Length == 2 ? UrlDecode(strings[1]) : string.Empty);
+
+                string key = strings[0];
+                string value = string.Empty;
+
+                if (strings.Length == 2)
+                    value = strings[1];
+                else if (strings.Length > 2)
+                    value = string.Join("=", strings.Skip(1).ToArray());
+
+                dictionary.Add(key, value);
             }
 
             return dictionary;
@@ -98,6 +109,15 @@ public static string UrlDecode(string url)
 #endif
         }
 
+        public static string UrlEncode(string url)
+        {
+#if PORTABLE
+            return System.Net.WebUtility.UrlEncode(url);
+#else
+            return System.Web.HttpUtility.UrlEncode(url);
+#endif
+        }
+
         private static string ReadStreamFromResponse(WebResponse response)
         {
             using (Stream responseStream = response.GetResponseStream())
diff --git a/YoutubeExtractor/YoutubeExtractor/VideoInfo.cs b/YoutubeExtractor/YoutubeExtractor/VideoInfo.cs
index e52db40..fd9a670 100644
--- a/YoutubeExtractor/YoutubeExtractor/VideoInfo.cs
+++ b/YoutubeExtractor/YoutubeExtractor/VideoInfo.cs
@@ -4,6 +4,9 @@ namespace YoutubeExtractor
 {
     public class VideoInfo
     {
+        /// <summary>
+        /// Update from Youtube-dl
+        /// </summary>
         internal static IEnumerable<VideoInfo> Defaults = new List<VideoInfo>
         {
             /* Non-adaptive */
@@ -22,6 +25,8 @@ public class VideoInfo
             new VideoInfo(44, VideoType.WebM, 480, false, AudioType.Vorbis, 128, AdaptiveType.None),
             new VideoInfo(45, VideoType.WebM, 720, false, AudioType.Vorbis, 192, AdaptiveType.None),
             new VideoInfo(46, VideoType.WebM, 1080, false, AudioType.Vorbis, 192, AdaptiveType.None),
+            new VideoInfo(59, VideoType.Mp4, 480, false, AudioType.Aac, 128, AdaptiveType.None),
+            new VideoInfo(78, VideoType.Mp4, 480, false, AudioType.Aac, 128, AdaptiveType.None),
 
             /* 3d */
             new VideoInfo(82, VideoType.Mp4, 360, true, AudioType.Aac, 96, AdaptiveType.None),
@@ -32,7 +37,17 @@ public class VideoInfo
             new VideoInfo(101, VideoType.WebM, 360, true, AudioType.Vorbis, 192, AdaptiveType.None),
             new VideoInfo(102, VideoType.WebM, 720, true, AudioType.Vorbis, 192, AdaptiveType.None),
 
-            /* Adaptive (aka DASH) - Video */
+            /* Apple HTTP Live Streaming */
+            new VideoInfo(91, VideoType.Mp4, 144, false, AudioType.Aac, 48, AdaptiveType.None),
+            new VideoInfo(92, VideoType.Mp4, 240, false, AudioType.Aac, 48, AdaptiveType.None),
+            new VideoInfo(93, VideoType.Mp4, 360, false, AudioType.Aac, 128, AdaptiveType.None),
+            new VideoInfo(94, VideoType.Mp4, 480, false, AudioType.Aac, 128, AdaptiveType.None),
+            new VideoInfo(95, VideoType.Mp4, 720, false, AudioType.Aac, 256, AdaptiveType.None),
+            new VideoInfo(96, VideoType.Mp4, 1080, false, AudioType.Aac, 256, AdaptiveType.None),
+            new VideoInfo(132, VideoType.Mp4, 240, false, AudioType.Aac, 48, AdaptiveType.None),
+            new VideoInfo(151, VideoType.Mp4, 72, false, AudioType.Aac, 24, AdaptiveType.None),
+
+            /* Adaptive (aka DASH) - MP4 Video */
             new VideoInfo(133, VideoType.Mp4, 240, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(134, VideoType.Mp4, 360, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(135, VideoType.Mp4, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
@@ -40,20 +55,48 @@ public class VideoInfo
             new VideoInfo(137, VideoType.Mp4, 1080, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(138, VideoType.Mp4, 2160, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(160, VideoType.Mp4, 144, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(212, VideoType.Mp4, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),            
+            new VideoInfo(264, VideoType.Mp4, 1440, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(298, VideoType.Mp4, 720, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(299, VideoType.Mp4, 1080, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(266, VideoType.Mp4, 2160, false, AudioType.Unknown, 0, AdaptiveType.Video),            
+
+            /* Adaptive (aka DASH) - Audio */
+            new VideoInfo(139, VideoType.Mp4, 0, false, AudioType.Aac, 48, AdaptiveType.Audio),
+            new VideoInfo(140, VideoType.Mp4, 0, false, AudioType.Aac, 128, AdaptiveType.Audio),
+            new VideoInfo(141, VideoType.Mp4, 0, false, AudioType.Aac, 256, AdaptiveType.Audio),
+            new VideoInfo(256, VideoType.Mp4, 0, false, AudioType.Aac, 0, AdaptiveType.Audio),
+            new VideoInfo(258, VideoType.Mp4, 0, false, AudioType.Aac, 0, AdaptiveType.Audio),
+            new VideoInfo(325, VideoType.Mp4, 0, false, AudioType.Aac, 0, AdaptiveType.Audio),
+            new VideoInfo(328, VideoType.Mp4, 0, false, AudioType.Aac, 0, AdaptiveType.Audio),
+
+            /* Adaptive (aka DASH) - WebM Video Height > Width */
+            new VideoInfo(167, VideoType.WebM, 360, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(168, VideoType.WebM, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(169, VideoType.WebM, 720, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(170, VideoType.WebM, 1080, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(218, VideoType.WebM, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(219, VideoType.WebM, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
+
+            /* Adaptive (aka DASH) - WebM Video */
+            new VideoInfo(278, VideoType.WebM, 144, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(242, VideoType.WebM, 240, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(243, VideoType.WebM, 360, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(244, VideoType.WebM, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(245, VideoType.WebM, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(246, VideoType.WebM, 480, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(247, VideoType.WebM, 720, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(248, VideoType.WebM, 1080, false, AudioType.Unknown, 0, AdaptiveType.Video),
-            new VideoInfo(264, VideoType.Mp4, 1440, false, AudioType.Unknown, 0, AdaptiveType.Video),
             new VideoInfo(271, VideoType.WebM, 1440, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            // itag 272 videos are either 3840x2160 or 7680x4320
             new VideoInfo(272, VideoType.WebM, 2160, false, AudioType.Unknown, 0, AdaptiveType.Video),
-            new VideoInfo(278, VideoType.WebM, 144, false, AudioType.Unknown, 0, AdaptiveType.Video),
-
-            /* Adaptive (aka DASH) - Audio */
-            new VideoInfo(139, VideoType.Mp4, 0, false, AudioType.Aac, 48, AdaptiveType.Audio),
-            new VideoInfo(140, VideoType.Mp4, 0, false, AudioType.Aac, 128, AdaptiveType.Audio),
-            new VideoInfo(141, VideoType.Mp4, 0, false, AudioType.Aac, 256, AdaptiveType.Audio),
+            new VideoInfo(302, VideoType.WebM, 720, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(303, VideoType.WebM, 1080, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(308, VideoType.WebM, 1440, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(313, VideoType.WebM, 2160, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            new VideoInfo(315, VideoType.WebM, 2160, false, AudioType.Unknown, 0, AdaptiveType.Video),
+            
+            /* Adaptive (aka DASH) - WebM Audio */
             new VideoInfo(171, VideoType.WebM, 0, false, AudioType.Vorbis, 128, AdaptiveType.Audio),
             new VideoInfo(172, VideoType.WebM, 0, false, AudioType.Vorbis, 192, AdaptiveType.Audio)
         };
@@ -84,13 +127,13 @@ private VideoInfo(int formatCode, VideoType videoType, int resolution, bool is3D
         /// <c>AdaptiveType.Audio</c> or <c>AdaptiveType.Video</c> if the format is adaptive;
         /// otherwise, <c>AdaptiveType.None</c>.
         /// </value>
-        public AdaptiveType AdaptiveType { get; private set; }
+        public AdaptiveType AdaptiveType { get; set; }
 
         /// <summary>
         /// The approximate audio bitrate in kbit/s.
         /// </summary>
         /// <value>The approximate audio bitrate in kbit/s, or 0 if the bitrate is unknown.</value>
-        public int AudioBitrate { get; private set; }
+        public int AudioBitrate { get; set; }
 
         /// <summary>
         /// Gets the audio extension.
@@ -119,7 +162,7 @@ public string AudioExtension
         /// <summary>
         /// Gets the audio type (encoding).
         /// </summary>
-        public AudioType AudioType { get; private set; }
+        public AudioType AudioType { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether the audio of this video can be extracted by YoutubeExtractor.
@@ -141,9 +184,9 @@ public bool CanExtractAudio
         /// Gets the format code, that is used by YouTube internally to differentiate between
         /// quality profiles.
         /// </summary>
-        public int FormatCode { get; private set; }
+        public int FormatCode { get; set; }
 
-        public bool Is3D { get; private set; }
+        public bool Is3D { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether this video info requires a signature decryption before
@@ -157,7 +200,7 @@ public bool CanExtractAudio
         /// Gets the resolution of the video.
         /// </summary>
         /// <value>The resolution of the video, or 0 if the resolution is unkown.</value>
-        public int Resolution { get; private set; }
+        public int Resolution { get; set; }
 
         /// <summary>
         /// Gets the video title.
@@ -194,14 +237,32 @@ public string VideoExtension
         /// <summary>
         /// Gets the video type (container).
         /// </summary>
-        public VideoType VideoType { get; private set; }
+        public VideoType VideoType { get; set; }
 
         /// <summary>
         /// We use this in the <see cref="DownloadUrlResolver.DecryptDownloadUrl" /> method to
         /// decrypt the signature
         /// </summary>
         /// <returns></returns>
-        internal string HtmlPlayerVersion { get; set; }
+        public string HtmlPlayerVersion { get; set; }
+
+        /// <summary>
+        /// FizeSize
+        /// </summary>
+        public int FileSize { get; set; }
+
+        /// <summary>
+        /// Quality Label
+        /// </summary>
+        public string FormatNote { get; set; }
+
+        public int FPS { get; set; }
+
+        public int Height { get; set; }
+
+        public int Width { get; set; }
+
+        public float AverageBitrate { get; set; }
 
         public override string ToString()
         {
diff --git a/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor.csproj b/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor.csproj
index 9cb7519..9e19e60 100644
--- a/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor.csproj
+++ b/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>YoutubeExtractor</RootNamespace>
     <AssemblyName>YoutubeExtractor</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,10 +35,14 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\Full\YoutubeExtractor.xml</DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NiL.JS, Version=2.5.1514.0, Culture=neutral, PublicKeyToken=fa941a7c2a4de689, processorArchitecture=MSIL">
+      <HintPath>..\packages\NiL.JS.2.5.1514\lib\net40\NiL.JS.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -63,6 +69,7 @@
     <Compile Include="VideoInfo.cs" />
     <Compile Include="VideoNotAvailableException.cs" />
     <Compile Include="VideoType.cs" />
+    <Compile Include="YoutubeModel.cs" />
     <Compile Include="YoutubeParseException.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor_Portable.csproj b/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor_Portable.csproj
index 30410f3..636f9a6 100644
--- a/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor_Portable.csproj
+++ b/YoutubeExtractor/YoutubeExtractor/YoutubeExtractor_Portable.csproj
@@ -49,8 +49,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\portable-net45+wp80+win8\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\portable-net45+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/YoutubeExtractor/YoutubeExtractor/YoutubeModel.cs b/YoutubeExtractor/YoutubeExtractor/YoutubeModel.cs
new file mode 100644
index 0000000..e49e604
--- /dev/null
+++ b/YoutubeExtractor/YoutubeExtractor/YoutubeModel.cs
@@ -0,0 +1,876 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using YoutubeExtractor;
+//
+//    var youtubeModel = YoutubeModel.FromJson(jsonString);
+
+namespace YoutubeExtractor
+{
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    public partial class YoutubeModel
+    {
+        [JsonProperty("playabilityStatus", NullValueHandling = NullValueHandling.Ignore)]
+        public PlayabilityStatus PlayabilityStatus { get; set; }
+
+        [JsonProperty("streamingData", NullValueHandling = NullValueHandling.Ignore)]
+        public StreamingData StreamingData { get; set; }
+
+        [JsonProperty("playbackTracking", NullValueHandling = NullValueHandling.Ignore)]
+        public PlaybackTracking PlaybackTracking { get; set; }
+
+        [JsonProperty("videoDetails", NullValueHandling = NullValueHandling.Ignore)]
+        public VideoDetails VideoDetails { get; set; }
+
+        [JsonProperty("annotations", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Annotation> Annotations { get; set; }
+
+        [JsonProperty("playerConfig", NullValueHandling = NullValueHandling.Ignore)]
+        public PlayerConfig PlayerConfig { get; set; }
+
+        [JsonProperty("storyboards", NullValueHandling = NullValueHandling.Ignore)]
+        public Storyboards Storyboards { get; set; }
+
+        [JsonProperty("microformat", NullValueHandling = NullValueHandling.Ignore)]
+        public Microformat Microformat { get; set; }
+
+        [JsonProperty("trackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string TrackingParams { get; set; }
+
+        [JsonProperty("attestation", NullValueHandling = NullValueHandling.Ignore)]
+        public Attestation Attestation { get; set; }
+
+        [JsonProperty("endscreen", NullValueHandling = NullValueHandling.Ignore)]
+        public Endscreen Endscreen { get; set; }
+    }
+
+    public partial class Annotation
+    {
+        [JsonProperty("playerAnnotationsUrlsRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public PlayerAnnotationsUrlsRenderer PlayerAnnotationsUrlsRenderer { get; set; }
+    }
+
+    public partial class PlayerAnnotationsUrlsRenderer
+    {
+        [JsonProperty("invideoUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string InvideoUrl { get; set; }
+
+        [JsonProperty("loadPolicy", NullValueHandling = NullValueHandling.Ignore)]
+        public string LoadPolicy { get; set; }
+
+        [JsonProperty("allowInPlaceSwitch", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? AllowInPlaceSwitch { get; set; }
+    }
+
+    public partial class Attestation
+    {
+        [JsonProperty("playerAttestationRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public PlayerAttestationRenderer PlayerAttestationRenderer { get; set; }
+    }
+
+    public partial class PlayerAttestationRenderer
+    {
+        [JsonProperty("challenge", NullValueHandling = NullValueHandling.Ignore)]
+        public string Challenge { get; set; }
+
+        [JsonProperty("botguardData", NullValueHandling = NullValueHandling.Ignore)]
+        public BotguardData BotguardData { get; set; }
+    }
+
+    public partial class BotguardData
+    {
+        [JsonProperty("program", NullValueHandling = NullValueHandling.Ignore)]
+        public string Program { get; set; }
+
+        [JsonProperty("interpreterUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string InterpreterUrl { get; set; }
+    }
+
+    public partial class Endscreen
+    {
+        [JsonProperty("endscreenRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public EndscreenRenderer EndscreenRenderer { get; set; }
+    }
+
+    public partial class EndscreenRenderer
+    {
+        [JsonProperty("elements", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Element> Elements { get; set; }
+
+        [JsonProperty("startMs", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? StartMs { get; set; }
+
+        [JsonProperty("trackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string TrackingParams { get; set; }
+    }
+
+    public partial class Element
+    {
+        [JsonProperty("endscreenElementRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public EndscreenElementRenderer EndscreenElementRenderer { get; set; }
+    }
+
+    public partial class EndscreenElementRenderer
+    {
+        [JsonProperty("style", NullValueHandling = NullValueHandling.Ignore)]
+        public string Style { get; set; }
+
+        [JsonProperty("image", NullValueHandling = NullValueHandling.Ignore)]
+        public ImageClass Image { get; set; }
+
+        [JsonProperty("icon", NullValueHandling = NullValueHandling.Ignore)]
+        public Icon Icon { get; set; }
+
+        [JsonProperty("left", NullValueHandling = NullValueHandling.Ignore)]
+        public double? Left { get; set; }
+
+        [JsonProperty("width", NullValueHandling = NullValueHandling.Ignore)]
+        public double? Width { get; set; }
+
+        [JsonProperty("top", NullValueHandling = NullValueHandling.Ignore)]
+        public double? Top { get; set; }
+
+        [JsonProperty("aspectRatio", NullValueHandling = NullValueHandling.Ignore)]
+        public double? AspectRatio { get; set; }
+
+        [JsonProperty("startMs", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? StartMs { get; set; }
+
+        [JsonProperty("endMs", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? EndMs { get; set; }
+
+        [JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
+        public Title Title { get; set; }
+
+        [JsonProperty("metadata", NullValueHandling = NullValueHandling.Ignore)]
+        public Description Metadata { get; set; }
+
+        [JsonProperty("callToAction", NullValueHandling = NullValueHandling.Ignore)]
+        public Description CallToAction { get; set; }
+
+        [JsonProperty("dismiss", NullValueHandling = NullValueHandling.Ignore)]
+        public Description Dismiss { get; set; }
+
+        [JsonProperty("endpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public Endpoint Endpoint { get; set; }
+
+        [JsonProperty("hovercardButton", NullValueHandling = NullValueHandling.Ignore)]
+        public HovercardButton HovercardButton { get; set; }
+
+        [JsonProperty("trackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string TrackingParams { get; set; }
+
+        [JsonProperty("isSubscribe", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsSubscribe { get; set; }
+
+        [JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
+        public string Id { get; set; }
+
+        [JsonProperty("videoDuration", NullValueHandling = NullValueHandling.Ignore)]
+        public Description VideoDuration { get; set; }
+
+        [JsonProperty("playlistLength", NullValueHandling = NullValueHandling.Ignore)]
+        public Description PlaylistLength { get; set; }
+    }
+
+    public partial class Description
+    {
+        [JsonProperty("simpleText", NullValueHandling = NullValueHandling.Ignore)]
+        public string SimpleText { get; set; }
+    }
+
+    public partial class Endpoint
+    {
+        [JsonProperty("clickTrackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string ClickTrackingParams { get; set; }
+
+        [JsonProperty("browseEndpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public BrowseEndpoint BrowseEndpoint { get; set; }
+
+        [JsonProperty("watchEndpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public WatchEndpoint WatchEndpoint { get; set; }
+    }
+
+    public partial class BrowseEndpoint
+    {
+        [JsonProperty("browseId", NullValueHandling = NullValueHandling.Ignore)]
+        public string BrowseId { get; set; }
+    }
+
+    public partial class WatchEndpoint
+    {
+        [JsonProperty("videoId", NullValueHandling = NullValueHandling.Ignore)]
+        public string VideoId { get; set; }
+
+        [JsonProperty("playlistId", NullValueHandling = NullValueHandling.Ignore)]
+        public string PlaylistId { get; set; }
+    }
+
+    public partial class HovercardButton
+    {
+        [JsonProperty("subscribeButtonRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public SubscribeButtonRenderer SubscribeButtonRenderer { get; set; }
+    }
+
+    public partial class SubscribeButtonRenderer
+    {
+        [JsonProperty("buttonText", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonText ButtonText { get; set; }
+
+        [JsonProperty("subscribed", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? Subscribed { get; set; }
+
+        [JsonProperty("enabled", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? Enabled { get; set; }
+
+        [JsonProperty("type", NullValueHandling = NullValueHandling.Ignore)]
+        public string Type { get; set; }
+
+        [JsonProperty("channelId", NullValueHandling = NullValueHandling.Ignore)]
+        public string ChannelId { get; set; }
+
+        [JsonProperty("showPreferences", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? ShowPreferences { get; set; }
+
+        [JsonProperty("subscribedButtonText", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonText SubscribedButtonText { get; set; }
+
+        [JsonProperty("unsubscribedButtonText", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonText UnsubscribedButtonText { get; set; }
+
+        [JsonProperty("trackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string TrackingParams { get; set; }
+
+        [JsonProperty("unsubscribeButtonText", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonText UnsubscribeButtonText { get; set; }
+
+        [JsonProperty("serviceEndpoints", NullValueHandling = NullValueHandling.Ignore)]
+        public List<ServiceEndpointElement> ServiceEndpoints { get; set; }
+
+        [JsonProperty("subscribeAccessibility", NullValueHandling = NullValueHandling.Ignore)]
+        public Accessibility SubscribeAccessibility { get; set; }
+
+        [JsonProperty("unsubscribeAccessibility", NullValueHandling = NullValueHandling.Ignore)]
+        public Accessibility UnsubscribeAccessibility { get; set; }
+    }
+
+    public partial class ButtonText
+    {
+        [JsonProperty("runs", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Run> Runs { get; set; }
+    }
+
+    public partial class Run
+    {
+        [JsonProperty("text", NullValueHandling = NullValueHandling.Ignore)]
+        public string Text { get; set; }
+    }
+
+    public partial class ServiceEndpointElement
+    {
+        [JsonProperty("clickTrackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string ClickTrackingParams { get; set; }
+
+        [JsonProperty("subscribeEndpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public SubscribeEndpoint SubscribeEndpoint { get; set; }
+
+        [JsonProperty("signalServiceEndpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public SignalServiceEndpoint SignalServiceEndpoint { get; set; }
+    }
+
+    public partial class SignalServiceEndpoint
+    {
+        [JsonProperty("signal", NullValueHandling = NullValueHandling.Ignore)]
+        public string Signal { get; set; }
+
+        [JsonProperty("actions", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Action> Actions { get; set; }
+    }
+
+    public partial class Action
+    {
+        [JsonProperty("clickTrackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string ClickTrackingParams { get; set; }
+
+        [JsonProperty("openPopupAction", NullValueHandling = NullValueHandling.Ignore)]
+        public OpenPopupAction OpenPopupAction { get; set; }
+    }
+
+    public partial class OpenPopupAction
+    {
+        [JsonProperty("popup", NullValueHandling = NullValueHandling.Ignore)]
+        public Popup Popup { get; set; }
+
+        [JsonProperty("popupType", NullValueHandling = NullValueHandling.Ignore)]
+        public string PopupType { get; set; }
+    }
+
+    public partial class Popup
+    {
+        [JsonProperty("confirmDialogRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public ConfirmDialogRenderer ConfirmDialogRenderer { get; set; }
+    }
+
+    public partial class ConfirmDialogRenderer
+    {
+        [JsonProperty("trackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string TrackingParams { get; set; }
+
+        [JsonProperty("dialogMessages", NullValueHandling = NullValueHandling.Ignore)]
+        public List<ButtonText> DialogMessages { get; set; }
+
+        [JsonProperty("confirmButton", NullValueHandling = NullValueHandling.Ignore)]
+        public Button ConfirmButton { get; set; }
+
+        [JsonProperty("cancelButton", NullValueHandling = NullValueHandling.Ignore)]
+        public Button CancelButton { get; set; }
+
+        [JsonProperty("primaryIsCancel", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? PrimaryIsCancel { get; set; }
+    }
+
+    public partial class Button
+    {
+        [JsonProperty("buttonRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonRenderer ButtonRenderer { get; set; }
+    }
+
+    public partial class ButtonRenderer
+    {
+        [JsonProperty("style", NullValueHandling = NullValueHandling.Ignore)]
+        public string Style { get; set; }
+
+        [JsonProperty("size", NullValueHandling = NullValueHandling.Ignore)]
+        public string Size { get; set; }
+
+        [JsonProperty("text", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonText Text { get; set; }
+
+        [JsonProperty("trackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string TrackingParams { get; set; }
+
+        [JsonProperty("serviceEndpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public ButtonRendererServiceEndpoint ServiceEndpoint { get; set; }
+    }
+
+    public partial class ButtonRendererServiceEndpoint
+    {
+        [JsonProperty("clickTrackingParams", NullValueHandling = NullValueHandling.Ignore)]
+        public string ClickTrackingParams { get; set; }
+
+        [JsonProperty("unsubscribeEndpoint", NullValueHandling = NullValueHandling.Ignore)]
+        public SubscribeEndpoint UnsubscribeEndpoint { get; set; }
+    }
+
+    public partial class SubscribeEndpoint
+    {
+        [JsonProperty("channelIds", NullValueHandling = NullValueHandling.Ignore)]
+        public List<string> ChannelIds { get; set; }
+
+        [JsonProperty("params", NullValueHandling = NullValueHandling.Ignore)]
+        public string Params { get; set; }
+    }
+
+    public partial class Accessibility
+    {
+        [JsonProperty("accessibilityData", NullValueHandling = NullValueHandling.Ignore)]
+        public AccessibilityData AccessibilityData { get; set; }
+    }
+
+    public partial class AccessibilityData
+    {
+        [JsonProperty("label", NullValueHandling = NullValueHandling.Ignore)]
+        public string Label { get; set; }
+    }
+
+    public partial class Icon
+    {
+        [JsonProperty("thumbnails", NullValueHandling = NullValueHandling.Ignore)]
+        public List<IconThumbnail> Thumbnails { get; set; }
+    }
+
+    public partial class IconThumbnail
+    {
+        [JsonProperty("url", NullValueHandling = NullValueHandling.Ignore)]
+        public string Url { get; set; }
+    }
+
+    public partial class ImageClass
+    {
+        [JsonProperty("thumbnails", NullValueHandling = NullValueHandling.Ignore)]
+        public List<ThumbnailThumbnail> Thumbnails { get; set; }
+    }
+
+    public partial class ThumbnailThumbnail
+    {
+        [JsonProperty("url", NullValueHandling = NullValueHandling.Ignore)]
+        public string Url { get; set; }
+
+        [JsonProperty("width", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Width { get; set; }
+
+        [JsonProperty("height", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Height { get; set; }
+    }
+
+    public partial class Title
+    {
+        [JsonProperty("accessibility", NullValueHandling = NullValueHandling.Ignore)]
+        public Accessibility Accessibility { get; set; }
+
+        [JsonProperty("simpleText", NullValueHandling = NullValueHandling.Ignore)]
+        public string SimpleText { get; set; }
+    }
+
+    public partial class Microformat
+    {
+        [JsonProperty("playerMicroformatRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public PlayerMicroformatRenderer PlayerMicroformatRenderer { get; set; }
+    }
+
+    public partial class PlayerMicroformatRenderer
+    {
+        [JsonProperty("thumbnail", NullValueHandling = NullValueHandling.Ignore)]
+        public ImageClass Thumbnail { get; set; }
+
+        [JsonProperty("embed", NullValueHandling = NullValueHandling.Ignore)]
+        public Embed Embed { get; set; }
+
+        [JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
+        public Description Title { get; set; }
+
+        [JsonProperty("description", NullValueHandling = NullValueHandling.Ignore)]
+        public Description Description { get; set; }
+
+        [JsonProperty("lengthSeconds", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? LengthSeconds { get; set; }
+
+        [JsonProperty("ownerProfileUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string OwnerProfileUrl { get; set; }
+
+        [JsonProperty("ownerGplusProfileUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string OwnerGplusProfileUrl { get; set; }
+
+        [JsonProperty("externalChannelId", NullValueHandling = NullValueHandling.Ignore)]
+        public string ExternalChannelId { get; set; }
+
+        [JsonProperty("availableCountries", NullValueHandling = NullValueHandling.Ignore)]
+        public List<string> AvailableCountries { get; set; }
+
+        [JsonProperty("isUnlisted", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsUnlisted { get; set; }
+
+        [JsonProperty("hasYpcMetadata", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? HasYpcMetadata { get; set; }
+
+        [JsonProperty("viewCount", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? ViewCount { get; set; }
+
+        [JsonProperty("category", NullValueHandling = NullValueHandling.Ignore)]
+        public string Category { get; set; }
+
+        [JsonProperty("publishDate", NullValueHandling = NullValueHandling.Ignore)]
+        public DateTimeOffset? PublishDate { get; set; }
+
+        [JsonProperty("ownerChannelName", NullValueHandling = NullValueHandling.Ignore)]
+        public string OwnerChannelName { get; set; }
+
+        [JsonProperty("uploadDate", NullValueHandling = NullValueHandling.Ignore)]
+        public DateTimeOffset? UploadDate { get; set; }
+    }
+
+    public partial class Embed
+    {
+        [JsonProperty("iframeUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string IframeUrl { get; set; }
+
+        [JsonProperty("flashUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string FlashUrl { get; set; }
+
+        [JsonProperty("width", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Width { get; set; }
+
+        [JsonProperty("height", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Height { get; set; }
+
+        [JsonProperty("flashSecureUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string FlashSecureUrl { get; set; }
+    }
+
+    public partial class PlayabilityStatus
+    {
+        [JsonProperty("status", NullValueHandling = NullValueHandling.Ignore)]
+        public string Status { get; set; }
+
+        [JsonProperty("playableInEmbed", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? PlayableInEmbed { get; set; }
+    }
+
+    public partial class PlaybackTracking
+    {
+        [JsonProperty("videostatsPlaybackUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public PtrackingUrlClass VideostatsPlaybackUrl { get; set; }
+
+        [JsonProperty("videostatsDelayplayUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public PtrackingUrlClass VideostatsDelayplayUrl { get; set; }
+
+        [JsonProperty("videostatsWatchtimeUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public PtrackingUrlClass VideostatsWatchtimeUrl { get; set; }
+
+        [JsonProperty("ptrackingUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public PtrackingUrlClass PtrackingUrl { get; set; }
+
+        [JsonProperty("qoeUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public PtrackingUrlClass QoeUrl { get; set; }
+
+        [JsonProperty("setAwesomeUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public AtrUrlClass SetAwesomeUrl { get; set; }
+
+        [JsonProperty("atrUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public AtrUrlClass AtrUrl { get; set; }
+
+        [JsonProperty("youtubeRemarketingUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public AtrUrlClass YoutubeRemarketingUrl { get; set; }
+    }
+
+    public partial class AtrUrlClass
+    {
+        [JsonProperty("baseUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string BaseUrl { get; set; }
+
+        [JsonProperty("elapsedMediaTimeSeconds", NullValueHandling = NullValueHandling.Ignore)]
+        public long? ElapsedMediaTimeSeconds { get; set; }
+    }
+
+    public partial class PtrackingUrlClass
+    {
+        [JsonProperty("baseUrl", NullValueHandling = NullValueHandling.Ignore)]
+        public string BaseUrl { get; set; }
+    }
+
+    public partial class PlayerConfig
+    {
+        [JsonProperty("audioConfig", NullValueHandling = NullValueHandling.Ignore)]
+        public AudioConfig AudioConfig { get; set; }
+
+        [JsonProperty("streamSelectionConfig", NullValueHandling = NullValueHandling.Ignore)]
+        public StreamSelectionConfig StreamSelectionConfig { get; set; }
+
+        [JsonProperty("mediaCommonConfig", NullValueHandling = NullValueHandling.Ignore)]
+        public MediaCommonConfig MediaCommonConfig { get; set; }
+    }
+
+    public partial class AudioConfig
+    {
+        [JsonProperty("loudnessDb", NullValueHandling = NullValueHandling.Ignore)]
+        public double? LoudnessDb { get; set; }
+
+        [JsonProperty("perceptualLoudnessDb", NullValueHandling = NullValueHandling.Ignore)]
+        public double? PerceptualLoudnessDb { get; set; }
+
+        [JsonProperty("enablePerFormatLoudness", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? EnablePerFormatLoudness { get; set; }
+    }
+
+    public partial class MediaCommonConfig
+    {
+        [JsonProperty("dynamicReadaheadConfig", NullValueHandling = NullValueHandling.Ignore)]
+        public DynamicReadaheadConfig DynamicReadaheadConfig { get; set; }
+    }
+
+    public partial class DynamicReadaheadConfig
+    {
+        [JsonProperty("maxReadAheadMediaTimeMs", NullValueHandling = NullValueHandling.Ignore)]
+        public long? MaxReadAheadMediaTimeMs { get; set; }
+
+        [JsonProperty("minReadAheadMediaTimeMs", NullValueHandling = NullValueHandling.Ignore)]
+        public long? MinReadAheadMediaTimeMs { get; set; }
+
+        [JsonProperty("readAheadGrowthRateMs", NullValueHandling = NullValueHandling.Ignore)]
+        public long? ReadAheadGrowthRateMs { get; set; }
+    }
+
+    public partial class StreamSelectionConfig
+    {
+        [JsonProperty("maxBitrate", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? MaxBitrate { get; set; }
+    }
+
+    public partial class Storyboards
+    {
+        [JsonProperty("playerStoryboardSpecRenderer", NullValueHandling = NullValueHandling.Ignore)]
+        public PlayerStoryboardSpecRenderer PlayerStoryboardSpecRenderer { get; set; }
+    }
+
+    public partial class PlayerStoryboardSpecRenderer
+    {
+        [JsonProperty("spec", NullValueHandling = NullValueHandling.Ignore)]
+        public string Spec { get; set; }
+    }
+
+    public partial class StreamingData
+    {
+        [JsonProperty("expiresInSeconds", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? ExpiresInSeconds { get; set; }
+
+        [JsonProperty("formats", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Format> Formats { get; set; }
+
+        [JsonProperty("adaptiveFormats", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Format> AdaptiveFormats { get; set; }
+    }
+
+    public partial class Format
+    {
+        [JsonProperty("itag", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Itag { get; set; }
+
+        [JsonProperty("url", NullValueHandling = NullValueHandling.Ignore)]
+        public string Url { get; set; }
+
+        [JsonProperty("mimeType", NullValueHandling = NullValueHandling.Ignore)]
+        public string MimeType { get; set; }
+
+        [JsonProperty("bitrate", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Bitrate { get; set; }
+
+        [JsonProperty("width", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Width { get; set; }
+
+        [JsonProperty("height", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Height { get; set; }
+
+        [JsonProperty("initRange", NullValueHandling = NullValueHandling.Ignore)]
+        public Range InitRange { get; set; }
+
+        [JsonProperty("indexRange", NullValueHandling = NullValueHandling.Ignore)]
+        public Range IndexRange { get; set; }
+
+        [JsonProperty("lastModified", NullValueHandling = NullValueHandling.Ignore)]
+        public string LastModified { get; set; }
+
+        [JsonProperty("contentLength", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? ContentLength { get; set; }
+
+        [JsonProperty("quality", NullValueHandling = NullValueHandling.Ignore)]
+        public string Quality { get; set; }
+
+        [JsonProperty("fps", NullValueHandling = NullValueHandling.Ignore)]
+        public long? Fps { get; set; }
+
+        [JsonProperty("qualityLabel", NullValueHandling = NullValueHandling.Ignore)]
+        public string QualityLabel { get; set; }
+
+        [JsonProperty("projectionType", NullValueHandling = NullValueHandling.Ignore)]
+        public ProjectionType? ProjectionType { get; set; }
+
+        [JsonProperty("averageBitrate", NullValueHandling = NullValueHandling.Ignore)]
+        public long? AverageBitrate { get; set; }
+
+        [JsonProperty("approxDurationMs", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? ApproxDurationMs { get; set; }
+
+        [JsonProperty("colorInfo", NullValueHandling = NullValueHandling.Ignore)]
+        public ColorInfo ColorInfo { get; set; }
+
+        [JsonProperty("highReplication", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? HighReplication { get; set; }
+
+        [JsonProperty("audioQuality", NullValueHandling = NullValueHandling.Ignore)]
+        public string AudioQuality { get; set; }
+
+        [JsonProperty("audioSampleRate", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? AudioSampleRate { get; set; }
+
+        [JsonProperty("audioChannels", NullValueHandling = NullValueHandling.Ignore)]
+        public long? AudioChannels { get; set; }
+
+        [JsonProperty("cipher", NullValueHandling = NullValueHandling.Ignore)]
+        public string Cipher { get; set; }
+
+        [JsonProperty("signatureCipher", NullValueHandling = NullValueHandling.Ignore)]
+        public string SignatureCipher { get; set; }
+    }
+
+    public partial class ColorInfo
+    {
+        [JsonProperty("primaries", NullValueHandling = NullValueHandling.Ignore)]
+        public string Primaries { get; set; }
+
+        [JsonProperty("transferCharacteristics", NullValueHandling = NullValueHandling.Ignore)]
+        public string TransferCharacteristics { get; set; }
+
+        [JsonProperty("matrixCoefficients", NullValueHandling = NullValueHandling.Ignore)]
+        public string MatrixCoefficients { get; set; }
+    }
+
+    public partial class Range
+    {
+        [JsonProperty("start", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? Start { get; set; }
+
+        [JsonProperty("end", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? End { get; set; }
+    }
+
+    public partial class VideoDetails
+    {
+        [JsonProperty("videoId", NullValueHandling = NullValueHandling.Ignore)]
+        public string VideoId { get; set; }
+
+        [JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
+        public string Title { get; set; }
+
+        [JsonProperty("lengthSeconds", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? LengthSeconds { get; set; }
+
+        [JsonProperty("keywords", NullValueHandling = NullValueHandling.Ignore)]
+        public List<string> Keywords { get; set; }
+
+        [JsonProperty("channelId", NullValueHandling = NullValueHandling.Ignore)]
+        public string ChannelId { get; set; }
+
+        [JsonProperty("isOwnerViewing", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsOwnerViewing { get; set; }
+
+        [JsonProperty("shortDescription", NullValueHandling = NullValueHandling.Ignore)]
+        public string ShortDescription { get; set; }
+
+        [JsonProperty("isCrawlable", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsCrawlable { get; set; }
+
+        [JsonProperty("thumbnail", NullValueHandling = NullValueHandling.Ignore)]
+        public ImageClass Thumbnail { get; set; }
+
+        [JsonProperty("averageRating", NullValueHandling = NullValueHandling.Ignore)]
+        public double? AverageRating { get; set; }
+
+        [JsonProperty("allowRatings", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? AllowRatings { get; set; }
+
+        [JsonProperty("viewCount", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long? ViewCount { get; set; }
+
+        [JsonProperty("author", NullValueHandling = NullValueHandling.Ignore)]
+        public string Author { get; set; }
+
+        [JsonProperty("isPrivate", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsPrivate { get; set; }
+
+        [JsonProperty("isUnpluggedCorpus", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsUnpluggedCorpus { get; set; }
+
+        [JsonProperty("isLiveContent", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? IsLiveContent { get; set; }
+    }
+
+    public enum ProjectionType { Rectangular };
+
+    public partial class YoutubeModel
+    {
+        public static YoutubeModel FromJson(string json) => JsonConvert.DeserializeObject<YoutubeModel>(json, Converter.Settings);
+    }
+
+    public static class Serialize
+    {
+        public static string ToJson(this YoutubeModel self) => JsonConvert.SerializeObject(self, Converter.Settings);
+    }
+
+    internal static class Converter
+    {
+        public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
+        {
+            MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+            DateParseHandling = DateParseHandling.None,
+            Converters =
+            {
+                ProjectionTypeConverter.Singleton,
+                new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
+            },
+        };
+    }
+
+    internal class ParseStringConverter : JsonConverter
+    {
+        public override bool CanConvert(Type t) => t == typeof(long) || t == typeof(long?);
+
+        public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.Null) return null;
+            var value = serializer.Deserialize<string>(reader);
+            long l;
+            if (Int64.TryParse(value, out l))
+            {
+                return l;
+            }
+            throw new Exception("Cannot unmarshal type long");
+        }
+
+        public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer)
+        {
+            if (untypedValue == null)
+            {
+                serializer.Serialize(writer, null);
+                return;
+            }
+            var value = (long)untypedValue;
+            serializer.Serialize(writer, value.ToString());
+            return;
+        }
+
+        public static readonly ParseStringConverter Singleton = new ParseStringConverter();
+    }
+
+    internal class ProjectionTypeConverter : JsonConverter
+    {
+        public override bool CanConvert(Type t) => t == typeof(ProjectionType) || t == typeof(ProjectionType?);
+
+        public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.Null) return null;
+            var value = serializer.Deserialize<string>(reader);
+            if (value == "RECTANGULAR")
+            {
+                return ProjectionType.Rectangular;
+            }
+            throw new Exception("Cannot unmarshal type ProjectionType");
+        }
+
+        public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer)
+        {
+            if (untypedValue == null)
+            {
+                serializer.Serialize(writer, null);
+                return;
+            }
+            var value = (ProjectionType)untypedValue;
+            if (value == ProjectionType.Rectangular)
+            {
+                serializer.Serialize(writer, "RECTANGULAR");
+                return;
+            }
+            throw new Exception("Cannot marshal type ProjectionType");
+        }
+
+        public static readonly ProjectionTypeConverter Singleton = new ProjectionTypeConverter();
+    }
+}
\ No newline at end of file
diff --git a/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor.config b/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor.config
index 9520f36..5b272d1 100644
--- a/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor.config
+++ b/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net35" />
+  <package id="NiL.JS" version="2.5.1514" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor_Portable.config b/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor_Portable.config
index 96adb70..f2f0287 100644
--- a/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor_Portable.config
+++ b/YoutubeExtractor/YoutubeExtractor/packages.YoutubeExtractor_Portable.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
-</packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="portable45-net45+win8+wp8+wpa81" />
+</packages>
\ No newline at end of file